Skip to content

Commit

Permalink
quick and dirty /join command (#3288)
Browse files Browse the repository at this point in the history
Co-authored-by: Mauro Romito <[email protected]>
Co-authored-by: Mauro <[email protected]>
  • Loading branch information
3 people authored Sep 19, 2024
1 parent 943f33b commit 78fb64c
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 4 deletions.
4 changes: 4 additions & 0 deletions ElementX/Sources/Screens/Timeline/TimelineModels.swift
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ enum TimelineViewAction {
case hasSwitchedTimeline

case hasScrolled(direction: ScrollDirection)
case setOpenURLAction(OpenURLAction)
}

enum TimelineComposerAction {
Expand Down Expand Up @@ -101,6 +102,9 @@ struct TimelineViewState: BindableState {
// It's updated from the room info, so it's faster than using the timeline
var pinnedEventIDs: Set<String> = []

/// an openURL closure which opens URLs first using the App's environment rather than skipping out to external apps
var openURL: OpenURLAction?

var bindings: TimelineViewStateBindings

/// A closure providing the associated audio player state for an item in the timeline.
Expand Down
38 changes: 35 additions & 3 deletions ElementX/Sources/Screens/Timeline/TimelineViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import Algorithms
import Combine
import MatrixRustSDK
import OrderedCollections
import SwiftUI

Expand Down Expand Up @@ -167,6 +168,8 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
Task { state.timelineViewState.isSwitchingTimelines = false }
case let .hasScrolled(direction):
actionsSubject.send(.hasScrolled(direction: direction))
case .setOpenURLAction(let action):
state.openURL = action
}
}

Expand Down Expand Up @@ -560,7 +563,27 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
displayAlert(.encryptionAuthenticity(authenticityMessage))
}
}

private func slashCommand(message: String) -> SlashCommand? {
for command in SlashCommand.allCases {
if message.starts(with: command.rawValue) {
return command
}
}
return nil
}

private func handleJoinCommand(message: String) {
guard let alias = String(message.dropFirst(SlashCommand.join.rawValue.count))
.components(separatedBy: .whitespacesAndNewlines)
.first,
let urlString = try? matrixToRoomAliasPermalink(roomAlias: alias),
let url = URL(string: urlString) else {
return
}
state.openURL?(url)
}

private func sendCurrentMessage(_ message: String, html: String?, mode: ComposerMode, intentionalMentions: IntentionalMentions) async {
guard !message.isEmpty else {
fatalError("This message should never be empty")
Expand All @@ -580,9 +603,14 @@ class TimelineViewModel: TimelineViewModelType, TimelineViewModelProtocol {
html: html,
intentionalMentions: intentionalMentions)
case .default:
await timelineController.sendMessage(message,
html: html,
intentionalMentions: intentionalMentions)
switch slashCommand(message: message) {
case .join:
handleJoinCommand(message: message)
case .none:
await timelineController.sendMessage(message,
html: html,
intentionalMentions: intentionalMentions)
}
case .recordVoiceMessage, .previewVoiceMessage:
fatalError("invalid composer mode.")
}
Expand Down Expand Up @@ -862,3 +890,7 @@ extension EnvironmentValues {
set { self[FocussedEventID.self] = newValue }
}
}

private enum SlashCommand: String, CaseIterable {
case join = "/join "
}
7 changes: 6 additions & 1 deletion ElementX/Sources/Screens/Timeline/View/TimelineView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,16 @@ import WysiwygComposer
/// A table view wrapper that displays the timeline of a room.
struct TimelineView: UIViewControllerRepresentable {
@EnvironmentObject private var viewModelContext: TimelineViewModel.Context

@Environment(\.openURL) var openURL

func makeUIViewController(context: Context) -> TimelineTableViewController {
let tableViewController = TimelineTableViewController(coordinator: context.coordinator,
isScrolledToBottom: $viewModelContext.isScrolledToBottom,
scrollToBottomPublisher: viewModelContext.viewState.timelineViewState.scrollToBottomPublisher)
// Needs to be dispatched on main asynchronously otherwise we get a runtime warning
DispatchQueue.main.async {
viewModelContext.send(viewAction: .setOpenURLAction(openURL))
}
return tableViewController
}

Expand Down

0 comments on commit 78fb64c

Please sign in to comment.