forked from cadence/out-of-your-element
Guzio
57226cfdc8
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 |
||
|---|---|---|
| .. | ||
| img | ||
| third-party | ||
| algorithms-notetaking.md | ||
| api.md | ||
| developer-orientation.md | ||
| docker.md | ||
| foreign-keys.md | ||
| get-started.md | ||
| how-to-add-a-new-event-type.md | ||
| pluralkit-notetaking.md | ||
| room-upgrades.md | ||
| self-service-room-creation-rules.md | ||
| simplified-homeserver-setup.md | ||
| threads-as-rooms.md | ||
| user-guide.md | ||
| why-does-the-bridge-have-a-website.md | ||