cadence/out-of-your-element
cadence/out-of-your-element
3
7
Fork 6
Code Issues 18 Pull requests 3 Releases 27 Activity

WIP: feature: threads'n'forums #74

Draft
Guzio wants to merge 109 commits from Guzio/out-of-your-element:mergable-fr-fr into main
pull from: Guzio/out-of-your-element:mergable-fr-fr
merge into: cadence:main
Conversation 6 Commits 109 Files changed 17 +5 -2
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 10b6cf5bdb - Show all commits

7
src/m2d/event-dispatcher.js
View file

@ -213,12 +213,15 @@ async event => {
let processCommands = true let processCommands = true
if (event.content["m.relates_to"]?.rel_type === "m.thread") { if (event.content["m.relates_to"]?.rel_type === "m.thread") {
const toRedact = event.room_id /**@type {string|null} */
let toRedact = event.room_id
const bridgedTo = utils.getThreadRoomFromThreadEvent(event.content["m.relates_to"].event_id) const bridgedTo = utils.getThreadRoomFromThreadEvent(event.content["m.relates_to"].event_id)
processCommands = false processCommands = false
if (bridgedTo) event.room_id = bridgedTo; if (bridgedTo) event.room_id = bridgedTo;
else if (await bridgeThread(event)) { else if (!await bridgeThread(event)) toRedact = null; //Don't remove anything, if there is nowhere to relocate it to.
if (toRedact) {
api.redactEvent(toRedact, event.event_id) api.redactEvent(toRedact, event.event_id)
event.content["m.relates_to"] = undefined event.content["m.relates_to"] = undefined
api.sendEvent(event.room_id, event.type, {...event.content, body: event.content.body+"\n ~ "+event.sender, formatted_body: event.content.formatted_body ? event.content.formatted_body+"<br> ~ "+event.sender :undefined }) api.sendEvent(event.room_id, event.type, {...event.content, body: event.content.body+"\n ~ "+event.sender, formatted_body: event.content.formatted_body ? event.content.formatted_body+"<br> ~ "+event.sender :undefined })