I mean... The tests pass *almost* fine (the 3 that fail seem unrelated, but I gotta make double-sure), but I'm sure I didn't cover all of my changes with test, soooo...
Anyway, looking forward to getting crucified ny my friends, when the bot inevitably implodes, and spams all over our double-bridged Messenger group again.
SOLVED CONFLICTS WERE:
* src/m2d/event-dispatcher.js (I think we both had the same idea and both added the same thing? Something about retrigger.)
* src/web/pug/guild.pug (the whole file, somehow, but the Conflict Editor on the other hand said that they looked the same, so idk)
* test/ooye-test-data.sql (we both added a line at the end of the big block of Snowfalke pairs, near line 100)
OTHER CHANGES THAT GOT „AUTO-MERGED” (oh no...):
* src/d2m/actions/create-room.js
* src/d2m/event-dispatcher.js
* src/m2d/actions/send-event.js
* src/m2d/converters/event-to-message.js
* src/matrix/matrix-command-handler.js
* src/matrix/utils.js
* src/types.d.ts
* src/web/routes/guild.js
Large PNGs were almost certainly originally JPEG photos that were
converted to PNG by the user copy-pasting.
If the PNG is just supposed to be that large, you can still get the
original through the external URL option.
Had to change _removeExpiryParams to be based on URL parsing instead of
regexp because regexp didn't work with &format=jpeg on the end.
This PR addresses a bridge crash discovered while backfilling old channels, alongside a wee QoL fix for the test suite.
* **Expired Events (`d2m`):** Wraps Discord scheduled event/invite link lookups in a try-catch block. If a link is expired (404 or Discord error 10006), the bridge now posts a fallback `m.notice` rather than throwing an error and halting message conversion.
* **Test Suite Setup:** Updates `test.js` to initialize the mock registration object using `getTemplateRegistration()` preventing test runner crashes when running without a local `registration.yaml` file.
Co-authored-by: Cadence Ember <cadence@disroot.org>
Reviewed-on: cadence/out-of-your-element#73
Co-authored-by: Bea <beanie@theargo.space>
Co-committed-by: Bea <beanie@theargo.space>
/This is a squash-commit - the following is a rough summary of all sub-commits, written in style of commit messages (not necessarily those commits themselves), ie. short and in present tense./
* Document design choice to not bridge Discord threads as Matrix threads [by directly quoting Cadence]
* Alter thread-to-announcement, so that it replies in-thread [with this, Matrix users will get a list of almost all (exl. those that don't branch from anything) open threads on a given channel, whereas before it wasn't possible. Also features slight alterations to the text]
* Notify the user, whenever an in-thread message on Matrix is sent, that this isn't how they're supposed to do threads on OOYE
* Detect /thread being ran as a reply or in-thread to branch the thread from the relevant message
* Handle various /thread errors [notably being ran without args (infer the title if ran in the context above, simply show help if not)]
* Whenever possible, direct the user to an already-existing thread-room [if /thread was ran as a reply or in-thread, or as part of the notification mentioned in point 3 (feat. a new utility method)]
AUXILIARY TYPE CHANGES (not always relevant to UX-improvement-related changes):
* Fix „boolean” being referred to as „bool” in types.d.ts
* Rename execute(event) in matrix-command-handler is now parseAndExecute(event) [and it is no longer of type CommandExecute, but has its own custom definition, because a) it has a different return now (returns what command was ran (needed for point 3 in section above) instead of always undefined and b) other params from CommandExecute (like ctx or words) weren't being used - quite the contrary, their values were only being created at that stage (as part of command parsing - hence the rename, too), so telling that they're values you pass into execute() was at least somewhat confusing]
* Further narrow-down the type of guard() in m2d event-dispatcher
TEST CHANGES:
* Create 7 new tests, all pass
* Update 4 existing threads, all pass
* Pass all other relevant tests [and almost all other tests, too - there are some issues with event2message for stickers, but given the fact that this commit does not touch the stickers subsystem in any way at all, it does not seem like they are any way related to my changes and they must've been failing before]
* Do extensive manual testing and debugging
Co-authored-by: Guzio <guzekk@protonmail.com>
Co-committed-by: Guzio <guzekk@protonmail.com>
Squashed commit of the following:
commit bd9fd5cd3c
Author: Elliu <elliu@hashi.re>
Date: Sat Nov 15 15:32:18 2025 +0900
Revert "fix matrix / db resource cleanup on space unlink"
This reverts commit ccc10564f1.
commit eec5592938
Author: Cadence Ember <cadence@disroot.org>
Date: Sat Nov 8 13:01:59 2025 +1300
Dependency inject snow for testing
commit b45eeb150e
Author: Elliu <elliu@hashi.re>
Date: Wed Nov 5 00:20:20 2025 +0900
manually revert 3597a3b: "Factorize some of the space link/unlink sanity checks"
commit 0f2e575df2
Author: Elliu <elliu@hashi.re>
Date: Wed Nov 5 00:04:38 2025 +0900
on unbriding room, also demote powel level of bridge user in matrix room
commit ccc10564f1
Author: Elliu <elliu@hashi.re>
Date: Wed Nov 5 00:04:13 2025 +0900
fix matrix / db resource cleanup on space unlink
commit f4c1ea7c7f
Author: Elliu <elliu@hashi.re>
Date: Tue Nov 4 23:54:41 2025 +0900
/unlink-space: properly leave guild and clean DB
commit 5f0ec3b2c8
Author: Cadence Ember <cadence@disroot.org>
Date: Sun Nov 2 22:31:14 2025 +1300
Improve HTML to a state I'm happy with
commit 16309f26b3
Author: Elliu <elliu@hashi.re>
Date: Sat Nov 1 22:24:51 2025 +0900
add tests from /unlink-space endpoint
commit 5aff6f9048
Author: Elliu <elliu@hashi.re>
Date: Sat Sep 6 20:05:18 2025 +0900
Add /api/unlink-space implementation
commit dfc61594f6
Author: Elliu <elliu@hashi.re>
Date: Sat Sep 6 19:59:44 2025 +0900
Extract /api/unlink code to its own function
commit 3597a3b5ce
Author: Elliu <elliu@hashi.re>
Date: Sat Sep 6 19:28:42 2025 +0900
Factorize some of the space link/unlink sanity checks
commit 05d788e263
Author: Elliu <elliu@hashi.re>
Date: Sat Sep 6 18:23:01 2025 +0900
Add button to unlink a space
Co-authored-by: Cadence Ember <cadence@disroot.org>
