preceding
\ncode block\nfollowing code is inline
preceding
\ncode block\nfollowing code is inline
backtick in ` the middle, backtick at the edge`"
+ },
+ event_id: "$pGkWQuGVmrPNByrFELxhzI6MCBgJecr5I2J3z88Gc2s",
+ room_id: "!BpMdOUkWWhFxmTrENV:cadence.moe"
+ }),
+ {
+ ensureJoined: [],
+ messagesToDelete: [],
+ messagesToEdit: [],
+ messagesToSend: [{
+ username: "cadence [they]",
+ content: "``backtick in ` the middle``, `` backtick at the edge` ``",
+ avatar_url: undefined,
+ allowed_mentions: {
+ parse: ["users", "roles"]
+ }
+ }]
+ }
+ )
+})
+
+test("event2message: inline code is converted to code block if it contains both delimiters", async t => {
+ t.deepEqual(
+ await eventToMessage({
+ type: "m.room.message",
+ sender: "@cadence:cadence.moe",
+ content: {
+ msgtype: "m.text",
+ body: "wrong body",
+ format: "org.matrix.custom.html",
+ formatted_body: "` one two ``"
+ },
+ event_id: "$pGkWQuGVmrPNByrFELxhzI6MCBgJecr5I2J3z88Gc2s",
+ room_id: "!BpMdOUkWWhFxmTrENV:cadence.moe"
+ }),
+ {
+ ensureJoined: [],
+ messagesToDelete: [],
+ messagesToEdit: [],
+ messagesToSend: [{
+ username: "cadence [they]",
+ content: "``` ` one two `` ```",
+ avatar_url: undefined,
+ allowed_mentions: {
+ parse: ["users", "roles"]
+ }
+ }]
+ }
+ )
+})
+
test("event2message: code blocks are uploaded as attachments instead if they contain incompatible backticks", async t => {
t.deepEqual(
await eventToMessage({
diff --git a/matrix/kstate.js b/matrix/kstate.js
index 3c4189dd..eca9522c 100644
--- a/matrix/kstate.js
+++ b/matrix/kstate.js
@@ -4,7 +4,12 @@ const assert = require("assert").strict
const mixin = require("mixin-deep")
const {isDeepStrictEqual} = require("util")
-/** Mutates the input. */
+const passthrough = require("../passthrough")
+const {sync} = passthrough
+/** @type {import("./file")} */
+const file = sync.require("./file")
+
+/** Mutates the input. Not recursive - can only include or exclude entire state events. */
function kstateStripConditionals(kstate) {
for (const [k, content] of Object.entries(kstate)) {
// conditional for whether a key is even part of the kstate (doing this declaratively on json is hard, so represent it as a property instead.)
@@ -16,9 +21,33 @@ function kstateStripConditionals(kstate) {
return kstate
}
-function kstateToState(kstate) {
+/** Mutates the input. Works recursively through object tree. */
+async function kstateUploadMxc(obj) {
+ const promises = []
+ function inner(obj) {
+ for (const [k, v] of Object.entries(obj)) {
+ if (v == null || typeof v !== "object") continue
+
+ if (v.$url) {
+ promises.push(
+ file.uploadDiscordFileToMxc(v.$url)
+ .then(mxc => obj[k] = mxc)
+ )
+ }
+
+ inner(v)
+ }
+ }
+ inner(obj)
+ await Promise.all(promises)
+ return obj
+}
+
+/** Automatically strips conditionals and uploads URLs to mxc. */
+async function kstateToState(kstate) {
const events = []
kstateStripConditionals(kstate)
+ await kstateUploadMxc(kstate)
for (const [k, content] of Object.entries(kstate)) {
const slashIndex = k.indexOf("/")
assert(slashIndex > 0)
@@ -74,6 +103,7 @@ function diffKState(actual, target) {
}
module.exports.kstateStripConditionals = kstateStripConditionals
+module.exports.kstateUploadMxc = kstateUploadMxc
module.exports.kstateToState = kstateToState
module.exports.stateToKState = stateToKState
module.exports.diffKState = diffKState
diff --git a/matrix/kstate.test.js b/matrix/kstate.test.js
index 239de75f..0538450b 100644
--- a/matrix/kstate.test.js
+++ b/matrix/kstate.test.js
@@ -1,5 +1,5 @@
const assert = require("assert")
-const {kstateToState, stateToKState, diffKState, kstateStripConditionals} = require("./kstate")
+const {kstateToState, stateToKState, diffKState, kstateStripConditionals, kstateUploadMxc} = require("./kstate")
const {test} = require("supertape")
test("kstate strip: strips false conditions", t => {
@@ -21,8 +21,53 @@ test("kstate strip: keeps true conditions while removing $if", t => {
})
})
-test("kstate2state: general", t => {
- t.deepEqual(kstateToState({
+test("kstateUploadMxc: sets the mxc", async t => {
+ const input = {
+ "m.room.avatar/": {
+ url: {$url: "https://cdn.discordapp.com/guilds/112760669178241024/users/134826546694193153/avatars/38dd359aa12bcd52dd3164126c587f8c.png?size=1024"},
+ test1: {
+ test2: {
+ test3: {$url: "https://cdn.discordapp.com/attachments/176333891320283136/1157854643037163610/Screenshot_20231001_034036.jpg"}
+ }
+ }
+ }
+ }
+ await kstateUploadMxc(input)
+ t.deepEqual(input, {
+ "m.room.avatar/": {
+ url: "mxc://cadence.moe/rfemHmAtcprjLEiPiEuzPhpl",
+ test1: {
+ test2: {
+ test3: "mxc://cadence.moe/zAXdQriaJuLZohDDmacwWWDR"
+ }
+ }
+ }
+ })
+})
+
+test("kstateUploadMxc and strip: work together", async t => {
+ const input = {
+ "m.room.avatar/yes": {
+ $if: true,
+ url: {$url: "https://cdn.discordapp.com/guilds/112760669178241024/users/134826546694193153/avatars/38dd359aa12bcd52dd3164126c587f8c.png?size=1024"}
+ },
+ "m.room.avatar/no": {
+ $if: false,
+ url: {$url: "https://cdn.discordapp.com/avatars/320067006521147393/5fc4ad85c1ea876709e9a7d3374a78a1.png?size=1024"}
+ },
+ }
+ kstateStripConditionals(input)
+ await kstateUploadMxc(input)
+ t.deepEqual(input, {
+ "m.room.avatar/yes": {
+ url: "mxc://cadence.moe/rfemHmAtcprjLEiPiEuzPhpl"
+ }
+ })
+})
+
+
+test("kstate2state: general", async t => {
+ t.deepEqual(await kstateToState({
"m.room.name/": {name: "test name"},
"m.room.member/@cadence:cadence.moe": {membership: "join"},
"uk.half-shot.bridge/org.matrix.appservice-irc://irc/epicord.net/#general": {creator: "@cadence:cadence.moe"}
diff --git a/test/test.js b/test/test.js
index 58459f6a..396dea96 100644
--- a/test/test.js
+++ b/test/test.js
@@ -21,6 +21,9 @@ const reg = require("../matrix/read-registration")
reg.ooye.server_origin = "https://matrix.cadence.moe" // so that tests will pass even when hard-coded
reg.ooye.server_name = "cadence.moe"
reg.ooye.invite = ["@test_auto_invite:example.org"]
+reg.id = "baby" // don't actually take authenticated actions on the server
+reg.as_token = "baby"
+reg.hs_token = "baby"
const sync = new HeatSync({watchFS: false})
@@ -117,6 +120,7 @@ file._actuallyUploadDiscordFileToMxc = function(url, res) { throw new Error(`Not
require("../matrix/read-registration.test")
require("../matrix/txnid.test")
require("../d2m/actions/create-room.test")
+ require("../d2m/actions/create-space.test")
require("../d2m/actions/register-user.test")
require("../d2m/converters/edit-to-changes.test")
require("../d2m/converters/emoji-to-key.test")