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

Use latest user data for mention pills

Browse Source
This commit is contained in:
aringenbach
2022-06-16 17:07:47 +02:00
parent 87915a9e30
commit 4c8bed38c2
24 changed files with 357 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/DataSources/RoomDataSource.swift
+6 -4
View File
@@ -167,26 +167,28 @@ extension RoomDataSource {
body = replyEventParts?.formattedBodyParts?.replyText ?? replyEventParts?.bodyParts.replyText ?? ""
}
let attributed = eventFormatter.renderHTMLString(body, for: event, with: nil)
let attributed = eventFormatter.renderHTMLString(body, for: event, with: nil, andLatestRoomState: nil)
if let attributed = attributed, #available(iOS 15.0, *) {
editableTextMessage = PillsFormatter.insertPills(in: attributed,
withSession: self.mxSession,
eventFormatter: self.eventFormatter,
event: event,
andRoomState: self.roomState,
roomState: self.roomState,
andLatestRoomState: nil,
isEditMode: true)
} else {
editableTextMessage = attributed
}
} else {
let body: String = event.content["formatted_body"] as? String ?? event.content["body"] as? String ?? ""
let attributed = eventFormatter.renderHTMLString(body, for: event, with: nil)
let attributed = eventFormatter.renderHTMLString(body, for: event, with: nil, andLatestRoomState: nil)
if let attributed = attributed, #available(iOS 15.0, *) {
editableTextMessage = PillsFormatter.insertPills(in: attributed,
withSession: self.mxSession,
eventFormatter: self.eventFormatter,
event: event,
andRoomState: self.roomState,
roomState: self.roomState,
andLatestRoomState: nil,
isEditMode: true)
} else {
editableTextMessage = attributed