Merge pull request #1742 from nextcloud/hide-nonrelevant-conversation…

…-settings Hide non-relevant conversation settings
nextcloud · Aug 9, 2024 · 18cd47e · 18cd47e
2 parents 6fae87c + 0d86c74
commit 18cd47e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/NextcloudTalk/NCRoom.swift b/NextcloudTalk/NCRoom.swift
@@ -68,6 +68,20 @@ import Realm
             self.type != .changelog && self.type != .noteToSelf
     }
 
+    public var supportsMessageExpirationModeration: Bool {
+        if self.type == .formerOneToOne || self.type == .changelog {
+            return false
+        }
+
+        return self.isUserOwnerOrModerator && NCDatabaseManager.sharedInstance().serverHasTalkCapability(kCapabilityMessageExpiration)
+    }
+
+    public var supportsBanningModeration: Bool {
+        let supportedType = self.type == .group || self.type == .public
+
+        return supportedType && self.canModerate && NCDatabaseManager.sharedInstance().serverHasTalkCapability(kCapabilityBanV1)
+    }
+
     public var isBreakoutRoom: Bool {
         return self.objectType == NCRoomObjectTypeRoom
     }

diff --git a/NextcloudTalk/RoomInfoTableViewController.m b/NextcloudTalk/RoomInfoTableViewController.m
@@ -405,12 +405,12 @@ - (NSArray *)getConversationActions
     NSMutableArray *actions = [[NSMutableArray alloc] init];
 
     // Message expiration action
-    if (_room.isUserOwnerOrModerator && [[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityMessageExpiration]) {
+    if ([_room supportsMessageExpirationModeration]) {
         [actions addObject:[NSNumber numberWithInt:kConversationActionMessageExpiration]];
     }
 
     // Banning actors
-    if (_room.isUserOwnerOrModerator && [[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityBanV1]) {
+    if ([_room supportsBanningModeration]) {
         [actions addObject:[NSNumber numberWithInt:kConversationActionBannedActors]];
     }