diff --git a/UpstraUIKit/AmityUIKit.xcodeproj/project.pbxproj b/UpstraUIKit/AmityUIKit.xcodeproj/project.pbxproj index 5f338bb..91e1266 100644 --- a/UpstraUIKit/AmityUIKit.xcodeproj/project.pbxproj +++ b/UpstraUIKit/AmityUIKit.xcodeproj/project.pbxproj @@ -81,7 +81,6 @@ 68251A642ADEA16200395696 /* AmityPreviewLinkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 68251A622ADEA16200395696 /* AmityPreviewLinkCell.xib */; }; 6860B01B2ADE3D650042ED45 /* AmityPreviewLinkWizard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6860B01A2ADE3D650042ED45 /* AmityPreviewLinkWizard.swift */; }; 6895D9262975359000E377F1 /* AmityAsyncAwaitTransformer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6895D9252975359000E377F1 /* AmityAsyncAwaitTransformer.swift */; }; - 68DA71882C416C7C008CF080 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 68DA71872C416C7C008CF080 /* SharedFrameworks */; }; 68FEE2F72BC7A1060055FEC0 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 68FEE2F62BC7A1050055FEC0 /* PrivacyInfo.xcprivacy */; }; 720D599A2525BDB1009734EF /* DispatchGroupWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 720D59992525BDB1009734EF /* DispatchGroupWrapper.swift */; }; 7211553E25505D180081CC23 /* AmityCategoryPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7211553C25505D180081CC23 /* AmityCategoryPickerViewController.swift */; }; @@ -362,6 +361,7 @@ 78DA0323263C715C007C11CE /* AmityMyCommunityPreviewScreenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78DA031E263C715C007C11CE /* AmityMyCommunityPreviewScreenViewModel.swift */; }; 78DA0324263C715C007C11CE /* AmityMyCommunityPreviewViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 78DA0320263C715C007C11CE /* AmityMyCommunityPreviewViewController.xib */; }; 78DA0325263C715C007C11CE /* AmityMyCommunityPreviewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78DA0321263C715C007C11CE /* AmityMyCommunityPreviewViewController.swift */; }; + 923844642C6F4B14009747A5 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 923844632C6F4B14009747A5 /* SharedFrameworks */; }; 970E784726429FA500E5FCEE /* ChatSettingsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970E784526429FA500E5FCEE /* ChatSettingsTableViewCell.swift */; }; 970E784826429FA500E5FCEE /* ChatSettingsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 970E784626429FA500E5FCEE /* ChatSettingsTableViewCell.xib */; }; 970E784E26429FB300E5FCEE /* AmityChatSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970E784C26429FB300E5FCEE /* AmityChatSettingsViewController.swift */; }; @@ -1319,7 +1319,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 68DA71882C416C7C008CF080 /* SharedFrameworks in Frameworks */, + 923844642C6F4B14009747A5 /* SharedFrameworks in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -4434,7 +4434,7 @@ ); name = AmityUIKit; packageProductDependencies = ( - 68DA71872C416C7C008CF080 /* SharedFrameworks */, + 923844632C6F4B14009747A5 /* SharedFrameworks */, ); productName = UpstraUIKit; productReference = 72A3503024EA811500DA9D46 /* AmityUIKit.framework */; @@ -5441,7 +5441,7 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 68DA71872C416C7C008CF080 /* SharedFrameworks */ = { + 923844632C6F4B14009747A5 /* SharedFrameworks */ = { isa = XCSwiftPackageProductDependency; productName = SharedFrameworks; }; diff --git a/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream.xcodeproj/project.pbxproj b/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream.xcodeproj/project.pbxproj index e254f72..3799b49 100644 --- a/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream.xcodeproj/project.pbxproj +++ b/UpstraUIKit/AmityUIKitLiveStream/AmityUIKitLiveStream.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 68DA718A2C416C89008CF080 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 68DA71892C416C89008CF080 /* SharedFrameworks */; }; + 923844662C6F4B1C009747A5 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 923844652C6F4B1C009747A5 /* SharedFrameworks */; }; A0B68B3026E07278007D7B5B /* LiveStreamViewController+GoLive.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0B68B2F26E07278007D7B5B /* LiveStreamViewController+GoLive.swift */; }; A0B68B3626E07824007D7B5B /* AsyncOperation.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0B68B3526E07824007D7B5B /* AsyncOperation.swift */; }; A0B68B3F26E07912007D7B5B /* CreatePost.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0B68B3E26E07912007D7B5B /* CreatePost.swift */; }; @@ -69,7 +69,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 68DA718A2C416C89008CF080 /* SharedFrameworks in Frameworks */, + 923844662C6F4B1C009747A5 /* SharedFrameworks in Frameworks */, A0BD0B3426DDD9820054088B /* AmityUIKit.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -245,7 +245,7 @@ ); name = AmityUIKitLiveStream; packageProductDependencies = ( - 68DA71892C416C89008CF080 /* SharedFrameworks */, + 923844652C6F4B1C009747A5 /* SharedFrameworks */, ); productName = AmityUIKitLiveStream; productReference = A0BD0B1526DCE4F50054088B /* AmityUIKitLiveStream.framework */; @@ -529,7 +529,7 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 68DA71892C416C89008CF080 /* SharedFrameworks */ = { + 923844652C6F4B1C009747A5 /* SharedFrameworks */ = { isa = XCSwiftPackageProductDependency; productName = SharedFrameworks; }; diff --git a/UpstraUIKit/SampleApp/SampleApp.xcodeproj/project.pbxproj b/UpstraUIKit/SampleApp/SampleApp.xcodeproj/project.pbxproj index f57665a..5c464b3 100644 --- a/UpstraUIKit/SampleApp/SampleApp.xcodeproj/project.pbxproj +++ b/UpstraUIKit/SampleApp/SampleApp.xcodeproj/project.pbxproj @@ -18,7 +18,6 @@ 0D73ACA825DB9423000D73CA /* NewJoinerPostComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0D73ACA725DB9423000D73CA /* NewJoinerPostComponent.swift */; }; 0D8FFC2925DCBFD900943538 /* AmityCustomFooterTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0D8FFC2725DCBFD900943538 /* AmityCustomFooterTableViewCell.swift */; }; 0D8FFC2A25DCBFD900943538 /* AmityCustomFooterTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 0D8FFC2825DCBFD900943538 /* AmityCustomFooterTableViewCell.xib */; }; - 68DA718C2C416C98008CF080 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 68DA718B2C416C98008CF080 /* SharedFrameworks */; }; 7214C9CB2632BE5500192BB3 /* UserLevelPushNotificationsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7214C9CA2632BE5500192BB3 /* UserLevelPushNotificationsTableViewController.swift */; }; 7214C9D72632C0AD00192BB3 /* NotificationModuleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7214C9D62632C0AD00192BB3 /* NotificationModuleTableViewCell.swift */; }; 7214C9DB2632C0D500192BB3 /* SwitchTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7214C9DA2632C0D500192BB3 /* SwitchTableViewCell.swift */; }; @@ -29,6 +28,7 @@ 729CAF3E273CC8ED000AE162 /* Binding+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 729CAF3D273CC8ED000AE162 /* Binding+Extension.swift */; }; 729CAF42273CC95B000AE162 /* EndpointManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 729CAF41273CC95B000AE162 /* EndpointManager.swift */; }; 72AACE0B273931F100E59D55 /* EndpointsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72AACE0A273931F100E59D55 /* EndpointsView.swift */; }; + 923844682C6F4B29009747A5 /* SharedFrameworks in Frameworks */ = {isa = PBXBuildFile; productRef = 923844672C6F4B29009747A5 /* SharedFrameworks */; }; 92DBE8A62ACA98CF007D873C /* DataListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D495077325E637C1005C033F /* DataListViewController.swift */; }; 92DBE8A72ACA98CF007D873C /* SamplePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 724C25F3274CE38B0058B066 /* SamplePageViewController.swift */; }; 92DBE8A82ACA98CF007D873C /* PostCreatorSettingsPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = A03190A6272169C1008A85DC /* PostCreatorSettingsPage.swift */; }; @@ -263,7 +263,7 @@ files = ( A0BD0B4826DDE0E30054088B /* AmityUIKitLiveStream.framework in Frameworks */, D478D16926240A5E006EA140 /* AmityUIKit.framework in Frameworks */, - 68DA718C2C416C98008CF080 /* SharedFrameworks in Frameworks */, + 923844682C6F4B29009747A5 /* SharedFrameworks in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -579,7 +579,7 @@ ); name = SampleApp; packageProductDependencies = ( - 68DA718B2C416C98008CF080 /* SharedFrameworks */, + 923844672C6F4B29009747A5 /* SharedFrameworks */, ); productName = SampleApp; productReference = B78DA47524BED7D300EE902B /* SampleApp.app */; @@ -1254,7 +1254,7 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 68DA718B2C416C98008CF080 /* SharedFrameworks */ = { + 923844672C6F4B29009747A5 /* SharedFrameworks */ = { isa = XCSwiftPackageProductDependency; productName = SharedFrameworks; }; diff --git a/UpstraUIKit/SampleApp/SampleApp/Info.plist b/UpstraUIKit/SampleApp/SampleApp/Info.plist index 849eece..5fbf8f2 100644 --- a/UpstraUIKit/SampleApp/SampleApp/Info.plist +++ b/UpstraUIKit/SampleApp/SampleApp/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.20.8 + 3.20.10 CFBundleVersion 1 LSRequiresIPhoneOS diff --git a/UpstraUIKit/SampleApp/SampleAppTests/Info.plist b/UpstraUIKit/SampleApp/SampleAppTests/Info.plist index d67e5ab..a8e977c 100644 --- a/UpstraUIKit/SampleApp/SampleAppTests/Info.plist +++ b/UpstraUIKit/SampleApp/SampleAppTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.20.8 + 3.20.10 CFBundleVersion 1 diff --git a/UpstraUIKit/SampleApp/SampleAppUITests/Info.plist b/UpstraUIKit/SampleApp/SampleAppUITests/Info.plist index d67e5ab..a8e977c 100644 --- a/UpstraUIKit/SampleApp/SampleAppUITests/Info.plist +++ b/UpstraUIKit/SampleApp/SampleAppUITests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.20.8 + 3.20.10 CFBundleVersion 1 diff --git a/UpstraUIKit/SharedFrameworks/Package.swift b/UpstraUIKit/SharedFrameworks/Package.swift index 2d67a67..bbab839 100644 --- a/UpstraUIKit/SharedFrameworks/Package.swift +++ b/UpstraUIKit/SharedFrameworks/Package.swift @@ -23,28 +23,28 @@ let package = Package( dependencies: []), .binaryTarget( name: "AmitySDK", - url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/3.20.8/AmitySDK.xcframework.zip", - checksum: "08408da63910482598f083d89006f9c9a33910c6390e87d9a92a6a3373be04b1" + url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/3.20.10/AmitySDK.xcframework.zip", + checksum: "392479f21a7a845fcfa3c12c23faff08d6e41f903c5916de9c9ed35d9e33e233" ), .binaryTarget( name: "Realm", - url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/3.20.8/Realm.xcframework.zip", - checksum: "cd60ee1b34d78e55da7fc334e7ac10ca9b6753456ec157f9e744f6ca9fbab0a7" + url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/3.20.10/Realm.xcframework.zip", + checksum: "b0a2c25ce8678279c1452741b3a310bea9e3869df7bbda85e73395f2b641b10d" ), .binaryTarget( name: "RealmSwift", - url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/3.20.8/RealmSwift.xcframework.zip", - checksum: "72bdec73c0fd018b63da8b116fecd3702530f2e311a3709cd7e589f0bff2ff6a" + url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/3.20.10/RealmSwift.xcframework.zip", + checksum: "a3164683df233bc79aefdbd7c92158a1c3025ccfc596f1d8022e9dfc2c0bd382" ), .binaryTarget( name: "AmityLiveVideoBroadcastKit", - url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/3.20.8/AmityLiveVideoBroadcastKit.xcframework.zip", - checksum: "09fdef78cd90265123eb7c9f8fa7a87c2fb17c73e38723a5d541c0727fafea13" + url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/3.20.10/AmityLiveVideoBroadcastKit.xcframework.zip", + checksum: "aead7e72dbe90f2213e9a135e2003131743b30fc04042b37bf7b81ebd7f98e55" ), .binaryTarget( name: "AmityVideoPlayerKit", - url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/3.20.8/AmityVideoPlayerKit.xcframework.zip", - checksum: "4d304ef07879d1782ea91fc2c90b829fa0c311130b6f4f477f3f4a891b5e6fcd" + url: "https://sdk.amity.co/sdk-release/ios-uikit-frameworks/3.20.10/AmityVideoPlayerKit.xcframework.zip", + checksum: "749708fe4ac83bd4db403e707b88fe1cd1a4f431abd9eb71bcbcff5506e9ddd3" ), .binaryTarget( name: "MobileVLCKit", diff --git a/UpstraUIKit/UpstraUIKit/Info.plist b/UpstraUIKit/UpstraUIKit/Info.plist index d67e5ab..a8e977c 100644 --- a/UpstraUIKit/UpstraUIKit/Info.plist +++ b/UpstraUIKit/UpstraUIKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.20.8 + 3.20.10 CFBundleVersion 1 diff --git a/UpstraUIKit/UpstraUIKit/Modules/Chat/Member/AmityChanneluserModeratorController.swift b/UpstraUIKit/UpstraUIKit/Modules/Chat/Member/AmityChanneluserModeratorController.swift index d2c4127..16c4c39 100644 --- a/UpstraUIKit/UpstraUIKit/Modules/Chat/Member/AmityChanneluserModeratorController.swift +++ b/UpstraUIKit/UpstraUIKit/Modules/Chat/Member/AmityChanneluserModeratorController.swift @@ -14,18 +14,19 @@ protocol AmityChannelUserRolesControllerProtocol { } final class AmityChannelUserRolesController: AmityChannelUserRolesControllerProtocol { - private var membershipParticipation: AmityChannelParticipation? + + private var membersRepo: AmityChannelMembership? private var membership: AmityChannelMember? private var token: AmityNotificationToken? init(channelId: String) { - membershipParticipation = AmityChannelParticipation(client: AmityUIKitManagerInternal.shared.client, andChannel: channelId) + membersRepo = AmityChannelMembership(client: AmityUIKitManagerInternal.shared.client, andChannel: channelId) } func getUserRoles(withUserId userId: String, role: AmityChannelRole, completionHandler: @escaping (Bool) -> ()) { token?.invalidate() completionHandler(false) - token = membershipParticipation?.getMembers(filter: .all, sortBy: .lastCreated, roles: []).observe({ [weak self] collection, change, error in + token = membersRepo?.getMembers(filter: .all, sortBy: .lastCreated, roles: [], includeDeleted: false).observe({ [weak self] collection, change, error in guard let weakSelf = self else { return } if error != nil { completionHandler(false) diff --git a/UpstraUIKit/UpstraUIKit/Modules/Chat/Member/General/AmityChannelFetchMemberController.swift b/UpstraUIKit/UpstraUIKit/Modules/Chat/Member/General/AmityChannelFetchMemberController.swift index 0ed5066..cc26a80 100644 --- a/UpstraUIKit/UpstraUIKit/Modules/Chat/Member/General/AmityChannelFetchMemberController.swift +++ b/UpstraUIKit/UpstraUIKit/Modules/Chat/Member/General/AmityChannelFetchMemberController.swift @@ -16,16 +16,16 @@ protocol AmityChannelFetchMemberControllerProtocol { final class AmityChannelFetchMemberController: AmityChannelFetchMemberControllerProtocol { - private var membershipParticipation: AmityChannelParticipation? + private var membership: AmityChannelMembership private var memberCollection: AmityCollection? private var memberToken: AmityNotificationToken? init(channelId: String) { - membershipParticipation = AmityChannelParticipation(client: AmityUIKitManagerInternal.shared.client, andChannel: channelId) + membership = AmityChannelMembership(client: AmityUIKitManagerInternal.shared.client, andChannel: channelId) } func fetch(roles: [String], _ completion: @escaping (Result<[AmityChannelMembershipModel], Error>) -> Void) { - memberCollection = membershipParticipation?.getMembers(filter: .all, sortBy: .lastCreated, roles: roles) + memberCollection = membership.getMembers(filter: .all, sortBy: .lastCreated, roles: roles, includeDeleted: false) memberToken?.invalidate() memberToken = memberCollection?.observe { (collection, change, error) in if let error = error { diff --git a/UpstraUIKit/UpstraUIKit/Modules/Comunity/Follow/Follow Requests/ViewModel/AmityFollowRequestsScreenViewModel.swift b/UpstraUIKit/UpstraUIKit/Modules/Comunity/Follow/Follow Requests/ViewModel/AmityFollowRequestsScreenViewModel.swift index 41a83d8..7e751b4 100644 --- a/UpstraUIKit/UpstraUIKit/Modules/Comunity/Follow/Follow Requests/ViewModel/AmityFollowRequestsScreenViewModel.swift +++ b/UpstraUIKit/UpstraUIKit/Modules/Comunity/Follow/Follow Requests/ViewModel/AmityFollowRequestsScreenViewModel.swift @@ -108,7 +108,6 @@ private extension AmityFollowRequestsScreenViewModel { followRequests = newRequests delegate?.screenViewModelDidGetRequests() - followToken?.invalidate() default: break } } diff --git a/UpstraUIKit/UpstraUIKit/Modules/Comunity/General/Controllers/AmityCommunityFetchMemberController.swift b/UpstraUIKit/UpstraUIKit/Modules/Comunity/General/Controllers/AmityCommunityFetchMemberController.swift index 85f8b09..e8468b5 100644 --- a/UpstraUIKit/UpstraUIKit/Modules/Comunity/General/Controllers/AmityCommunityFetchMemberController.swift +++ b/UpstraUIKit/UpstraUIKit/Modules/Comunity/General/Controllers/AmityCommunityFetchMemberController.swift @@ -16,16 +16,16 @@ protocol AmityCommunityFetchMemberControllerProtocol { final class AmityCommunityFetchMemberController: AmityCommunityFetchMemberControllerProtocol { - private var membershipParticipation: AmityCommunityParticipation? + private var membership: AmityCommunityMembership? private var memberCollection: AmityCollection? private var memberToken: AmityNotificationToken? init(communityId: String) { - membershipParticipation = AmityCommunityParticipation(client: AmityUIKitManagerInternal.shared.client, andCommunityId: communityId) + membership = AmityCommunityMembership(client: AmityUIKitManagerInternal.shared.client, andCommunityId: communityId) } func fetch(roles: [String], _ completion: @escaping (Result<[AmityCommunityMembershipModel], Error>) -> Void) { - memberCollection = membershipParticipation?.getMembers(membershipOptions: [.member], roles: roles, sortBy: .lastCreated) + memberCollection = membership?.getMembers(filter: .member, roles: roles, sortBy: .lastCreated, includeDeleted: false) memberToken = memberCollection?.observe { (collection, change, error) in if let error = error { completion(.failure(error)) diff --git a/UpstraUIKit/UpstraUIKit/Modules/Comunity/Mention/Manager/AmityMentionListProvider.swift b/UpstraUIKit/UpstraUIKit/Modules/Comunity/Mention/Manager/AmityMentionListProvider.swift index ff3c753..09074c5 100644 --- a/UpstraUIKit/UpstraUIKit/Modules/Comunity/Mention/Manager/AmityMentionListProvider.swift +++ b/UpstraUIKit/UpstraUIKit/Modules/Comunity/Mention/Manager/AmityMentionListProvider.swift @@ -20,7 +20,8 @@ public class MentionListProvider { // Repositories private var userRepository: AmityUserRepository = AmityUserRepository(client: AmityUIKitManagerInternal.shared.client) - private var channelMembersRepository: AmityChannelMembership? + private var channelMembersRepo: AmityChannelMembership? + private var communityMembersRepo: AmityCommunityMembership? private var communityRepository: AmityCommunityRepository = AmityCommunityRepository(client: AmityUIKitManagerInternal.shared.client) // Collection @@ -52,7 +53,7 @@ public class MentionListProvider { } case .message(let subChannelId): if let channelId = subChannelId { - channelMembersRepository = AmityChannelMembership(client: client, andChannel: channelId) + channelMembersRepo = AmityChannelMembership(client: client, andChannel: channelId) } } @@ -118,6 +119,7 @@ public class MentionListProvider { } private func setupCommunity(withId communityId: String) { + communityMembersRepo = AmityCommunityMembership(client: AmityUIKitManager.client, andCommunityId: communityId) communityToken = communityRepository.getCommunity(withId: communityId).observe { [weak self] liveObject, error in if liveObject.dataStatus == .fresh { self?.communityToken?.invalidate() @@ -137,7 +139,7 @@ public class MentionListProvider { mentionListToken = nil mentionListToken?.invalidate() - channelMembersCollection = channelMembersRepository?.searchMembers(displayName: displayName, filterBuilder: builder, roles: []) + channelMembersCollection = channelMembersRepo?.searchMembers(displayName: displayName, filterBuilder: builder, roles: [], includeDeleted: false) mentionListToken = channelMembersCollection?.observe({ [weak self] liveCollection, _, error in self?.handleSearchResponse(with: liveCollection) }) @@ -157,7 +159,7 @@ public class MentionListProvider { mentionListToken = nil mentionListToken?.invalidate() - communityMembersCollection = communityRepository.searchMembers(communityId: communityId, displayName: displayName, membership: .member, roles: [], sortBy: .lastCreated) + communityMembersCollection = communityMembersRepo?.searchMembers(keyword: displayName, filter: [.member], roles: [], sortBy: .lastCreated, includeDeleted: false) mentionListToken = communityMembersCollection?.observe { [weak self] liveCollection, _, error in self?.handleSearchResponse(with: liveCollection) } diff --git a/UpstraUIKit/UpstraUIKitTests/Info.plist b/UpstraUIKit/UpstraUIKitTests/Info.plist index d67e5ab..a8e977c 100644 --- a/UpstraUIKit/UpstraUIKitTests/Info.plist +++ b/UpstraUIKit/UpstraUIKitTests/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.20.8 + 3.20.10 CFBundleVersion 1