From d14cd07a5c19882ca1c2666c5905f4eed9d83bf2 Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Fri, 16 Sep 2022 10:16:52 +1000 Subject: [PATCH] minor refactor --- SessionMessagingKit/Configuration.swift | 4 +--- .../Database/Models/OpenGroup.swift | 18 +++++++++--------- .../Open Groups/OpenGroupManager.swift | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/SessionMessagingKit/Configuration.swift b/SessionMessagingKit/Configuration.swift index 01e5d8124..aa7ae21c2 100644 --- a/SessionMessagingKit/Configuration.swift +++ b/SessionMessagingKit/Configuration.swift @@ -22,9 +22,7 @@ public enum SNMessagingKit { // Just to make the external API nice _007_HomeQueryOptimisationIndexes.self ], [ - _008_EmojiReacts.self - ], - [ + _008_EmojiReacts.self, _009_OpenGroupPermission.self ] ] diff --git a/SessionMessagingKit/Database/Models/OpenGroup.swift b/SessionMessagingKit/Database/Models/OpenGroup.swift index d97b7bd9c..48112352c 100644 --- a/SessionMessagingKit/Database/Models/OpenGroup.swift +++ b/SessionMessagingKit/Database/Models/OpenGroup.swift @@ -37,21 +37,21 @@ public struct OpenGroup: Codable, Identifiable, FetchableRecord, PersistableReco self.rawValue = rawValue } - public func toString() -> String { - return "" - .appending(self.contains(.read) ? "r" : "-") - .appending(self.contains(.write) ? "w" : "-") - .appending(self.contains(.upload) ? "u" : "-") - } - - public static func getPermissionsfromRoomInfo(_ roomInfo: OpenGroupAPI.RoomPollInfo) -> Permissions { + public init(roomInfo: OpenGroupAPI.RoomPollInfo) { var permissions: Permissions = [] if roomInfo.read { permissions.insert(.read) } if roomInfo.write { permissions.insert(.write) } if roomInfo.upload { permissions.insert(.upload) } - return permissions + self.init(rawValue: permissions.rawValue) + } + + public func toString() -> String { + return "" + .appending(self.contains(.read) ? "r" : "-") + .appending(self.contains(.write) ? "w" : "-") + .appending(self.contains(.upload) ? "u" : "-") } static let read: Permissions = Permissions(rawValue: 1 << 0) diff --git a/SessionMessagingKit/Open Groups/OpenGroupManager.swift b/SessionMessagingKit/Open Groups/OpenGroupManager.swift index f4cc2b307..71ec4b58e 100644 --- a/SessionMessagingKit/Open Groups/OpenGroupManager.swift +++ b/SessionMessagingKit/Open Groups/OpenGroupManager.swift @@ -384,7 +384,7 @@ public final class OpenGroupManager: NSObject { // Only update the database columns which have changed (this is to prevent the UI from triggering // updates due to changing database columns to the existing value) - let permissions = OpenGroup.Permissions.getPermissionsfromRoomInfo(pollInfo) + let permissions = OpenGroup.Permissions(roomInfo: pollInfo) try OpenGroup .filter(id: openGroup.id)