From 07afe9dea19920a95391e5aa2f356264ee563916 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sun, 16 May 2021 19:56:05 +0800
Subject: fix: Enhance logic of signalr.

---
 FrontEnd/src/app/views/timeline-common/Timeline.tsx        | 14 ++++++++++++++
 .../src/app/views/timeline-common/TimelinePageTemplate.tsx | 12 ------------
 2 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'FrontEnd/src/app/views')

diff --git a/FrontEnd/src/app/views/timeline-common/Timeline.tsx b/FrontEnd/src/app/views/timeline-common/Timeline.tsx
index 32d0bdd5..8bdf4d3b 100644
--- a/FrontEnd/src/app/views/timeline-common/Timeline.tsx
+++ b/FrontEnd/src/app/views/timeline-common/Timeline.tsx
@@ -7,6 +7,8 @@ import {
 } from "@/http/common";
 import { getHttpTimelineClient, HttpTimelinePostInfo } from "@/http/timeline";
 
+import { getTimelinePostUpdate$ } from "@/services/timeline";
+
 import TimelinePagedPostListView from "./TimelinePagedPostListView";
 import TimelineTop from "./TimelineTop";
 import TimelineLoading from "./TimelineLoading";
@@ -33,6 +35,18 @@ const Timeline: React.FC<TimelineProps> = (props) => {
     setPosts([]);
   }, [timelineName]);
 
+  React.useEffect(() => {
+    if (timelineName != null && state === "loaded") {
+      const timelinePostUpdate$ = getTimelinePostUpdate$(timelineName);
+      const subscription = timelinePostUpdate$.subscribe(() => {
+        onReload();
+      });
+      return () => {
+        subscription.unsubscribe();
+      };
+    }
+  }, [timelineName, state, onReload]);
+
   React.useEffect(() => {
     if (timelineName != null) {
       let subscribe = true;
diff --git a/FrontEnd/src/app/views/timeline-common/TimelinePageTemplate.tsx b/FrontEnd/src/app/views/timeline-common/TimelinePageTemplate.tsx
index 4c0cc8e3..81a3c179 100644
--- a/FrontEnd/src/app/views/timeline-common/TimelinePageTemplate.tsx
+++ b/FrontEnd/src/app/views/timeline-common/TimelinePageTemplate.tsx
@@ -12,7 +12,6 @@ import TimelinePostEdit from "./TimelinePostEdit";
 
 import useReverseScrollPositionRemember from "@/utilities/useReverseScrollPositionRemember";
 import { generatePalette, setPalette } from "@/palette";
-import { getTimelinePostUpdate as getTimelinePostUpdate$ } from "@/services/timeline";
 
 export interface TimelinePageCardProps {
   timeline: HttpTimelineInfo;
@@ -92,17 +91,6 @@ const TimelinePageTemplate: React.FC<TimelinePageTemplateProps> = (props) => {
     setTimelineReloadKey((old) => old + 1);
   };
 
-  React.useEffect(() => {
-    const timelinePostUpdate$ = getTimelinePostUpdate$(timelineName);
-    const subscription = timelinePostUpdate$.subscribe(() => {
-      setTimelineReloadKey((old) => old + 1);
-    });
-
-    return () => {
-      subscription.unsubscribe();
-    };
-  }, [timelineName]);
-
   const onPostEditHeightChange = React.useCallback((height: number): void => {
     setBottomSpaceHeight(height);
     if (height === 0) {
-- 
cgit v1.2.3