feat: Add busy user status support

NextcloudTalk/AddParticipantsTableViewController.m

@@ -467,10 +467,12 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
     TalkAccount *account = self->_room.account;
 
-    if (account) {
-        [cell.contactImage setActorAvatarForId:participant.userId withType:participant.source withDisplayName:participant.name withRoomToken:_room.token using:account];
+    if (!account) {
+        account = [[NCDatabaseManager sharedInstance] activeAccount];
     }
 
+    [cell.contactImage setActorAvatarForId:participant.userId withType:participant.source withDisplayName:participant.name withRoomToken:_room.token using:account];
+
     UIImage *selectionImage = [UIImage systemImageNamed:@"circle"];
     UIColor *selectionImageColor = [UIColor tertiaryLabelColor];
     if ([self isParticipantAlreadySelected:participant]) {

NextcloudTalk/AutoCompletionTableViewCell.m

@@ -99,13 +99,15 @@ - (void)setUserStatus:(NSString *)userStatus
 {
     UIImage *statusImage = nil;
     if ([userStatus isEqualToString:@"online"]) {
-        statusImage = [UIImage imageNamed:@"user-status-online-10"];
+        statusImage = [NCUtils renderAspectImageWithImage:[NCUserStatus getOnlineSFIcon] ofSize:CGSizeMake(10, 10) centerImage:NO];
     } else if ([userStatus isEqualToString:@"away"]) {
-        statusImage = [UIImage imageNamed:@"user-status-away-10"];
+        statusImage = [NCUtils renderAspectImageWithImage:[NCUserStatus getAwaySFIcon] ofSize:CGSizeMake(10, 10) centerImage:NO];
+    } else if ([userStatus isEqualToString:@"busy"]) {
+        statusImage = [NCUtils renderAspectImageWithImage:[NCUserStatus getBusySFIcon] ofSize:CGSizeMake(10, 10) centerImage:NO];
     } else if ([userStatus isEqualToString:@"dnd"]) {
-        statusImage = [UIImage imageNamed:@"user-status-dnd-10"];
+        statusImage = [NCUtils renderAspectImageWithImage:[NCUserStatus getDoNotDisturbSFIcon] ofSize:CGSizeMake(10, 10) centerImage:NO];
     }
-    
+
     if (statusImage) {
         [_userStatusImageView setImage:statusImage];
         _userStatusImageView.contentMode = UIViewContentModeCenter;

NextcloudTalk/AvatarView.swift

@@ -147,11 +147,15 @@ import SDWebImage
 
     private func setUserStatus(_ userStatus: String, with backgroundColor: UIColor) {
         if userStatus == "online" {
-            if let statusImage = statusImageWith(name: "circle.fill", color: .systemGreen, padding: 2) {
+            if let statusImage = statusImageWith(name: "checkmark.circle.fill", color: .systemGreen, padding: 2) {
                 setUserStatusImage(statusImage, with: backgroundColor)
             }
         } else if userStatus == "away" {
-            if let statusImage = statusImageWith(name: "moon.fill", color: .systemYellow, padding: 2) {
+            if let statusImage = statusImageWith(name: "clock.fill", color: .systemYellow, padding: 2) {
+                setUserStatusImage(statusImage, with: backgroundColor)
+            }
+        } else if userStatus == "busy" {
+            if let statusImage = statusImageWith(name: "circle.fill", color: .systemRed, padding: 2) {
                 setUserStatusImage(statusImage, with: backgroundColor)
             }
         } else if userStatus == "dnd" {

NextcloudTalk/ContactsTableViewCell.m

@@ -55,13 +55,15 @@ - (void)setUserStatus:(NSString *)userStatus
 {
     UIImage *statusImage = nil;
     if ([userStatus isEqualToString:@"online"]) {
-        statusImage = [UIImage imageNamed:@"user-status-online"];
+        statusImage = [NCUtils renderAspectImageWithImage:[NCUserStatus getOnlineSFIcon] ofSize:CGSizeMake(16, 16) centerImage:NO];
     } else if ([userStatus isEqualToString:@"away"]) {
-        statusImage = [UIImage imageNamed:@"user-status-away"];
+        statusImage = [NCUtils renderAspectImageWithImage:[NCUserStatus getAwaySFIcon] ofSize:CGSizeMake(16, 16) centerImage:NO];
+    } else if ([userStatus isEqualToString:@"busy"]) {
+        statusImage = [NCUtils renderAspectImageWithImage:[NCUserStatus getBusySFIcon] ofSize:CGSizeMake(16, 16) centerImage:NO];
     } else if ([userStatus isEqualToString:@"dnd"]) {
-        statusImage = [UIImage imageNamed:@"user-status-dnd"];
+        statusImage = [NCUtils renderAspectImageWithImage:[NCUserStatus getDoNotDisturbSFIcon] ofSize:CGSizeMake(16, 16) centerImage:NO];
     }
-    
+
     if (statusImage) {
         [self setUserStatusIconWithImage:statusImage];
     }

NextcloudTalk/NCChatTitleView.m

@@ -122,11 +122,13 @@ - (void)setStatusImageForUserStatus:(NSString *)userStatus
 {
     UIImage *statusImage = nil;
     if ([userStatus isEqualToString:@"online"]) {
-        statusImage = [UIImage imageNamed:@"user-status-online-10"];
+        statusImage = [NCUtils renderAspectImageWithImage:[NCUserStatus getOnlineSFIcon] ofSize:CGSizeMake(10, 10) centerImage:NO];
     } else if ([userStatus isEqualToString:@"away"]) {
-        statusImage = [UIImage imageNamed:@"user-status-away-10"];
+        statusImage = [NCUtils renderAspectImageWithImage:[NCUserStatus getAwaySFIcon] ofSize:CGSizeMake(10, 10) centerImage:NO];
+    } else if ([userStatus isEqualToString:@"busy"]) {
+        statusImage = [NCUtils renderAspectImageWithImage:[NCUserStatus getBusySFIcon] ofSize:CGSizeMake(10, 10) centerImage:NO];
     } else if ([userStatus isEqualToString:@"dnd"]) {
-        statusImage = [UIImage imageNamed:@"user-status-dnd-10"];
+        statusImage = [NCUtils renderAspectImageWithImage:[NCUserStatus getDoNotDisturbSFIcon] ofSize:CGSizeMake(10, 10) centerImage:NO];
     }
 
     if (statusImage) {

NextcloudTalk/NCDatabaseManager.m

@@ -16,7 +16,7 @@
 
 NSString *const kTalkDatabaseFolder                 = @"Library/Application Support/Talk";
 NSString *const kTalkDatabaseFileName               = @"talk.realm";
-uint64_t const kTalkDatabaseSchemaVersion           = 79;
+uint64_t const kTalkDatabaseSchemaVersion           = 80;
 
 NSString * const kCapabilitySystemMessages          = @"system-messages";
 NSString * const kCapabilityNotificationLevels      = @"notification-levels";
@@ -664,6 +664,7 @@ - (void)setServerCapabilities:(NSDictionary *)serverCapabilities forAccountId:(N
     capabilities.versionMicro = [[version objectForKey:@"micro"] integerValue];
     capabilities.edition = [version objectForKey:@"edition"];
     capabilities.userStatus = [[userStatusCaps objectForKey:@"enabled"] boolValue];
+    capabilities.userStatusSupportsBusy = [[userStatusCaps objectForKey:@"supports_busy"] boolValue];
     capabilities.extendedSupport = [[version objectForKey:@"extendedSupport"] boolValue];
     capabilities.accountPropertyScopesVersion2 = [[provisioningAPICaps objectForKey:@"AccountPropertyScopesVersion"] integerValue] == 2;
     capabilities.accountPropertyScopesFederationEnabled = [[provisioningAPICaps objectForKey:@"AccountPropertyScopesFederationEnabled"] boolValue];

NextcloudTalk/NCUserStatus.h

@@ -10,6 +10,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 extern NSString * const kUserStatusOnline;
 extern NSString * const kUserStatusAway;
+extern NSString * const kUserStatusBusy;
 extern NSString * const kUserStatusDND;
 extern NSString * const kUserStatusInvisible;
 extern NSString * const kUserStatusOffline;
@@ -29,6 +30,7 @@ extern NSString * const kUserStatusOffline;
 + (NSString *)readableUserStatusFromUserStatus:(NSString *)userStatus;
 + (UIImage *)getOnlineSFIcon;
 + (UIImage *)getAwaySFIcon;
++ (UIImage *)getBusySFIcon;
 + (UIImage *)getDoNotDisturbSFIcon;
 + (UIImage *)getInvisibleSFIcon;
 - (NSString *)readableUserStatus;

NextcloudTalk/NCUserStatus.m

@@ -7,6 +7,7 @@
 
 NSString * const kUserStatusOnline      = @"online";
 NSString * const kUserStatusAway        = @"away";
+NSString * const kUserStatusBusy        = @"busy";
 NSString * const kUserStatusDND         = @"dnd";
 NSString * const kUserStatusInvisible   = @"invisible";
 NSString * const kUserStatusOffline     = @"offline";
@@ -54,6 +55,8 @@ + (NSString *)readableUserStatusFromUserStatus:(NSString *)userStatus
         readableUserStatus = NSLocalizedString(@"Online", nil);
     } else if ([userStatus isEqualToString:kUserStatusAway]) {
         readableUserStatus = NSLocalizedString(@"Away", nil);
+    } else if ([userStatus isEqualToString:kUserStatusBusy]) {
+        readableUserStatus = NSLocalizedString(@"Busy", nil);
     } else if ([userStatus isEqualToString:kUserStatusDND]) {
         readableUserStatus = NSLocalizedString(@"Do not disturb", nil);
     } else if ([userStatus isEqualToString:kUserStatusInvisible]) {
@@ -67,12 +70,17 @@ + (NSString *)readableUserStatusFromUserStatus:(NSString *)userStatus
 
 + (UIImage *)getOnlineSFIcon
 {
-    return [[UIImage systemImageNamed:@"circle.fill"] imageWithTintColor:[UIColor systemGreenColor] renderingMode:UIImageRenderingModeAlwaysOriginal];
+    return [[UIImage systemImageNamed:@"checkmark.circle.fill"] imageWithTintColor:[UIColor systemGreenColor] renderingMode:UIImageRenderingModeAlwaysOriginal];
 }
 
 + (UIImage *)getAwaySFIcon
 {
-    return [[UIImage systemImageNamed:@"moon.fill"] imageWithTintColor:[UIColor systemYellowColor] renderingMode:UIImageRenderingModeAlwaysOriginal];
+    return [[UIImage systemImageNamed:@"clock.fill"] imageWithTintColor:[UIColor systemYellowColor] renderingMode:UIImageRenderingModeAlwaysOriginal];
+}
+
++ (UIImage *)getBusySFIcon
+{
+    return [[UIImage systemImageNamed:@"circle.fill"] imageWithTintColor:[UIColor systemRedColor] renderingMode:UIImageRenderingModeAlwaysOriginal];
 }
 
 + (UIImage *)getDoNotDisturbSFIcon
@@ -129,6 +137,8 @@ - (UIImage *)getSFUserStatusIcon
         return [NCUserStatus getOnlineSFIcon];
     } else if ([_status isEqualToString:kUserStatusAway]) {
         return [NCUserStatus getAwaySFIcon];
+    } else if ([_status isEqualToString:kUserStatusBusy]) {
+        return [NCUserStatus getBusySFIcon];
     } else if ([_status isEqualToString:kUserStatusDND]) {
         return [NCUserStatus getDoNotDisturbSFIcon];
     } else if ([_status isEqualToString:kUserStatusInvisible]) {
@@ -142,6 +152,7 @@ - (BOOL)hasVisibleStatusIcon
 {
     return [_status isEqualToString:kUserStatusOnline] ||
     [_status isEqualToString:kUserStatusAway] ||
+    [_status isEqualToString:kUserStatusBusy] ||
     [_status isEqualToString:kUserStatusDND] ||
     [_status isEqualToString:kUserStatusInvisible];
 }

NextcloudTalk/NCUserStatusExtensions.swift

@@ -9,11 +9,15 @@ import SwiftUI
 extension NCUserStatus {
 
     static func getOnlineIcon() -> some View {
-        return Image(systemName: "circle.fill").font(.system(size: 16)).symbolRenderingMode(.monochrome).foregroundStyle(.green)
+        return Image(systemName: "checkmark.circle.fill").font(.system(size: 16)).symbolRenderingMode(.monochrome).foregroundStyle(.green)
     }
 
     static func getAwayIcon() -> some View {
-        return Image(systemName: "moon.fill").font(.system(size: 16)).symbolRenderingMode(.monochrome).foregroundStyle(.yellow)
+        return Image(systemName: "clock.fill").font(.system(size: 16)).symbolRenderingMode(.monochrome).foregroundStyle(.yellow)
+    }
+
+    static func getBusyIcon() -> some View {
+        return Image(systemName: "circle.fill").font(.system(size: 16)).symbolRenderingMode(.monochrome).foregroundStyle(.red)
     }
 
     static func getDoNotDisturbIcon() -> some View {
@@ -33,6 +37,8 @@ extension NCUserStatus {
             return getOnlineIcon()
         } else if userStatus == kUserStatusAway {
             return getAwayIcon()
+        } else if userStatus == kUserStatusBusy {
+            return getBusyIcon()
         } else if userStatus == kUserStatusDND {
             return getDoNotDisturbIcon()
         } else if userStatus == kUserStatusInvisible {

NextcloudTalk/ServerCapabilities.h

@@ -29,6 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property NSInteger versionMicro;
 @property NSString *edition;
 @property BOOL userStatus;
+@property BOOL userStatusSupportsBusy;
 @property BOOL extendedSupport;
 @property BOOL accountPropertyScopesVersion2;
 @property BOOL accountPropertyScopesFederationEnabled;

NextcloudTalk/UserStatusMessageSwiftUIView.swift

@@ -284,6 +284,7 @@ struct UserStatusMessageSwiftUIView: View {
         }
 
         // Period
+        // TODO: Use calendar here...
         if clearAtTime != nil && clearAtType == "period" {
             switch clearAtTime {
             case "14400":
@@ -292,6 +293,8 @@ struct UserStatusMessageSwiftUIView: View {
                 return NSLocalizedString("an hour", comment: "")
             case "1800":
                 return NSLocalizedString("30 minutes", comment: "")
+            case "900":
+                return NSLocalizedString("15 minutes", comment: "")
             default:
                 return clearAtTime!
             }

NextcloudTalk/UserStatusOptionsSwiftUI.swift

@@ -82,6 +82,10 @@ struct UserStatusOptionsSwiftUI: View {
         awayOption.identifier = kUserStatusAway
         awayOption.title = NCUserStatus.readableUserStatus(fromUserStatus: kUserStatusAway)
 
+        let busyOption = DetailedOption()
+        busyOption.identifier = kUserStatusBusy
+        busyOption.title = NCUserStatus.readableUserStatus(fromUserStatus: kUserStatusBusy)
+
         let dndOption = DetailedOption()
         dndOption.identifier = kUserStatusDND
         dndOption.title = NCUserStatus.readableUserStatus(fromUserStatus: kUserStatusDND)
@@ -92,8 +96,14 @@ struct UserStatusOptionsSwiftUI: View {
         invisibleOption.title = NCUserStatus.readableUserStatus(fromUserStatus: kUserStatusInvisible)
         invisibleOption.subtitle = NSLocalizedString("Appear offline", comment: "")
 
+        let activeAccount: TalkAccount = NCDatabaseManager.sharedInstance().activeAccount()
+        let serverCapabilities = NCDatabaseManager.sharedInstance().serverCapabilities(forAccountId: activeAccount.accountId)
+
         options.append(onlineOption)
         options.append(awayOption)
+        if let serverCapabilities, serverCapabilities.userStatusSupportsBusy {
+            options.append(busyOption)
+        }
         options.append(dndOption)
         options.append(invisibleOption)
     }