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

Don't delete our reaction on Discord unless we have 0 of that reaction coming from Matrix #85

Open
ellie wants to merge 8 commits from ellie/out-of-your-element:ellie-fix-reacts into main
pull from: ellie/out-of-your-element:ellie-fix-reacts
merge into: cadence:main
Conversation 3 Commits 8 Files changed 9 +196 -77
ellie commented 2026-04-04 23:47:13 +00:00
First-time contributor
Copy link

Fixes a bug where, if multiple Matrix users had used the same reaction on a message, and then one of those Matrix users removed their reactions, the bot would forcibly remove all of that reactions. Now, we check and make sure there are no remaining reactions from Matrix before removal.

Fixes a bug where, if multiple Matrix users had used the same reaction on a message, and then one of those Matrix users removed their reactions, the bot would forcibly remove all of that reactions. Now, we check and make sure there are no remaining reactions from Matrix before removal.
ellie added 1 commit 2026-04-04 23:47:13 +00:00
ellie reviewed 2026-04-04 23:59:54 +00:00
ellie left a comment
Author
First-time contributor
Copy link

Self-review. I don't think anything else needs to be done here (or would make sense to include).

Self-review. I don't think anything else needs to be done here (or would make sense to include).
cadence added 1 commit 2026-04-05 01:31:45 +00:00
cadence added 1 commit 2026-04-05 03:06:13 +00:00
ellie added 1 commit 2026-04-05 08:26:40 +00:00
cadence reviewed 2026-04-05 15:03:34 +00:00
cadence left a comment
Owner
Copy link

Just a quick look. Seems like the right path! Thanks for humouring me.

Just a quick look. Seems like the right path! Thanks for humouring me.
src/d2m/actions/retrigger.js Outdated
@ -57,6 +59,30 @@ function eventNotFoundThenRetrigger(inputID, fn, ...rest) {
return true // event was not found, then retrigger
}
function reactionNotFoundThenRetrigger(reactionEventID, fn, ...rest){
cadence commented 2026-04-05 15:00:41 +00:00
Owner
Copy link

Is it more or less gross if these were abstracted into a common base?

Is it more or less gross if these were abstracted into a common base?
cadence commented 2026-04-09 06:27:43 +00:00
Owner
Copy link

It was less gross

It was less gross
👍 1
cadence marked this conversation as resolved
src/m2d/actions/add-reaction.js Outdated
@ -51,2 +51,4 @@
db.prepare("REPLACE INTO reaction (hashed_event_id, message_id, encoded_emoji, original_encoding) VALUES (?, ?, ?, ?)").run(utils.getEventIDHash(event.event_id), messageID, discordPreferredEncoding, key)
retrigger.messageFinishedBridging(event.event_id)
cadence commented 2026-04-05 15:01:06 +00:00
Owner
Copy link

Is this really the correct function to call here?

Is this really the correct function to call here?
cadence marked this conversation as resolved
src/m2d/actions/redact.js Outdated
@ -41,11 +41,17 @@ async function suppressEmbeds(event) {
* @param {Ty.Event.Outer_M_Room_Redaction} event
*/
async function removeReaction(event) {
if (retrigger.reactionNotFoundThenRetrigger(event.redacts, () => as.emit("type:m.room.redaction", event))) return
cadence commented 2026-04-05 15:02:23 +00:00
Owner
Copy link

Retrigger target should be this function, not as.emit, otherwise other operations related to redaction could possibly be duplicated

Retrigger target should be this function, not as.emit, otherwise other operations related to redaction could possibly be duplicated
cadence marked this conversation as resolved
ellie added 1 commit 2026-04-09 04:03:05 +00:00 
Co-authored-by: Cadence Ember <cadence@disroot.org>
ellie added 1 commit 2026-04-09 04:11:06 +00:00
ellie commented 2026-04-09 04:11:09 +00:00
Author
First-time contributor
Copy link

Note: after this is merged see if the ourDeletedReactions array fills up with garbage data, or if it's reliably removing stuff added to it (we don't currently clear this).

Sometimes there's only an emoji ID, apparently? We should handle this properly.

Note: after this is merged see if the `ourDeletedReactions` array fills up with garbage data, or if it's reliably removing stuff added to it (we don't currently clear this). Sometimes there's only an emoji ID, apparently? We should handle this properly.
ellie added 1 commit 2026-04-09 05:26:15 +00:00
ellie added 1 commit 2026-04-09 05:28:14 +00:00
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u ellie-fix-reacts:ellie-ellie-fix-reacts
git checkout ellie-ellie-fix-reacts

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout main
git merge --no-ff ellie-ellie-fix-reacts
git checkout ellie-ellie-fix-reacts
git rebase main
git checkout main
git merge --ff-only ellie-ellie-fix-reacts
git checkout ellie-ellie-fix-reacts
git rebase main
git checkout main
git merge --no-ff ellie-ellie-fix-reacts
git checkout main
git merge --squash ellie-ellie-fix-reacts
git checkout main
git merge --ff-only ellie-ellie-fix-reacts
git checkout main
git merge ellie-ellie-fix-reacts
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
backfill

properly integrated backfill feature performed on room creation

  
blocking

critical issue that blocks release of milestone

  
design needed

must prototype and discuss to find the best way forward - suggestions appreciated!

  
moderately approachable

moderate investigation, deduction, and adaptability required - or covers multiple areas of code

  
very approachable

low mental complexity, few concepts, focused scope, no investigation

  
web
No labels
backfill
blocking
design needed
moderately approachable
very approachable
web
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: cadence/out-of-your-element#85
No description provided.
Delete branch "ellie/out-of-your-element:ellie-fix-reacts"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?