Skip to content

Allow message expiration in one2one rooms #928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ivansss merged 1 commit into from
Oct 17, 2022
Merged

Allow message expiration in one2one rooms #928

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions NextcloudTalk/RoomInfoTableViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,21 +317,17 @@ - (NSArray *)getRoomInfoSections
if ([[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityNotificationLevels]) {
[sections addObject:[NSNumber numberWithInt:kRoomInfoSectionNotifications]];
}
// Conversation section
if ([self getConversationActions].count > 0) {
[sections addObject:[NSNumber numberWithInt:kRoomInfoSectionConversation]];
}
// Moderator sections
if (_room.canModerate) {
// Guests section
[sections addObject:[NSNumber numberWithInt:kRoomInfoSectionGuests]];

if (_room.type != kNCRoomTypeOneToOne) {
// Conversation section
if ([[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityReadOnlyRooms] || [[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityListableRooms]) {
[sections addObject:[NSNumber numberWithInt:kRoomInfoSectionConversation]];
}

// Webinar section
if ([[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityWebinaryLobby]) {
[sections addObject:[NSNumber numberWithInt:kRoomInfoSectionWebinar]];
}
// Webinar section
if (_room.type != kNCRoomTypeOneToOne && [[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityWebinaryLobby]) {
[sections addObject:[NSNumber numberWithInt:kRoomInfoSectionWebinar]];
}
}
// SIP section
Expand Down Expand Up @@ -426,22 +422,23 @@ - (NSArray *)getConversationActions
{
NSMutableArray *actions = [[NSMutableArray alloc] init];
// Message expiration action
if ([[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityMessageExpiration]) {
if (_room.isUserOwnerOrModerator && [[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityMessageExpiration]) {
[actions addObject:[NSNumber numberWithInt:kConversationActionMessageExpiration]];
}

// Listable room action
if ([[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityListableRooms]) {
[actions addObject:[NSNumber numberWithInt:kConversationActionListable]];

if (_room.listable != NCRoomListableScopeParticipantsOnly && [[NCSettingsController sharedInstance] isGuestsAppEnabled]) {
[actions addObject:[NSNumber numberWithInt:kConversationActionListableForEveryone]];
if (_room.canModerate) {
// Listable room action
if ([[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityListableRooms]) {
[actions addObject:[NSNumber numberWithInt:kConversationActionListable]];

if (_room.listable != NCRoomListableScopeParticipantsOnly && [[NCSettingsController sharedInstance] isGuestsAppEnabled]) {
[actions addObject:[NSNumber numberWithInt:kConversationActionListableForEveryone]];
}
}
}

// Read only room action
if ([[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityReadOnlyRooms]) {
[actions addObject:[NSNumber numberWithInt:kConversationActionReadOnly]];
// Read only room action
if ([[NCDatabaseManager sharedInstance] serverHasTalkCapability:kCapabilityReadOnlyRooms]) {
[actions addObject:[NSNumber numberWithInt:kConversationActionReadOnly]];
}
}

return [NSArray arrayWithArray:actions];
Expand Down