From 7f787bcebc7faf402aad78c6dab033e0ba82ab01 Mon Sep 17 00:00:00 2001
From: ElectricS01 <103579308+ElectricS01@users.noreply.github.com>
Date: Wed, 15 Feb 2023 22:18:00 +1100
Subject: [PATCH 1/2] Possible fix for out of sync read receipts

---
 .../Communications/CommunicationsChat.vue     | 124 +++++++-----------
 1 file changed, 46 insertions(+), 78 deletions(-)

diff --git a/frontend/src/views/Communications/CommunicationsChat.vue b/frontend/src/views/Communications/CommunicationsChat.vue
index 98d03a0..8b06560 100644
--- a/frontend/src/views/Communications/CommunicationsChat.vue
+++ b/frontend/src/views/Communications/CommunicationsChat.vue
@@ -301,6 +301,52 @@
               style="display: block; width: 100px; margin: 0 auto"
             ></v-progress-circular>
             <template v-for="(message, index) in messages">
+              <div
+                  :key="'div2-' + message.keyId"
+                  v-if="message.readReceipts.length"
+              >
+                <v-tooltip
+                    v-for="association in message.readReceipts"
+                    :key="association.id"
+                    top
+                >
+                  <template
+                      v-slot:activator="{ on }"
+                      v-if="association.user.id !== $store.state.user.id"
+                  >
+                    <v-btn
+                        icon
+                        small
+                        fab
+                        width="20"
+                        height="20"
+                        class="ml-2 mt-2"
+                        style="float: right"
+                        @click="openUserPanel(association.user)"
+                    >
+                      <v-avatar size="20" v-on="on" color="primary">
+                        <img
+                            v-if="association.user.avatar"
+                            :src="
+                            $store.state.baseURL +
+                            '/usercontent/' +
+                            association.user.avatar
+                          "
+                            alt="avatar"
+                        />
+                        <span v-else>{{
+                            association.user.username[0].toUpperCase()
+                          }}</span>
+                      </v-avatar>
+                    </v-btn>
+                  </template>
+                  <span>
+                    {{ association.user.username }} has read up to this point.
+                  </span>
+                </v-tooltip>
+                <br v-if="index + 1 > messages.length" />
+                <br v-if="index + 1 > messages.length" />
+              </div>
               <Message
                 :key="message.keyId"
                 :message="message"
@@ -326,85 +372,7 @@
                   !message.type
                 "
               ></Message>
-              <div
-                :key="'div2-' + message.keyId"
-                v-if="message.readReceipts.length"
-              >
-                <v-tooltip
-                  v-for="association in message.readReceipts"
-                  :key="association.id"
-                  top
-                >
-                  <template
-                    v-slot:activator="{ on }"
-                    v-if="association.user.id !== $store.state.user.id"
-                  >
-                    <v-btn
-                      icon
-                      small
-                      fab
-                      width="20"
-                      height="20"
-                      class="ml-2 mt-2"
-                      style="float: right"
-                      @click="openUserPanel(association.user)"
-                    >
-                      <v-avatar size="20" v-on="on" color="primary">
-                        <img
-                          v-if="association.user.avatar"
-                          :src="
-                            $store.state.baseURL +
-                            '/usercontent/' +
-                            association.user.avatar
-                          "
-                          alt="avatar"
-                        />
-                        <span v-else>{{
-                          association.user.username[0].toUpperCase()
-                        }}</span>
-                      </v-avatar>
-                    </v-btn>
-                  </template>
-                  <span>
-                    {{ association.user.username }} has read up to this point.
-                  </span>
-                </v-tooltip>
-                <br v-if="index + 1 > messages.length" />
-                <br v-if="index + 1 > messages.length" />
-              </div>
             </template>
-            <v-tooltip top>
-              <template v-slot:activator="{ on }">
-                <v-btn
-                  icon
-                  small
-                  fab
-                  width="20"
-                  height="20"
-                  class="ml-2 mt-2"
-                  style="float: right"
-                  @click="openUserPanel($store.state.user)"
-                >
-                  <v-avatar size="20" v-on="on" color="primary">
-                    <img
-                      v-if="$store.state.user.avatar"
-                      :src="
-                        $store.state.baseURL +
-                        '/usercontent/' +
-                        $store.state.user.avatar
-                      "
-                      alt="avatar"
-                    />
-                    <span v-else>{{
-                      $store.state.user.username[0].toUpperCase()
-                    }}</span>
-                  </v-avatar>
-                </v-btn>
-              </template>
-              <span>
-                {{ $store.state.user.username }} has read up to this point.
-              </span>
-            </v-tooltip>
           </v-card-text>
         </v-card>
       </v-col>

From 7261f7029326e279257633623280983284ec3e7a Mon Sep 17 00:00:00 2001
From: ElectricS01 <103579308+ElectricS01@users.noreply.github.com>
Date: Wed, 15 Feb 2023 22:54:49 +1100
Subject: [PATCH 2/2] Fixed broken formatting

---
 .../Communications/CommunicationsChat.vue     | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/frontend/src/views/Communications/CommunicationsChat.vue b/frontend/src/views/Communications/CommunicationsChat.vue
index 8b06560..5c34f5a 100644
--- a/frontend/src/views/Communications/CommunicationsChat.vue
+++ b/frontend/src/views/Communications/CommunicationsChat.vue
@@ -302,41 +302,41 @@
             ></v-progress-circular>
             <template v-for="(message, index) in messages">
               <div
-                  :key="'div2-' + message.keyId"
-                  v-if="message.readReceipts.length"
+                :key="'div2-' + message.keyId"
+                v-if="message.readReceipts.length"
               >
                 <v-tooltip
-                    v-for="association in message.readReceipts"
-                    :key="association.id"
-                    top
+                  v-for="association in message.readReceipts"
+                  :key="association.id"
+                  top
                 >
                   <template
-                      v-slot:activator="{ on }"
-                      v-if="association.user.id !== $store.state.user.id"
+                    v-slot:activator="{ on }"
+                    v-if="association.user.id !== $store.state.user.id"
                   >
                     <v-btn
-                        icon
-                        small
-                        fab
-                        width="20"
-                        height="20"
-                        class="ml-2 mt-2"
-                        style="float: right"
-                        @click="openUserPanel(association.user)"
+                      icon
+                      small
+                      fab
+                      width="20"
+                      height="20"
+                      class="ml-2 mt-2"
+                      style="float: right"
+                      @click="openUserPanel(association.user)"
                     >
                       <v-avatar size="20" v-on="on" color="primary">
                         <img
-                            v-if="association.user.avatar"
-                            :src="
+                          v-if="association.user.avatar"
+                          :src="
                             $store.state.baseURL +
                             '/usercontent/' +
                             association.user.avatar
                           "
-                            alt="avatar"
+                          alt="avatar"
                         />
                         <span v-else>{{
-                            association.user.username[0].toUpperCase()
-                          }}</span>
+                          association.user.username[0].toUpperCase()
+                        }}</span>
                       </v-avatar>
                     </v-btn>
                   </template>