Commit graph

1,188 commits

Author SHA1 Message Date
cbe957f790 Hello thread PR, my old friend...
I've come to fix conflicts, and then pretend you don't exist, again.
2026-10-20 13:45:31 +02:00
3dd7830726 Tests to see when uncaught errors are emitted 2026-10-20 22:40:35 +13:00
be403698f9 Use time markup per MSC3160
Supported by Sable, don't know of any other supporting clients
Always includes full timestamp (rather than partial date/time) because
Sable doesn't render partials.
Has custom data-style extension if anyone cares

https://github.com/matrix-org/matrix-spec-proposals/pull/3160
2026-10-20 22:35:52 +13:00
1434cb567c Fix time display skipping size calculations 2026-10-20 22:25:20 +13:00
4ac4aecebf Reliability fixes 2026-10-20 17:33:59 +13:00
12d448d7fb Avoid media stream errors crashing process 2026-10-20 17:33:09 +13:00
4852ef3b86 improve consistency of my code with Cadence's 2026-10-19 13:12:52 +02:00
ea43d3b285 Fix conflicts; rename a var to something more sensible; less string concat because Cadence said she doesn't like it. 2026-10-19 13:04:18 +02:00
860506c037 Show displayname runoff once per message group 2026-10-19 23:05:56 +13:00
4d96963ecd Add test for PMP pronouns 2026-10-19 22:33:42 +13:00
Kryn Exa Skye
ce4b911b6f Show account and pronouns for PMP messages 2026-10-19 22:26:55 +13:00
b3d42e036c No URL preview for times 2026-10-19 22:25:21 +13:00
3cb1260671 Rename auth file to web-utils
I'm going to put more stuff in it.
2026-10-18 18:14:07 +13:00
648472d305 Merge remote-tracking branch 'cadence/main' into mergable-fr-fr 2026-10-14 09:59:19 +02:00
866a496582 Support component URL previews 2026-10-14 16:13:45 +13:00
1382ce6791 update tests 2026-10-13 23:32:57 +02:00
17cc56299d Nevermind, Commet is *just broken* when it comes to threads.
It refuses to render the 1st message of a thread, whether it's an emote, or anything else. COMMET, *WHY?*

Anyway, I don't think it makes sense to add extra accommodation to what's clearly a client-level bug. So emotes are back, yay!
2026-10-13 23:29:54 +02:00
e1b512bf09 RIP Ellie Mode; fck u Commet
The whole reason this woke branch up again, is that Cadence said she wants to use Matrix threads for discoverability of Discord threads. So RIP Ellie Mode (the one that eradicates threads fully).
2026-10-13 22:32:12 +02:00
bf9b6b198a FUCK YOU, PODMAN :"<
it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache it was the goddamnit build cache
2026-10-13 21:02:42 +02:00
0425c18cf3 sh!t, that wasn't supposed to make it there... 2026-10-13 20:35:17 +02:00
db874a1aa9 WHY CAN'T A BASIC P-TAG RENDER, HUH???? 2026-10-13 20:34:06 +02:00
c09c746628 cries 2026-10-13 20:30:52 +02:00
d5dd1d874e It did not, in fact, "fix stuff" 💔 2026-10-13 20:21:04 +02:00
d982a7d7d3 Let's just remove the check and see if it fixes stuff 2026-10-13 20:14:34 +02:00
b6017780cb I am about to go insane. 2026-10-13 19:47:01 +02:00
2c1c952413 Possibly fixed the Git-thinks-I-redone-the-whole-Pug-file-from-scratch bug
FUCK Windows; Screw it's stupid line endings
2026-10-13 19:36:15 +02:00
6586188fa3 another conflict nooooo 2026-10-13 12:56:46 +02:00
7902b91c38 Fix time formatting in different node versions 2026-10-13 23:46:04 +13:00
c196bef0ba Add tests for @room mention roles conversion 2026-10-13 23:33:14 +13:00
f39a7f4251 Check m.mentions before converting @room text 2026-10-13 23:32:43 +13:00
7b15e2a381 Merge pull request 'git is being funny again' (#14) from cadence/out-of-your-element:main into mergable-fr-fr
Reviewed-on: #14
2026-10-13 10:30:08 +00:00
682d32bf4b Btw, I think you forgot to update this, when you bumped the limit. xD 2026-10-13 12:21:03 +02:00
N0\A
f19f24314a Add customisable @room mention roles 2026-10-13 23:00:10 +13:00
08dea68e46 Support npm v12 2026-10-13 22:16:43 +13:00
a4f8f93ad9 Put "and" between duration units if there's only 2 2026-10-13 22:06:27 +13:00
9d7f8888a7 Fix scheduled event tests 2026-10-13 21:59:49 +13:00
57226cfdc8 Watch me absolutely break this bot by merging in stuff without really reviewing what changed, beyond resolving the 3 conflicts
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
2026-10-12 14:37:46 +02:00
a503277673 Use hyperlinked times for scheduled events 2026-10-08 02:54:46 +13:00
b49c6e8fd4 Add //time command for m->d scheduling 2026-10-08 02:19:26 +13:00
c25b5a19c6 Support Discord @time 2026-10-07 22:52:42 +13:00
302427037b Don't copy URL previews for GitHub 2026-10-04 22:24:13 +13:00
5794bee128 Support Discord game mentions 2026-10-04 22:19:35 +13:00
fab512a9ba Fix Klipy gifs when url previews disabled 2026-10-04 22:01:24 +13:00
77cc1e6eae Better solution for previous commit 2026-09-25 14:05:01 +12:00
59b5e05b33 Make m->d Klipy links not produce error 2026-09-24 13:18:52 +12:00
2959fd8ae3 Render pug blocks without a separate template 2026-09-15 23:42:06 +12:00
9058b60efe Update dependencies 2026-09-15 01:40:03 +12:00
2430d60809 v3.7 2026-09-14 16:22:00 +12:00
3d648e23c8 Check for homeserver liveliness more 2026-09-14 16:20:56 +12:00
021f02f981 d->m: Try too-large PNGs as JPEG for upload
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.
2026-09-14 00:30:03 +12:00