Merge pull request #1762 from nextcloud/dont-ban-federated-user

Remove option to ban federated users
nextcloud · Aug 14, 2024 · b9c9fec · b9c9fec
2 parents b29e3b1 + be2fee6
commit b9c9fec
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/NextcloudTalk/NCRoomParticipant.h b/NextcloudTalk/NCRoomParticipant.h
@@ -19,6 +19,7 @@ extern NSString * const NCAttendeeTypeGroup;
 extern NSString * const NCAttendeeTypeCircle;
 extern NSString * const NCAttendeeTypeGuest;
 extern NSString * const NCAttendeeTypeEmail;
+extern NSString * const NCAttendeeTypeFederated;
 
 extern NSString * const NCAttendeeBridgeBotId;
 
@@ -48,6 +49,7 @@ extern NSString * const NCAttendeeBridgeBotId;
 - (BOOL)isGroup;
 - (BOOL)isCircle;
 - (BOOL)isOffline;
+- (BOOL)isFederated;
 - (NSString *)detailedName;
 - (NSString *)participantId;
 

diff --git a/NextcloudTalk/NCRoomParticipants.m b/NextcloudTalk/NCRoomParticipants.m
@@ -13,6 +13,7 @@
 NSString * const NCAttendeeTypeCircle   = @"circles";
 NSString * const NCAttendeeTypeGuest    = @"guests";
 NSString * const NCAttendeeTypeEmail    = @"emails";
+NSString * const NCAttendeeTypeFederated = @"federated_users";
 
 NSString * const NCAttendeeBridgeBotId  = @"bridge-bot";
 
@@ -103,6 +104,11 @@ - (BOOL)isCircle
     return [_actorType isEqualToString:NCAttendeeTypeCircle];
 }
 
+- (BOOL)isFederated
+{
+    return [_actorType isEqualToString:NCAttendeeTypeFederated];
+}
+
 - (BOOL)isOffline
 {
     return ([_sessionId isEqualToString:@"0"] || [_sessionId isEqualToString:@""] || !_sessionId) && _sessionIds.count == 0;

diff --git a/NextcloudTalk/RoomInfoTableViewController.m b/NextcloudTalk/RoomInfoTableViewController.m
@@ -1286,7 +1286,7 @@ - (void)showOptionsForParticipantAtIndexPath:(NSIndexPath *)indexPath
     }
 
     if (canParticipantBeModerated) {
-        if ([[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityBanV1] && !participant.isGroup && !participant.isCircle) {
+        if ([[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityBanV1] && !participant.isGroup && !participant.isCircle && !participant.isFederated) {
             NSString *banTitle = NSLocalizedString(@"Ban participant", nil);
 
             UIAlertAction *banParticipant = [UIAlertAction actionWithTitle:banTitle