refs #273 Handle status update events

src-tauri/src/streaming.rs

@@ -12,6 +12,12 @@ pub struct ReceiveHomeStatusPayload {
  status: megalodon::entities::Status,
 }
 
+#[derive(Clone, Serialize)]
+pub struct ReceiveHomeStatusUpdatePayload {
+ server_id: i64,
+ status: megalodon::entities::Status,
+}
+
 #[derive(Clone, Serialize)]
 pub struct DeleteHomeStatusPayload {
  server_id: i64,
@@ -30,6 +36,12 @@ pub struct ReceiveTimelineStatusPayload {
  status: megalodon::entities::Status,
 }
 
+#[derive(Clone, Serialize)]
+pub struct ReceiveTimelineStatusUpdatePayload {
+ timeline_id: i64,
+ status: megalodon::entities::Status,
+}
+
 #[derive(Clone, Serialize)]
 pub struct DeleteTimelineStatusPayload {
  timeline_id: i64,
@@ -95,6 +107,18 @@ pub async fn start_user(
  )
  .expect("Failed to send receive-notification event");
  }
+ Message::StatusUpdate(mes) => {
+ log::debug!("receive status updated");
+ app_handle
+ .emit_all(
+ "receive-home-status-update",
+ ReceiveHomeStatusUpdatePayload {
+ server_id,
+ status: mes,
+ },
+ )
+ .expect("Failed to send receive-home-status-update event");
+ }
  Message::Delete(status_id) => {
  log::debug!("receive delete");
  app_handle
@@ -184,6 +208,18 @@ pub async fn start(
  )
  .expect("Failed to receive-timeline-status event");
  }
+ Message::StatusUpdate(mes) => {
+ log::debug!("receive status update");
+ app_handle
+ .emit_all(
+ "receive-timeline-status-update",
+ ReceiveTimelineStatusUpdatePayload {
+ timeline_id,
+ status: mes,
+ },
+ )
+ .expect("Failed to receive-timeline-status-update event");
+ }
  Message::Delete(status_id) => {
  log::debug!("receive delete");
  app_handle

src/components/timelines/Timeline.tsx

@@ -25,7 +25,14 @@ import { Server } from 'src/entities/server'
 import { Timeline, TimelineKind } from 'src/entities/timeline'
 import Status from './status/Status'
 import FailoverImg from 'src/utils/failoverImg'
-import { DeleteHomeStatusPayload, DeleteTimelineStatusPayload, ReceiveHomeStatusPayload, ReceiveTimelineStatusPayload } from 'src/payload'
+import {
+ DeleteHomeStatusPayload,
+ DeleteTimelineStatusPayload,
+ ReceiveHomeStatusPayload,
+ ReceiveHomeStatusUpdatePayload,
+ ReceiveTimelineStatusPayload,
+ ReceiveTimelineStatusUpdatePayload
+} from 'src/payload'
 import { TIMELINE_STATUSES_COUNT, TIMELINE_MAX_STATUSES } from 'src/defaults'
 import alert from 'src/components/utils/alert'
 import { useRouter } from 'next/router'
@@ -104,6 +111,15 @@ const Timeline: React.FC<Props> = props => {
  setStatuses(last => appendStatus(last, ev.payload.status))
  })
 
+ listen<ReceiveHomeStatusUpdatePayload>('receive-home-status-update', ev => {
+ if (ev.payload.server_id !== props.server.id) {
+ return
+ }
+
+ setUnreadStatuses(last => updateStatus(last, ev.payload.status))
+ setStatuses(last => updateStatus(last, ev.payload.status))
+ })
+
  listen<DeleteHomeStatusPayload>('delete-home-status', ev => {
  if (ev.payload.server_id !== props.server.id) {
  return
@@ -125,6 +141,15 @@ const Timeline: React.FC<Props> = props => {
  setStatuses(last => appendStatus(last, ev.payload.status))
  })
 
+ listen<ReceiveTimelineStatusUpdatePayload>('receive-timeline-status-update', ev => {
+ if (ev.payload.timeline_id !== props.timeline.id) {
+ return
+ }
+
+ setUnreadStatuses(last => updateStatus(last, ev.payload.status))
+ setStatuses(last => updateStatus(last, ev.payload.status))
+ })
+
  listen<DeleteTimelineStatusPayload>('delete-timeline-status', ev => {
  if (ev.payload.timeline_id !== props.timeline.id) {
  return
@@ -228,8 +253,8 @@ const Timeline: React.FC<Props> = props => {
 
  const closeOptionPopover = () => triggerRef?.current.close()
 
- const updateStatus = (status: Entity.Status) => {
- const renew = statuses.map(s => {
+ const updateStatus = (current: Array<Entity.Status>, status: Entity.Status) => {
+ const renew = current.map(s => {
  if (s.id === status.id) {
  return status
  } else if (s.reblog && s.reblog.id === status.id) {
@@ -242,7 +267,7 @@ const Timeline: React.FC<Props> = props => {
  return s
  }
  })
- setStatuses(renew)
+ return renew
  }
 
  const setStatusDetail = (statusId: string, serverId: number, accountId?: number) => {
@@ -402,7 +427,7 @@ const Timeline: React.FC<Props> = props => {
  client={client}
  server={props.server}
  account={account}
- updateStatus={updateStatus}
+ updateStatus={status => setStatuses(current => updateStatus(current, status))}
  openMedia={props.openMedia}
  setReplyOpened={opened => (replyOpened.current = opened)}
  setStatusDetail={setStatusDetail}

src/components/timelines/status/Actions.tsx

@@ -240,6 +240,7 @@ type DetailMenuProps = {
 
 const detailMenu = (props: DetailMenuProps, ref: React.RefCallback<HTMLElement>) => {
  const { t } = useTranslation()
+ const { left, top, className } = props
 
  const handleSelect = async (eventKey: string) => {
  props.onClose()
@@ -257,7 +258,7 @@ const detailMenu = (props: DetailMenuProps, ref: React.RefCallback<HTMLElement>)
  }
 
  return (
- <Popover ref={ref} {...props} style={{ padding: 0 }}>
+ <Popover className={className} ref={ref} style={{ left, top, padding: 0 }}>
  <Dropdown.Menu onSelect={handleSelect}>
  <Dropdown.Item eventKey="browser">{t('timeline.actions.detail.browser')}</Dropdown.Item>
  {props.own && <Dropdown.Item eventKey="edit">{t('timeline.actions.detail.edit')}</Dropdown.Item>}

src/payload.ts

@@ -10,6 +10,11 @@ export type ReceiveHomeStatusPayload = {
  status: Entity.Status
 }
 
+export type ReceiveHomeStatusUpdatePayload = {
+ server_id: number
+ status: Entity.Status
+}
+
 export type DeleteHomeStatusPayload = {
  server_id: number
  status_id: string
@@ -20,6 +25,11 @@ export type ReceiveTimelineStatusPayload = {
  status: Entity.Status
 }
 
+export type ReceiveTimelineStatusUpdatePayload = {
+ timeline_id: number
+ status: Entity.Status
+}
+
 export type DeleteTimelineStatusPayload = {
  timeline_id: number
  status_id: string