From 379d03a5096b4b76258fdd971133d81c6f5ce65d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 9 Oct 2021 21:16:37 -0500
Subject: [PATCH] =?UTF-8?q?Optimistic=20statuses:=20prepend=20with=20?=
 =?UTF-8?q?=E6=9C=AB=20to=20sort=20it=20at=20the=20end?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/soapbox/components/status_list.js                  | 4 ++--
 app/soapbox/features/status/index.js                   | 4 ++--
 app/soapbox/features/ui/util/pending_status_builder.js | 2 +-
 app/soapbox/reducers/contexts.js                       | 4 ++--
 app/soapbox/reducers/timelines.js                      | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/soapbox/components/status_list.js b/app/soapbox/components/status_list.js
index e781391e6..a7f602fe5 100644
--- a/app/soapbox/components/status_list.js
+++ b/app/soapbox/components/status_list.js
@@ -124,7 +124,7 @@ export default class StatusList extends ImmutablePureComponent {
 
   renderPendingStatus(statusId) {
     const { timelineId, withGroupAdmin, group } = this.props;
-    const idempotencyKey = statusId.replace(/^pending-/, '');
+    const idempotencyKey = statusId.replace(/^末pending-/, '');
 
     return (
       <div className='material-status' key={statusId}>
@@ -168,7 +168,7 @@ export default class StatusList extends ImmutablePureComponent {
       return statusIds.map((statusId, index) => {
         if (statusId === null) {
           return this.renderLoadGap(index);
-        } else if (statusId.startsWith('pending-')) {
+        } else if (statusId.startsWith('末pending-')) {
           return this.renderPendingStatus(statusId);
         } else {
           return this.renderStatus(statusId);
diff --git a/app/soapbox/features/status/index.js b/app/soapbox/features/status/index.js
index de0fdc4fb..abaa687bc 100644
--- a/app/soapbox/features/status/index.js
+++ b/app/soapbox/features/status/index.js
@@ -487,7 +487,7 @@ class Status extends ImmutablePureComponent {
   }
 
   renderPendingStatus(id) {
-    const idempotencyKey = id.replace(/^pending-/, '');
+    const idempotencyKey = id.replace(/^末pending-/, '');
 
     return (
       <PendingStatus
@@ -505,7 +505,7 @@ class Status extends ImmutablePureComponent {
     return list.map(id => {
       if (id.endsWith('-tombstone')) {
         return this.renderTombstone(id);
-      } else if (id.startsWith('pending-')) {
+      } else if (id.startsWith('末pending-')) {
         return this.renderPendingStatus(id);
       } else {
         return this.renderStatus(id);
diff --git a/app/soapbox/features/ui/util/pending_status_builder.js b/app/soapbox/features/ui/util/pending_status_builder.js
index eb2548ab8..0c578329d 100644
--- a/app/soapbox/features/ui/util/pending_status_builder.js
+++ b/app/soapbox/features/ui/util/pending_status_builder.js
@@ -18,7 +18,7 @@ export const buildStatus = (state, pendingStatus, idempotencyKey) => {
     emojis: [],
     favourited: false,
     favourites_count: 0,
-    id: `pending-${idempotencyKey}`,
+    id: `末pending-${idempotencyKey}`,
     in_reply_to_account_id: null,
     in_reply_to_id: pendingStatus.get('in_reply_to_id'),
     language: null,
diff --git a/app/soapbox/reducers/contexts.js b/app/soapbox/reducers/contexts.js
index 54ae70bd8..9bcf87b9a 100644
--- a/app/soapbox/reducers/contexts.js
+++ b/app/soapbox/reducers/contexts.js
@@ -101,13 +101,13 @@ const filterContexts = (state, relationship, statuses) => {
 };
 
 const importPendingStatus = (state, params, idempotencyKey) => {
-  const id = `pending-${idempotencyKey}`;
+  const id = `末pending-${idempotencyKey}`;
   const { in_reply_to_id } = params;
   return importStatus(state, { id, in_reply_to_id });
 };
 
 const deletePendingStatus = (state, { in_reply_to_id }, idempotencyKey) => {
-  const id = `pending-${idempotencyKey}`;
+  const id = `末pending-${idempotencyKey}`;
 
   return state.withMutations(state => {
     state.deleteIn(['inReplyTos', id]);
diff --git a/app/soapbox/reducers/timelines.js b/app/soapbox/reducers/timelines.js
index 9e2f93c77..f83aa206a 100644
--- a/app/soapbox/reducers/timelines.js
+++ b/app/soapbox/reducers/timelines.js
@@ -256,7 +256,7 @@ const replaceItem = (state, timelineId, oldId, newId) => {
 };
 
 const importPendingStatus = (state, params, idempotencyKey) => {
-  const statusId = `pending-${idempotencyKey}`;
+  const statusId = `末pending-${idempotencyKey}`;
 
   return state.withMutations(state => {
     const timelineIds = getTimelinesByVisibility(params.visibility);
@@ -268,7 +268,7 @@ const importPendingStatus = (state, params, idempotencyKey) => {
 };
 
 const replacePendingStatus = (state, idempotencyKey, newId) => {
-  const oldId = `pending-${idempotencyKey}`;
+  const oldId = `末pending-${idempotencyKey}`;
 
   state.keySeq().forEach(timelineId => {
     return replaceItem(state, timelineId, oldId, newId);