mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-22 09:32:52 +02:00
b298dedc22
Merge commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1' into feature/foss_update_1_11_19 * commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1': finish version++ version++ comments update submodule remove obsolete tests removed unused code update submodule fix Libolm removal update license macro update license Prepare for new sprint # Conflicts: # Config/AppVersion.xcconfig # IDETemplateMacros.plist # LICENSE # README.md # Riot/Categories/MXSession+Riot.m # Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift # Riot/Managers/KeyValueStorage/Extensions/Keychain.swift # Riot/Managers/KeyValueStorage/KeyValueStore.swift # Riot/Managers/KeyValueStorage/KeychainStore.swift # Riot/Managers/KeyValueStorage/MemoryStore.swift # Riot/Managers/PushNotification/PushNotificationService.m # Riot/Managers/Settings/RiotSettings.swift # Riot/Managers/Settings/Shared/RiotSharedSettings.swift # Riot/Modules/Analytics/AnalyticsUIElement.swift # Riot/Modules/Application/AppCoordinator.swift # Riot/Modules/Application/LegacyAppDelegate.h # Riot/Modules/Application/LegacyAppDelegate.m # Riot/Modules/Authentication/Legacy/AuthenticationViewController.h # Riot/Modules/Authentication/Legacy/AuthenticationViewController.m # Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h # Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m # Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m # Riot/Modules/Common/Recents/RecentsViewController.m # Riot/Modules/Common/WebViewController/WebViewViewController.m # Riot/Modules/Contacts/Details/ContactDetailsViewController.m # Riot/Modules/Contacts/Views/ContactTableViewCell.m # Riot/Modules/Favorites/FavouritesViewController.h # Riot/Modules/Favorites/FavouritesViewController.m # Riot/Modules/GlobalSearch/UnifiedSearchViewController.m # Riot/Modules/People/PeopleViewController.h # Riot/Modules/People/PeopleViewController.m # Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuViewModel.swift # Riot/Modules/Room/DataSources/RoomDataSource.m # Riot/Modules/Room/Files/RoomFilesViewController.m # Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m # Riot/Modules/Room/Members/RoomParticipantsViewController.m # Riot/Modules/Room/RoomViewController.m # Riot/Modules/Room/Settings/RoomSettingsViewController.m # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCell.swift # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCellContentView.swift # Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroViewData.swift # Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h # Riot/Modules/Rooms/RoomsViewController.h # Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.swift # Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.swift # Riot/Modules/Rooms/ShowDirectory/PublicRoomsDirectoryViewModel.swift # Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift # Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift # Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseCoordinator.swift # Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift # Riot/Modules/Secrets/Recover/SecretsRecoveryCoordinator.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModel.swift # Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModelType.swift # Riot/Modules/SetPinCode/PinCodePreferences.swift # Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift # Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m # Riot/Modules/Settings/Security/SecurityViewController.m # Riot/Modules/Settings/SettingsViewController.m # Riot/Modules/SplitView/SplitViewCoordinator.swift # Riot/Modules/SplitView/SplitViewCoordinatorType.swift # Riot/Modules/StartChat/StartChatViewController.m # Riot/Modules/TabBar/MasterTabBarController.h # Riot/Modules/TabBar/MasterTabBarController.m # Riot/Utils/EventFormatter.m # Riot/Utils/HTMLFormatter.swift # Riot/Utils/Tools.m # RiotNSE/NotificationService.swift
231 lines
8.0 KiB
Swift
231 lines
8.0 KiB
Swift
//
|
|
// Copyright 2021-2024 New Vector Ltd.
|
|
//
|
|
// SPDX-License-Identifier: AGPL-3.0-only
|
|
// Please see LICENSE in the repository root for full details.
|
|
//
|
|
|
|
import Combine
|
|
import Foundation
|
|
import WysiwygComposer
|
|
|
|
struct RoomMembersProviderMember {
|
|
var userId: String
|
|
var displayName: String
|
|
var avatarUrl: String
|
|
}
|
|
|
|
struct CommandsProviderCommand {
|
|
let name: String
|
|
let parametersFormat: String
|
|
let description: String
|
|
let requiresAdminPowerLevel: Bool
|
|
}
|
|
|
|
class CompletionSuggestionUserID: NSObject {
|
|
/// A special case added for suggesting `@room` mentions.
|
|
@objc static let room = "@room"
|
|
}
|
|
|
|
protocol RoomMembersProviderProtocol {
|
|
var canMentionRoom: Bool { get }
|
|
func fetchMembers(_ members: @escaping ([RoomMembersProviderMember]) -> Void)
|
|
}
|
|
|
|
protocol CommandsProviderProtocol {
|
|
var isRoomAdmin: Bool { get }
|
|
func fetchCommands(_ commands: @escaping ([CommandsProviderCommand]) -> Void)
|
|
}
|
|
|
|
struct CompletionSuggestionServiceUserItem: CompletionSuggestionUserItemProtocol {
|
|
let userId: String
|
|
let displayName: String?
|
|
let avatarUrl: String?
|
|
}
|
|
|
|
struct CompletionSuggestionServiceCommandItem: CompletionSuggestionCommandItemProtocol {
|
|
let name: String
|
|
let parametersFormat: String
|
|
let description: String
|
|
}
|
|
|
|
class CompletionSuggestionService: CompletionSuggestionServiceProtocol {
|
|
// MARK: - Properties
|
|
|
|
// MARK: Private
|
|
|
|
private let roomMemberProvider: RoomMembersProviderProtocol
|
|
private let commandProvider: CommandsProviderProtocol
|
|
|
|
private var suggestionItems: [CompletionSuggestionItem] = []
|
|
private let currentTextTriggerSubject = CurrentValueSubject<TextTrigger?, Never>(nil)
|
|
private var cancellables = Set<AnyCancellable>()
|
|
|
|
// MARK: Public
|
|
|
|
var items = CurrentValueSubject<[CompletionSuggestionItem], Never>([])
|
|
|
|
var currentTextTrigger: String? {
|
|
currentTextTriggerSubject.value?.asString()
|
|
}
|
|
|
|
// MARK: - Setup
|
|
|
|
init(roomMemberProvider: RoomMembersProviderProtocol,
|
|
commandProvider: CommandsProviderProtocol,
|
|
shouldDebounce: Bool = true) {
|
|
self.roomMemberProvider = roomMemberProvider
|
|
self.commandProvider = commandProvider
|
|
|
|
if shouldDebounce {
|
|
currentTextTriggerSubject
|
|
.debounce(for: 0.5, scheduler: RunLoop.main)
|
|
.removeDuplicates()
|
|
.sink { [weak self] in self?.fetchAndFilterSuggestionsForTextTrigger($0) }
|
|
.store(in: &cancellables)
|
|
} else {
|
|
currentTextTriggerSubject
|
|
.sink { [weak self] in self?.fetchAndFilterSuggestionsForTextTrigger($0) }
|
|
.store(in: &cancellables)
|
|
}
|
|
}
|
|
|
|
// MARK: - CompletionSuggestionServiceProtocol
|
|
|
|
func processTextMessage(_ textMessage: String?) {
|
|
guard let textMessage = textMessage,
|
|
let textTrigger = textMessage.currentTextTrigger
|
|
else {
|
|
items.send([])
|
|
currentTextTriggerSubject.send(nil)
|
|
return
|
|
}
|
|
|
|
currentTextTriggerSubject.send(textTrigger)
|
|
}
|
|
|
|
func processSuggestionPattern(_ suggestionPattern: SuggestionPattern?) {
|
|
guard let suggestionPattern else {
|
|
items.send([])
|
|
currentTextTriggerSubject.send(nil)
|
|
return
|
|
}
|
|
|
|
switch suggestionPattern.key {
|
|
case .at:
|
|
currentTextTriggerSubject.send(TextTrigger(key: .at, text: suggestionPattern.text))
|
|
case .hash:
|
|
// No room suggestion support yet
|
|
items.send([])
|
|
currentTextTriggerSubject.send(nil)
|
|
case .slash:
|
|
// bwi: #4955 disable WYSIWYG commands
|
|
if BWIBuildSettings.shared.enableWYSIWYGCommands {
|
|
currentTextTriggerSubject.send(TextTrigger(key: .slash, text: suggestionPattern.text))
|
|
} else {
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// MARK: - Private
|
|
|
|
private func fetchAndFilterSuggestionsForTextTrigger(_ textTrigger: TextTrigger?) {
|
|
guard let textTrigger else { return }
|
|
|
|
switch textTrigger.key {
|
|
case .at:
|
|
roomMemberProvider.fetchMembers { [weak self] members in
|
|
guard let self = self else {
|
|
return
|
|
}
|
|
|
|
self.suggestionItems = members.withRoom(self.roomMemberProvider.canMentionRoom).map { member in
|
|
CompletionSuggestionItem.user(value: CompletionSuggestionServiceUserItem(userId: member.userId, displayName: member.displayName, avatarUrl: member.avatarUrl))
|
|
}
|
|
|
|
self.items.send(self.suggestionItems.filter { item in
|
|
guard case let .user(completionSuggestionUserItem) = item else { return false }
|
|
|
|
let containedInUsername = completionSuggestionUserItem.userId.lowercased().contains(textTrigger.text.lowercased())
|
|
let containedInDisplayName = (completionSuggestionUserItem.displayName ?? "").lowercased().contains(textTrigger.text.lowercased())
|
|
|
|
return (containedInUsername || containedInDisplayName)
|
|
})
|
|
}
|
|
case .slash:
|
|
// bwi 5951 disable slash commands in old editor
|
|
if BWIBuildSettings.shared.enableWYSIWYGCommands {
|
|
commandProvider.fetchCommands { [weak self] commands in
|
|
guard let self else { return }
|
|
|
|
self.suggestionItems = commands.filtered(isRoomAdmin: self.commandProvider.isRoomAdmin).map { command in
|
|
CompletionSuggestionItem.command(value: CompletionSuggestionServiceCommandItem(
|
|
name: command.name,
|
|
parametersFormat: command.parametersFormat,
|
|
description: command.description
|
|
))
|
|
}
|
|
|
|
if textTrigger.text.isEmpty {
|
|
// A single `/` will display all available commands.
|
|
self.items.send(self.suggestionItems)
|
|
} else {
|
|
self.items.send(self.suggestionItems.filter { item in
|
|
guard case let .command(commandSuggestion) = item else { return false }
|
|
|
|
return commandSuggestion.name.lowercased().contains(textTrigger.text.lowercased())
|
|
})
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
extension Array where Element == RoomMembersProviderMember {
|
|
/// Returns the array with an additional member that represents an `@room` mention.
|
|
func withRoom(_ canMentionRoom: Bool) -> Self {
|
|
guard canMentionRoom else { return self }
|
|
return self + [RoomMembersProviderMember(userId: CompletionSuggestionUserID.room, displayName: "Everyone", avatarUrl: "")]
|
|
}
|
|
}
|
|
|
|
extension Array where Element == CommandsProviderCommand {
|
|
func filtered(isRoomAdmin: Bool) -> Self {
|
|
guard !isRoomAdmin else { return self }
|
|
return filter { !$0.requiresAdminPowerLevel }
|
|
}
|
|
}
|
|
|
|
private enum SuggestionKey: Character {
|
|
case at = "@"
|
|
case slash = "/"
|
|
}
|
|
|
|
private struct TextTrigger: Equatable {
|
|
let key: SuggestionKey
|
|
let text: String
|
|
|
|
func asString() -> String {
|
|
String(key.rawValue) + text
|
|
}
|
|
}
|
|
|
|
private extension String {
|
|
// Returns current completion suggestion for a text message, if any.
|
|
var currentTextTrigger: TextTrigger? {
|
|
let components = components(separatedBy: .whitespaces)
|
|
guard var lastComponent = components.last,
|
|
lastComponent.count > 0,
|
|
let suggestionKey = SuggestionKey(rawValue: lastComponent.removeFirst()),
|
|
// If a second character exists and is the same as the key it shouldn't trigger.
|
|
lastComponent.first != suggestionKey.rawValue,
|
|
// Slash commands should be displayed only if there is a single component
|
|
!(suggestionKey == .slash && components.count > 1)
|
|
else { return nil }
|
|
|
|
return TextTrigger(key: suggestionKey, text: lastComponent)
|
|
}
|
|
}
|