ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 16:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Send html in plain text mode (#2246)

Browse Source
This commit is contained in:
Mauro
2023-12-15 10:04:51 +01:00
committed by GitHub
parent af562eabf7
commit 2f88d39789
19 changed files with 54 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Sources/Services/Timeline/TimelineProxy.swift
+5 -13
View File
@@ -93,7 +93,7 @@ final class TimelineProxy: TimelineProxyProtocol {
}
func editMessage(_ message: String,
html: String?,
html: String,
original eventID: String,
intentionalMentions: IntentionalMentions) async -> Result<Void, TimelineProxyError> {
sendMessageBackgroundTask = await backgroundTaskService.startBackgroundTask(withName: backgroundTaskName, isReusable: true)
@@ -320,7 +320,7 @@ final class TimelineProxy: TimelineProxyProtocol {
}
func sendMessage(_ message: String,
html: String?,
html: String,
inReplyTo eventID: String? = nil,
intentionalMentions: IntentionalMentions) async -> Result<Void, TimelineProxyError> {
sendMessageBackgroundTask = await backgroundTaskService.startBackgroundTask(withName: backgroundTaskName, isReusable: true)
@@ -454,7 +454,7 @@ final class TimelineProxy: TimelineProxyProtocol {
// MARK: - Private
private func buildMessageContentFor(_ message: String,
html: String?,
html: String,
intentionalMentions: Mentions) -> RoomMessageEventContentWithoutRelation {
let emoteSlashCommand = "/me "
let isEmote: Bool = message.starts(with: emoteSlashCommand)
@@ -462,18 +462,10 @@ final class TimelineProxy: TimelineProxyProtocol {
let content: RoomMessageEventContentWithoutRelation
if isEmote {
let emoteMessage = String(message.dropFirst(emoteSlashCommand.count))
var emoteHtml: String?
if let html {
emoteHtml = String(html.dropFirst(emoteSlashCommand.count))
}
let emoteHtml = String(html.dropFirst(emoteSlashCommand.count))
content = buildEmoteMessageContentFor(emoteMessage, html: emoteHtml)
} else {
if let html {
content = messageEventContentFromHtml(body: message, htmlBody: html)
} else {
content = messageEventContentFromMarkdown(md: message)
}
content = messageEventContentFromHtml(body: message, htmlBody: html)
}
return content.withMentions(mentions: intentionalMentions)
}