From d260c3c3fa073d1a9d09b94c5c4749334e26ab9a Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sun, 10 Apr 2022 19:07:42 +0800
Subject: ...

---
 FrontEnd/src/views/timeline/Timeline.tsx                     |  2 +-
 FrontEnd/src/views/timeline/TimelineCard.tsx                 |  6 +++---
 FrontEnd/src/views/timeline/TimelineDeleteDialog.tsx         |  9 ++++++---
 FrontEnd/src/views/timeline/TimelineMember.tsx               | 12 ++++++++++--
 FrontEnd/src/views/timeline/TimelinePostContentView.tsx      | 11 ++++++-----
 FrontEnd/src/views/timeline/TimelinePostEdit.tsx             |  7 ++++---
 FrontEnd/src/views/timeline/TimelinePostView.tsx             |  2 +-
 FrontEnd/src/views/timeline/TimelinePropertyChangeDialog.tsx |  2 +-
 FrontEnd/src/views/timeline/index.tsx                        |  1 +
 9 files changed, 33 insertions(+), 19 deletions(-)

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

diff --git a/FrontEnd/src/views/timeline/Timeline.tsx b/FrontEnd/src/views/timeline/Timeline.tsx
index 4738c705..e8ed9fe5 100644
--- a/FrontEnd/src/views/timeline/Timeline.tsx
+++ b/FrontEnd/src/views/timeline/Timeline.tsx
@@ -114,7 +114,7 @@ const Timeline: React.FC<TimelineProps> = (props) => {
         subscribe = false;
       };
     }
