felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 15:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/3288_automatic_room_alias' into 'develop'

Browse Source 
MESSENGER-3288 auto create room alias on room creation

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!19
This commit is contained in:
Frank Rotermund
2022-06-22 13:56:21 +00:00
parent 4139a61bb9 3953554a14
commit 77ac918df2
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Riot/Modules/CreateRoom/EnterNewRoomDetails/EnterNewRoomDetailsViewModel.swift
View File

@@ -94,20 +94,26 @@ final class EnterNewRoomDetailsViewModel: EnterNewRoomDetailsViewModelType {
}
private func fixRoomAlias(alias: String?) -> String? {
guard var alias = alias else { return nil }
// drop prefix # from room alias
while alias.hasPrefix("#") {
alias = String(alias.dropFirst())
if var alias = alias {
// drop prefix # from room alias
while alias.hasPrefix("#") {
alias = String(alias.dropFirst())
}
// TODO: Fix below somehow
alias = alias.replacingOccurrences(of: ":matrix.org", with: "")
if let homeserver = session.credentials.homeServer {
alias = alias.replacingOccurrences(of: ":" + homeserver, with: "")
}
return alias
} else if BwiBuildSettings.bwiAutoCreateAliasOnRoomCreation {
if let roomName = roomCreationParameters.name {
return self.createAlias(from: roomName)
}
}
// TODO: Fix below somehow
alias = alias.replacingOccurrences(of: ":matrix.org", with: "")
if let homeserver = session.credentials.homeServer {
alias = alias.replacingOccurrences(of: ":" + homeserver, with: "")
}
return alias
return nil
}
private func createRoom() {
@@ -195,4 +201,15 @@ final class EnterNewRoomDetailsViewModel: EnterNewRoomDetailsViewModelType {
private func cancelOperations() {
self.currentOperation?.cancel()
}
// MARK bwi Alias creation
private func createAlias(from roomName: String) -> String {
var alias = roomName.trimmingCharacters(in: .whitespacesAndNewlines).filter { "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".contains($0) }
let timeInterval = String(Int(NSDate().timeIntervalSince1970))
alias.append(timeInterval)
return alias
}
}

2
bwi/BwiBuildSettings.swift
View File

@@ -69,4 +69,6 @@ final class BwiBuildSettings: NSObject {
static let bwiShowThreads = false
static let bwiShowRoomCreationSectionFooter = false
static let bwiAutoCreateAliasOnRoomCreation = true
}