Allow admins/moderators to delete/pin in channels

This commit is contained in:
N-Pex 2024-10-22 11:59:07 +02:00
parent 35b2dc60d7
commit 254eb72870
3 changed files with 4 additions and 4 deletions

View file

@ -1372,9 +1372,9 @@ export default {
this.paginateBackIfNeeded(); 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... // 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; const container = this.chatContainer;
if (container) { if (container) {
if (this.reverseOrder && container.scrollTop.toFixed(0) == 0) { if (this.reverseOrder && container.scrollTop.toFixed(0) == 0) {

View file

@ -202,7 +202,7 @@
}}</span> }}</span>
</v-avatar> </v-avatar>
<v-avatar circle class="user-badge" size="15" v-if="isAdmin(member) || isModerator(member)"> <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> </v-avatar>
</div> </div>
<span class="user-name"> <span class="user-name">

View file

@ -18,7 +18,7 @@
<slot></slot> <slot></slot>
</span> </span>
<div class="pin-icon" v-if="isPinned"><v-icon>$vuetify.icons.ic_pin_filled</v-icon></div> <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-btn id="btn-more" icon @click.stop="showContextMenu($refs.opbutton)">
<v-icon>more_vert</v-icon> <v-icon>more_vert</v-icon>
</v-btn> </v-btn>