-  }, [timelineName, reloadKey, onTimelineLoaded]);
+  }, [timelineOwner, timelineName, reloadKey, onTimelineLoaded]);
 
   switch (state) {
     case "loading":
diff --git a/FrontEnd/src/views/timeline/TimelineCard.tsx b/FrontEnd/src/views/timeline/TimelineCard.tsx
index 156c581e..dcf5e870 100644
--- a/FrontEnd/src/views/timeline/TimelineCard.tsx
+++ b/FrontEnd/src/views/timeline/TimelineCard.tsx
@@ -54,7 +54,7 @@ const TimelineCard: React.FC<TimelinePageCardProps> = (props) => {
     <>
       <h3 className="cru-color-primary d-inline-block align-middle">
         {timeline.title}
-        <small className="ms-3 cru-color-secondary">{timeline.name}</small>
+        <small className="ms-3 cru-color-secondary">{timeline.nameV2}</small>
       </h3>
       <div>
         <UserAvatar
@@ -80,7 +80,7 @@ const TimelineCard: React.FC<TimelinePageCardProps> = (props) => {
             user?.hasHighlightTimelineAdministrationPermission
               ? () => {
                   getHttpHighlightClient()
-                    [timeline.isHighlight ? "delete" : "put"](timeline.name)
+                    [timeline.isHighlight ? "delete" : "put"](timeline.nameV2)
                     .then(onReload, () => {
                       pushAlert({
                         message: timeline.isHighlight
@@ -101,7 +101,7 @@ const TimelineCard: React.FC<TimelinePageCardProps> = (props) => {
             )}
             onClick={() => {
               getHttpBookmarkClient()
-                [timeline.isBookmark ? "delete" : "put"](timeline.name)
+                [timeline.isBookmark ? "delete" : "put"](timeline.nameV2)
                 .then(onReload, () => {
                   pushAlert({
                     message: timeline.isBookmark
diff --git a/FrontEnd/src/views/timeline/TimelineDeleteDialog.tsx b/FrontEnd/src/views/timeline/TimelineDeleteDialog.tsx
index 606584eb..1b7a2cc1 100644
--- a/FrontEnd/src/views/timeline/TimelineDeleteDialog.tsx
+++ b/FrontEnd/src/views/timeline/TimelineDeleteDialog.tsx
@@ -26,7 +26,7 @@ const TimelineDeleteDialog: React.FC<TimelineDeleteDialog> = (props) => {
       inputPrompt={() => {
         return (
           <Trans i18nKey="timeline.deleteDialog.inputPrompt">
-            0<code className="mx-2">{{ name: timeline.name }}</code>2
+            0<code className="mx-2">{{ name: timeline.nameV2 }}</code>2
           </Trans>
         );
       }}
@@ -36,14 +36,17 @@ const TimelineDeleteDialog: React.FC<TimelineDeleteDialog> = (props) => {
         },
       ]}
       inputValidator={([value]) => {
-        if (value !== timeline.name) {
+        if (value !== timeline.nameV2) {
           return { 0: "timeline.deleteDialog.notMatch" };
         } else {
           return null;
         }
       }}
       onProcess={() => {
-        return getHttpTimelineClient().deleteTimeline(timeline.name);
+        return getHttpTimelineClient().deleteTimeline(
+          timeline.owner.username,
+          timeline.nameV2
+        );
       }}
       onSuccessAndClose={() => {
         navigate("/", { replace: true });
diff --git a/FrontEnd/src/views/timeline/TimelineMember.tsx b/FrontEnd/src/views/timeline/TimelineMember.tsx
index 59d4c371..27355081 100644
--- a/FrontEnd/src/views/timeline/TimelineMember.tsx
+++ b/FrontEnd/src/views/timeline/TimelineMember.tsx
@@ -116,7 +116,11 @@ const TimelineMemberUserSearch: React.FC<{
                     add
                     onAction={() => {
                       void getHttpTimelineClient()
-                        .memberPut(timeline.name, user.username)
+                        .memberPut(
+                          timeline.owner.username,
+                          timeline.nameV2,
+                          user.username
+                        )
                         .then(() => {
                           setUserSearchText("");
                           setUserSearchState({ type: "init" });
@@ -160,7 +164,11 @@ const TimelineMember: React.FC<TimelineMemberProps> = (props) => {
               timeline.manageable && index !== 0
                 ? () => {
                     void getHttpTimelineClient()
-                      .memberDelete(timeline.name, member.username)
+                      .memberDelete(
+                        timeline.owner.username,
+                        timeline.nameV2,
+                        member.username
+                      )
                       .then(onChange);
                   }
                 : undefined
diff --git a/FrontEnd/src/views/timeline/TimelinePostContentView.tsx b/FrontEnd/src/views/timeline/TimelinePostContentView.tsx
index 607b72c9..88cd756a 100644
--- a/FrontEnd/src/views/timeline/TimelinePostContentView.tsx
+++ b/FrontEnd/src/views/timeline/TimelinePostContentView.tsx
@@ -27,7 +27,7 @@ const TextView: React.FC<TimelinePostContentViewProps> = (props) => {
     setError(null);
 
     void getHttpTimelineClient()
-      .getPostDataAsString(post.timelineName, post.id)
+      .getPostDataAsString(post.timelineOwnerV2, post.timelineNameV2, post.id)
       .then(
         (data) => {
           if (subscribe) setText(data);
@@ -46,7 +46,7 @@ const TextView: React.FC<TimelinePostContentViewProps> = (props) => {
     return () => {
       subscribe = false;
     };
-  }, [post.timelineName, post.id, reloadKey]);
+  }, [post.timelineOwnerV2, post.timelineNameV2, post.id, reloadKey]);
 
   if (error != null) {
     return (
@@ -75,7 +75,8 @@ const ImageView: React.FC<TimelinePostContentViewProps> = (props) => {
   return (
     <img
       src={getHttpTimelineClient().generatePostDataUrl(
-        post.timelineName,
+        post.timelineOwnerV2,
+        post.timelineNameV2,
         post.id
       )}
       className={classnames(className, "timeline-content-image")}
@@ -110,7 +111,7 @@ const MarkdownView: React.FC<TimelinePostContentViewProps> = (props) => {
     setError(null);
 
     void getHttpTimelineClient()
-      .getPostDataAsString(post.timelineName, post.id)
+      .getPostDataAsString(post.timelineOwnerV2, post.timelineNameV2, post.id)
       .then(
         (data) => {
           if (subscribe) setMarkdown(data);
@@ -129,7 +130,7 @@ const MarkdownView: React.FC<TimelinePostContentViewProps> = (props) => {
     return () => {
       subscribe = false;
     };
-  }, [post.timelineName, post.id, reloadKey]);
+  }, [post.timelineOwnerV2, post.timelineNameV2, post.id, reloadKey]);
 
   const markdownHtml = React.useMemo<string | null>(() => {
     if (markdown == null) return null;
diff --git a/FrontEnd/src/views/timeline/TimelinePostEdit.tsx b/FrontEnd/src/views/timeline/TimelinePostEdit.tsx
index cd61b4a7..cca73a12 100644
--- a/FrontEnd/src/views/timeline/TimelinePostEdit.tsx
+++ b/FrontEnd/src/views/timeline/TimelinePostEdit.tsx
@@ -129,7 +129,7 @@ const TimelinePostEdit: React.FC<TimelinePostEditProps> = (props) => {
   const [text, setText] = React.useState<string>("");
   const [image, setImage] = React.useState<File | null>(null);
 
-  const draftTextLocalStorageKey = `timeline.${timeline.name}.postDraft.text`;
+  const draftTextLocalStorageKey = `timeline.${timeline.owner.username}.${timeline.nameV2}.postDraft.text`;
 
   React.useEffect(() => {
     setText(window.localStorage.getItem(draftTextLocalStorageKey) ?? "");
@@ -173,7 +173,7 @@ const TimelinePostEdit: React.FC<TimelinePostEditProps> = (props) => {
     }
 
     getHttpTimelineClient()
-      .postPost(timeline.name, {
+      .postPost(timeline.owner.username, timeline.nameV2, {
         dataList: [requestData],
       })
       .then(
@@ -199,7 +199,8 @@ const TimelinePostEdit: React.FC<TimelinePostEditProps> = (props) => {
         <MarkdownPostEdit
           className="cru-fill-parent"
           onClose={() => setShowMarkdown(false)}
-          timeline={timeline.name}
+          owner={timeline.owner.username}
+          timeline={timeline.nameV2}
           onPosted={onPosted}
           onPostError={onPostError}
         />
diff --git a/FrontEnd/src/views/timeline/TimelinePostView.tsx b/FrontEnd/src/views/timeline/TimelinePostView.tsx
index 086176f8..40c6a484 100644
--- a/FrontEnd/src/views/timeline/TimelinePostView.tsx
+++ b/FrontEnd/src/views/timeline/TimelinePostView.tsx
@@ -134,7 +134,7 @@ const TimelinePostView: React.FC<TimelinePostViewProps> = (props) => {
         }}
         onConfirm={() => {
           void getHttpTimelineClient()
-            .deletePost(post.timelineName, post.id)
+            .deletePost(post.timelineOwnerV2, post.timelineNameV2, post.id)
             .then(onDeleted, () => {
               pushAlert({
                 type: "danger",
diff --git a/FrontEnd/src/views/timeline/TimelinePropertyChangeDialog.tsx b/FrontEnd/src/views/timeline/TimelinePropertyChangeDialog.tsx
index cd5c46da..18f557c6 100644
--- a/FrontEnd/src/views/timeline/TimelinePropertyChangeDialog.tsx
+++ b/FrontEnd/src/views/timeline/TimelinePropertyChangeDialog.tsx
@@ -78,7 +78,7 @@ const TimelinePropertyChangeDialog: React.FC<
           req.color = nc;
         }
         return getHttpTimelineClient()
-          .patchTimeline(timeline.name, req)
+          .patchTimeline(timeline.owner.username, timeline.nameV2, req)
           .then(onChange);
       }}
     />
diff --git a/FrontEnd/src/views/timeline/index.tsx b/FrontEnd/src/views/timeline/index.tsx
index 4faf8af8..3bd3ae3c 100644
--- a/FrontEnd/src/views/timeline/index.tsx
+++ b/FrontEnd/src/views/timeline/index.tsx
@@ -71,6 +71,7 @@ const TimelinePage: React.FC = () => {
       ) : null}
       <div className="container">
         <Timeline
+          timelineOwner={ownerUsername}
           timelineName={timelineName}
           reloadKey={reloadKey}
           onReload={reload}
-- 
cgit v1.2.3