From 17f68088d1b8080b8f4579852e728a7ce562b768 Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Sun, 8 Aug 2021 10:16:48 +0100
Subject: [PATCH] Show server identity in message replies and typing indicator.
 Revert reply connector temporarily.

---
 .../messaging/attachments/MessageReply.tsx    | 14 +++++-
 .../common/messaging/bars/ReplyBar.tsx        |  8 +++-
 .../common/messaging/bars/TypingIndicator.tsx | 43 ++++++++++---------
 src/components/common/user/UserShort.tsx      | 10 ++++-
 4 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/src/components/common/messaging/attachments/MessageReply.tsx b/src/components/common/messaging/attachments/MessageReply.tsx
index d966fecf..68f50d7b 100644
--- a/src/components/common/messaging/attachments/MessageReply.tsx
+++ b/src/components/common/messaging/attachments/MessageReply.tsx
@@ -1,3 +1,4 @@
+import { Reply } from "@styled-icons/boxicons-regular";
 import { File } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
 import { useHistory } from "react-router-dom";
@@ -38,6 +39,9 @@ export const ReplyBase = styled.div<{
     align-items: center;
     color: var(--secondary-foreground);
 
+    /* nizune's Discord replies,
+        does not scale properly with messages,
+        reverted temporarily
     &::before {
         content: "";
         height: 10px;
@@ -48,7 +52,7 @@ export const ReplyBase = styled.div<{
         border-top: 2.2px solid var(--tertiary-foreground);
         border-inline-start: 2.2px solid var(--tertiary-foreground);
         border-start-start-radius: 6px;
-    }
+    }*/
 
     * {
         overflow: hidden;
@@ -153,6 +157,7 @@ export const MessageReply = observer(({ index, channel, id }: Props) => {
     if (!message) {
         return (
             <ReplyBase head={index === 0} fail>
+                <Reply size={16} />
                 <span>
                     <Text id="app.main.channel.misc.failed_load" />
                 </span>
@@ -164,6 +169,7 @@ export const MessageReply = observer(({ index, channel, id }: Props) => {
 
     return (
         <ReplyBase head={index === 0}>
+            <Reply size={16} />
             {message.author?.relationship === RelationshipStatus.Blocked ? (
                 <Text id="app.main.channel.misc.blocked_user" />
             ) : (
@@ -173,7 +179,11 @@ export const MessageReply = observer(({ index, channel, id }: Props) => {
                     ) : (
                         <>
                             <div className="user">
-                                <UserShort user={message.author} size={16} />
+                                <UserShort
+                                    user={message.author}
+                                    size={16}
+                                    showServerIdentity
+                                />
                             </div>
                             <div
                                 className="content"
diff --git a/src/components/common/messaging/bars/ReplyBar.tsx b/src/components/common/messaging/bars/ReplyBar.tsx
index bbcc79bd..5a408af1 100644
--- a/src/components/common/messaging/bars/ReplyBar.tsx
+++ b/src/components/common/messaging/bars/ReplyBar.tsx
@@ -114,7 +114,11 @@ export default observer(({ channel, replies, setReplies }: Props) => {
                         <ReplyBase preview>
                             <ReplyIcon size={22} />
                             <div class="username">
-                                <UserShort user={message.author} size={16} />
+                                <UserShort
+                                    user={message.author}
+                                    size={16}
+                                    showServerIdentity
+                                />
                             </div>
                             <div class="message">
                                 {message.attachments && (
@@ -130,7 +134,7 @@ export default observer(({ channel, replies, setReplies }: Props) => {
                                     </>
                                 )}
                                 {message.author_id === SYSTEM_USER_ID ? (
-                                    <SystemMessage message={message} />
+                                    <SystemMessage message={message} hideInfo />
                                 ) : (
                                     <Markdown
                                         disallowBigEmoji
diff --git a/src/components/common/messaging/bars/TypingIndicator.tsx b/src/components/common/messaging/bars/TypingIndicator.tsx
index 15d39946..18ddcf1c 100644
--- a/src/components/common/messaging/bars/TypingIndicator.tsx
+++ b/src/components/common/messaging/bars/TypingIndicator.tsx
@@ -5,6 +5,11 @@ import styled from "styled-components";
 
 import { Text } from "preact-i18n";
 
+import { TextReact } from "../../../../lib/i18n";
+
+import UserIcon from "../../user/UserIcon";
+import { Username } from "../../user/UserShort";
+
 interface Props {
     channel: Channel;
 }
@@ -31,15 +36,8 @@ const Base = styled.div`
     .avatars {
         display: flex;
 
-        img {
-            width: 16px;
-            height: 16px;
-            object-fit: cover;
-            border-radius: 50%;
-
-            &:not(:first-child) {
-                margin-left: -4px;
-            }
+        :not(:first-child) {
+            margin-left: -4px;
         }
     }
 
@@ -69,27 +67,31 @@ export default observer(({ channel }: Props) => {
         if (users.length >= 5) {
             text = <Text id="app.main.channel.typing.several" />;
         } else if (users.length > 1) {
-            const userlist = [...users].map((x) => x!.username);
+            const userlist = [...users].map((x) => (
+                <Username key={x!._id} user={x} showServerIdentity />
+            ));
             const user = userlist.pop();
 
-            /*for (let i = 0; i < userlist.length - 1; i++) {
-                userlist.splice(i * 2 + 1, 0, ", ");
-            }*/
+            for (let i = 0; i < userlist.length - 1; i++) {
+                userlist.splice(i * 2 + 1, 0, <span key={`sep_${i}`}>, </span>);
+            }
 
             text = (
-                <Text
+                <TextReact
                     id="app.main.channel.typing.multiple"
                     fields={{
                         user,
-                        userlist: userlist.join(", "),
+                        userlist,
                     }}
                 />
             );
         } else {
             text = (
-                <Text
+                <TextReact
                     id="app.main.channel.typing.single"
-                    fields={{ user: users[0]!.username }}
+                    fields={{
+                        user: <Username user={users[0]} showServerIdentity />,
+                    }}
                 />
             );
         }
@@ -99,10 +101,11 @@ export default observer(({ channel }: Props) => {
                 <div>
                     <div className="avatars">
                         {users.map((user) => (
-                            <img
+                            <UserIcon
                                 key={user!._id}
-                                loading="eager"
-                                src={user!.generateAvatarURL({ max_side: 256 })}
+                                target={user}
+                                size={16}
+                                showServerIdentity
                             />
                         ))}
                     </div>
diff --git a/src/components/common/user/UserShort.tsx b/src/components/common/user/UserShort.tsx
index 331796f7..61e7eeb2 100644
--- a/src/components/common/user/UserShort.tsx
+++ b/src/components/common/user/UserShort.tsx
@@ -61,14 +61,20 @@ export const Username = observer(
 export default function UserShort({
     user,
     size,
+    showServerIdentity,
 }: {
     user?: User;
     size?: number;
+    showServerIdentity?: boolean;
 }) {
     return (
         <>
-            <UserIcon size={size ?? 24} target={user} />
-            <Username user={user} />
+            <UserIcon
+                size={size ?? 24}
+                target={user}
+                showServerIdentity={showServerIdentity}
+            />
+            <Username user={user} showServerIdentity={showServerIdentity} />
         </>
     );
 }