From 254eb7287031630182153a6fb35164e8371c9f8c Mon Sep 17 00:00:00 2001
From: N-Pex <npexdev@gmail.com>
Date: Tue, 22 Oct 2024 11:59:07 +0200
Subject: [PATCH] Allow admins/moderators to delete/pin in channels

---
 src/components/Chat.vue                     | 4 ++--
 src/components/RoomInfo.vue                 | 2 +-
 src/components/messages/MessageIncoming.vue | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index d25d233..a283675 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -1372,9 +1372,9 @@ export default {
         this.paginateBackIfNeeded();
       }
 
-      if (loadingDone && event.forwardLooking && (!(event.isRelation() || event.isRedaction()) || event.isMxThread || event.threadRootId || event.parentThread)) {
+      if (loadingDone && event.forwardLooking && (!event.isRelation() || event.isMxThread || event.threadRootId || event.parentThread)) {
         // If we are at bottom, scroll to see new events...
-        var scrollToSeeNew = event.getSender() == this.$matrix.currentUserId; // When we sent, scroll
+        var scrollToSeeNew = !event.isRedaction() && event.getSender() == this.$matrix.currentUserId; // When we sent, scroll
         const container = this.chatContainer;
         if (container) {
           if (this.reverseOrder && container.scrollTop.toFixed(0) == 0) {
diff --git a/src/components/RoomInfo.vue b/src/components/RoomInfo.vue
index a43d74b..59b4311 100644
--- a/src/components/RoomInfo.vue
+++ b/src/components/RoomInfo.vue
@@ -202,7 +202,7 @@
                     }}</span>
                   </v-avatar>
                   <v-avatar circle class="user-badge" size="15" v-if="isAdmin(member) || isModerator(member)">
-                    <v-icon>{{ `$vuetify.icons.${isAdmin(member)? 'make_admin' : 'make_moderator'}` }}</v-icon>
+                    <v-icon style="min-width: 15px;min-height: 15px;">{{ `$vuetify.icons.${isAdmin(member)? 'make_admin' : 'make_moderator'}` }}</v-icon>
                   </v-avatar>
                 </div>
                 <span class="user-name">
diff --git a/src/components/messages/MessageIncoming.vue b/src/components/messages/MessageIncoming.vue
index 6dd4a8f..da616c8 100644
--- a/src/components/messages/MessageIncoming.vue
+++ b/src/components/messages/MessageIncoming.vue
@@ -18,7 +18,7 @@
       <slot></slot>
     </span>
     <div class="pin-icon" v-if="isPinned"><v-icon>$vuetify.icons.ic_pin_filled</v-icon></div>
-    <div class="op-button" ref="opbutton" v-if="!event.isRedacted() && room.displayType != ROOM_TYPE_CHANNEL">
+    <div class="op-button" ref="opbutton" v-if="!event.isRedacted() && $matrix.userCanSendMessageInCurrentRoom">
       <v-btn id="btn-more" icon @click.stop="showContextMenu($refs.opbutton)">
         <v-icon>more_vert</v-icon>
       </v-btn>