diff --git a/harness/estate/check.cjs b/harness/estate/check.cjs new file mode 100644 index 00000000..656d532e --- /dev/null +++ b/harness/estate/check.cjs @@ -0,0 +1,46 @@ +// Assertions for the estate drives: every drive states the outcome it exists to show and exits +// non-zero when the page or the fake homeserver's log says otherwise. +const fs = require('fs'); +const fails = []; +exports.expect = (label, ok, detail = '') => { + console.log(`[ASSERT] ${ok ? 'PASS' : 'FAIL'} ${label}${ok ? '' : ` :: ${detail}`}`); + if (!ok) fails.push(label); +}; +/** Exit code for the drive: 4 when any assertion failed. */ +exports.done = () => (fails.length ? 4 : 0); +/** The fake homeserver's request log (HSLOG is shared with the server process). */ +exports.hsLog = () => fs.readFileSync(process.env.HSLOG, 'utf8').split('\n'); +/** Bodies of the account-data PUTs for m.direct, in order. */ +exports.mDirectPuts = () => + exports.hsLog().filter((l) => / PUT .*m\.direct BODY /.test(l)).map((l) => l.split(' BODY ')[1]); +/** Join requests the server saw for a room id. */ +exports.joinsOf = (roomId) => exports.hsLog().filter((l) => new RegExp(` JOIN ${roomId}$`).test(l)).length; +const HEADERS = ['GameCult', 'Projects', 'nibu', 'eureka', 'Nibu', 'Eureka', 'Elsewhere', 'Direct Messages']; +/** The tier header above a row, 'absent' when the page does not show the row, 'none-above' when no tier header precedes it. */ +const tierOf = (pg, name) => + pg.evaluate((n) => { + const s = document.body.innerText.split('\n').map((x) => x.trim()); + const i = s.indexOf(n); + if (i < 0) return 'absent'; + for (let j = i; j >= 0; j--) if (/^(elsewhere|direct messages)$/i.test(s[j])) return s[j]; + return 'none-above'; + }, name); +/** + * The tier a room is listed under, read from a fresh visit to the room list: a collapsed tier is + * opened only if the row is not already showing, so reading never closes what is open. + */ +exports.revealedTier = async (pg, name) => { + await pg.goto('http://127.0.0.1:8080/#/home/'); + await pg.waitForTimeout(2500); + let t = await tierOf(pg, name); + for (const h of HEADERS) { + if (t !== 'absent') break; + const hl = pg.getByText(h, { exact: true }); + if (await hl.count()) { await hl.first().click(); await pg.waitForTimeout(250); t = await tierOf(pg, name); } + } + return t; +}; +/** True when the page text matches re within ms of now (a message can be replaced by a row change). */ +exports.sawText = (pg, re, ms) => + pg.waitForFunction((src) => new RegExp(src, 'i').test(document.body.innerText), re.source, { timeout: ms, polling: 50 }).then(() => true, () => false); +exports.isDm = (tier) => /^direct messages$/i.test(tier); diff --git a/harness/estate/drive-failures.cjs b/harness/estate/drive-failures.cjs index 9c81424a..d53d88a4 100644 --- a/harness/estate/drive-failures.cjs +++ b/harness/estate/drive-failures.cjs @@ -1,6 +1,7 @@ // Failure-mode scenarios for the estate join paths (estate tap and inbox Accept), run by run.sh // against fakehs.cjs with the env flag each mode needs. const { chromium } = require('playwright'); +const { expect, done, isDm, mDirectPuts, joinsOf, revealedTier, sawText } = require('./check.cjs'); const MODE = process.env.MODE; const T0 = Date.now(); const t = () => `+${Date.now() - T0}ms`; const log = (...a) => console.log(`[${MODE}]`, ...a); @@ -19,9 +20,10 @@ setTimeout(() => { console.log('DRIVER_TIMEOUT'); quit(3); }, 240000); await open(); const body = async () => (await pg.evaluate(() => document.body.innerText)).replace(/\s+/g, ' '); const reveal = async (name) => { const loc = pg.locator(`[aria-label="Join ${name}"]`); if (await loc.count()) return loc; for (let r = 0; r < 2; r++) for (const h of HEADERS) { const hl = pg.getByText(h, { exact: true }); if (await hl.count()) { await hl.first().click(); await pg.waitForTimeout(250); if (await loc.count()) return loc; } } return loc; }; - const tierOf = (name) => pg.evaluate((n) => { const s = document.body.innerText.split('\n').map((x) => x.trim()); const i = s.indexOf(n); if (i < 0) return 'absent'; for (let j = i; j >= 0; j--) if (/^(elsewhere|direct messages)$/i.test(s[j])) return s[j]; return 'none-above'; }, name); + const tierOf = (name) => revealedTier(pg, name); const tap = async (n) => { const l = await reveal(n); log('JOINCTRL', n, await l.count()); await l.first().click(); log('CLICK', n, t()); }; - const tiers = async (tag) => { await pg.goto('http://127.0.0.1:8080/#/home/'); await pg.waitForTimeout(2500); for (const h of HEADERS) { const hl = pg.getByText(h, { exact: true }); if (await hl.count()) { await hl.first().click(); await pg.waitForTimeout(250); } } log('TIER', tag, '| Friend DM', await tierOf('Friend DM'), '| Slow DM', await tierOf('Slow DM')); }; + const tiers = async (tag) => { const r = { friend: await tierOf('Friend DM'), slow: await tierOf('Slow DM') }; log('TIER', tag, '| Friend DM', r.friend, '| Slow DM', r.slow); return r; }; + const neverUnfiled = () => mDirectPuts().every((b) => b.includes('!dm1:test')); const acceptInInbox = async (name) => { // reach the inbox through the navigator's own Inbox tab await pg.goto('http://127.0.0.1:8080/#/home/'); await pg.waitForTimeout(2000); @@ -38,23 +40,33 @@ setTimeout(() => { console.log('DRIVER_TIMEOUT'); quit(3); }, 240000); }; if (MODE === 'pjfail') { await tap('Friend DM'); await pg.waitForTimeout(3000); - const bb = await body(); const k = bb.search(/Internal server error|Could not join|Joined\./); log('AFTER_FAIL', k >= 0 ? bb.slice(Math.max(0, k - 40), k + 80) : 'no message'); - await tap('Friend DM'); await pg.waitForTimeout(6000); await tiers('after retry'); + const bb = await body(); const k = bb.search(/Internal server error/); log('AFTER_FAIL', k >= 0 ? bb.slice(Math.max(0, k - 40), k + 80) : 'no message'); + expect('a failed m.direct write shows the refusal', k >= 0, bb.slice(0, 200)); + expect('no join is sent while the filing is failing', joinsOf('!dm1:test') === 0, String(joinsOf('!dm1:test'))); + await tap('Friend DM'); await pg.waitForTimeout(6000); const r = await tiers('after retry'); + expect('the retry joins once', joinsOf('!dm1:test') === 1, String(joinsOf('!dm1:test'))); + expect('Friend DM is filed under Direct Messages after the retry', isDm(r.friend), r.friend); } else if (MODE === 'jdrop') { - await tap('Friend DM'); await pg.waitForTimeout(4000); - const bb = await body(); const k = bb.search(/fetch|Failed|network|Could not join|Joined\./i); log('AFTER_DROP', k >= 0 ? bb.slice(Math.max(0, k - 60), k + 80) : 'no message'); - await pg.waitForTimeout(6000); await tiers('after drop'); await open(); await tiers('after reload'); + await tap('Friend DM'); const saw = await sawText(pg, /tap again to retry/, 3000); log('AFTER_DROP', saw); + expect('a dropped join shows the retryable message', saw, (await body()).slice(0, 200)); + await pg.waitForTimeout(6000); const r1 = await tiers('after drop'); await open(); const r2 = await tiers('after reload'); + expect('the entry is kept after the drop', isDm(r1.friend) && neverUnfiled(), r1.friend); + expect('Friend DM is under Direct Messages after the reload', isDm(r2.friend), r2.friend); } else if (MODE === 'admin') { - await tap('Friend DM'); await pg.waitForTimeout(6000); await tiers('admin estate'); + await tap('Friend DM'); await pg.waitForTimeout(6000); const r = await tiers('admin estate'); + expect('an admin-invited DM is filed under Direct Messages', isDm(r.friend), r.friend); } else if (MODE === 'inboxadmin') { - await acceptInInbox('Friend DM'); await pg.waitForTimeout(6000); await tiers('admin inbox'); + await acceptInInbox('Friend DM'); await pg.waitForTimeout(6000); const r = await tiers('admin inbox'); + expect('an admin-invited DM accepted in the inbox is filed under Direct Messages', isDm(r.friend), r.friend); } else if (MODE === 'inboxreload') { await acceptInInbox('Slow DM'); await pg.waitForTimeout(2000); log('RELOAD', t()); await open('#/inbox/invites/'); - await pg.waitForTimeout(30000); await tiers('inbox reload'); + await pg.waitForTimeout(30000); const r = await tiers('inbox reload'); + expect('a DM accepted in the inbox is filed under Direct Messages after a reload', isDm(r.slow), r.slow); } else if (MODE === 'pjreload') { await tap('Slow DM'); await pg.waitForTimeout(2000); log('RELOAD', t()); await open(); await pg.waitForTimeout(8000); await tiers('pjreload'); - const l = pg.locator('[aria-label="Join Slow DM"]'); log('SLOW_DM_STILL_JOINABLE', await l.count()); + const n = await (await reveal('Slow DM')).count(); log('SLOW_DM_STILL_JOINABLE', n); + expect('a join cut off by a reload stays joinable', n === 1, String(n)); } - await quit(0); + await quit(done()); })().catch((e) => { log('ERROR', String(e.stack || e).slice(0, 300)); quit(1); }); diff --git a/harness/estate/drive-routes.cjs b/harness/estate/drive-routes.cjs new file mode 100644 index 00000000..75c9a8df --- /dev/null +++ b/harness/estate/drive-routes.cjs @@ -0,0 +1,42 @@ +const { chromium } = require('playwright'); +const { expect, done, isDm, mDirectPuts, hsLog, revealedTier, sawText } = require('./check.cjs'); +const MODE = process.env.MODE; const T0 = Date.now(); const t = () => `+${Date.now() - T0}ms`; +const log = (...a) => console.log(`[${MODE}]`, ...a); +const HEADERS = ['GameCult', 'Projects', 'nibu', 'eureka', 'Nibu', 'Eureka', 'Elsewhere', 'Direct Messages']; +let b; const quit = (c) => Promise.race([Promise.resolve(b && b.close()).catch(() => 0), new Promise((r) => setTimeout(r, 5000))]).finally(() => process.exit(c)); +setTimeout(() => { console.log('DRIVER_TIMEOUT'); quit(3); }, 120000); +(async () => { + b = await chromium.launch(); + const ctx = await b.newContext({ viewport: { width: 390, height: 844 }, isMobile: true, hasTouch: true }); + const pg = await ctx.newPage(); + await pg.goto('http://127.0.0.1:8080/'); + await pg.evaluate(() => { localStorage.setItem('cinny_access_token', 'tok'); localStorage.setItem('cinny_device_id', 'DEV'); localStorage.setItem('cinny_user_id', '@t:test'); localStorage.setItem('cinny_hs_base_url', 'http://127.0.0.1:8080'); }); + await pg.goto('http://127.0.0.1:8080/#/home/'); await pg.reload(); await pg.waitForTimeout(9000); + const body = async () => (await pg.evaluate(() => document.body.innerText)).replace(/\s+/g, ' '); + const tiers = async (tag) => { const f = await revealedTier(pg, 'Friend DM'); log('TIER', tag, '| Friend DM', f); return f; }; + let joined = false; + if (MODE === 'deeplink') { + for (const route of ['direct', 'home']) { + await pg.goto(`http://127.0.0.1:8080/#/${route}/${encodeURIComponent('!dm1:test')}/`); await pg.waitForTimeout(4000); + const bb = await body(); log('ROUTE', route, JSON.stringify(bb.slice(0, 300))); + const j = pg.getByRole('button', { name: /^Join$/ }); log('JOIN_BUTTONS', route, await j.count()); + if (await j.count()) { joined = true; await j.first().click(); log('CLICK_JOIN', route, t()); await pg.waitForTimeout(6000); break; } + } + const f = await tiers('after deeplink join'); + const stamps = (re) => hsLog().filter((l) => re.test(l)).map((l) => Number(l.split(' ')[0])); + const put = stamps(/ PUT .*m\.direct BODY .*!dm1:test/)[0], join = stamps(/ JOIN !dm1:test$/)[0]; + expect('the deep link offers one Join button', joined, 'no Join button'); + expect('the DM is filed before the join is sent', put !== undefined && join !== undefined && put <= join, `put ${put} join ${join}`); + expect('the DM is filed under Direct Messages', isDm(f), f); + } else if (MODE === 'gw504') { + const HL = HEADERS; let l = pg.locator('[aria-label="Join Friend DM"]'); + for (let r = 0; r < 2 && !(await l.count()); r++) for (const h of HL) { const hl = pg.getByText(h, { exact: true }); if (await hl.count()) { await hl.first().click(); await pg.waitForTimeout(250); } } + log('JOINCTRL', await l.count()); await l.first().click(); log('CLICK', t()); + const saw = await sawText(pg, /tap again to retry/, 3000); log('AFTER_504', saw); + expect('a gateway timeout shows the retryable message', saw, (await body()).slice(0, 200)); + await pg.waitForTimeout(4000); const f = await tiers('after 504 (join delivered by sync)'); + expect('the DM stays filed after a gateway timeout', mDirectPuts().every((b) => b.includes('!dm1:test')) && mDirectPuts().length > 0, JSON.stringify(mDirectPuts())); + expect('the DM is filed under Direct Messages once sync delivers it', isDm(f), f); + } + await quit(done()); +})().catch((e) => { log('ERROR', String(e.stack || e).slice(0, 300)); quit(1); }); diff --git a/harness/estate/drive.cjs b/harness/estate/drive.cjs index ed9950ce..03bd2ad0 100644 --- a/harness/estate/drive.cjs +++ b/harness/estate/drive.cjs @@ -1,8 +1,10 @@ const { chromium } = require('playwright'); +const { expect, done, isDm, revealedTier } = require('./check.cjs'); const MODE = process.env.MODE; // twodm | reload const T0 = Date.now(); const t = () => `+${Date.now() - T0}ms`; const log = (...a) => console.log(`[${MODE}]`, ...a); const HEADERS = ['GameCult', 'Projects', 'nibu', 'eureka', 'Nibu', 'Eureka', 'Elsewhere', 'Direct Messages']; +let tierBefore; (async () => { const b = await chromium.launch(); const ctx = await b.newContext({ viewport: { width: 390, height: 844 }, isMobile: true, hasTouch: true, deviceScaleFactor: 1 }); @@ -13,14 +15,14 @@ const HEADERS = ['GameCult', 'Projects', 'nibu', 'eureka', 'Nibu', 'Eureka', 'El await open(); const text = () => pg.evaluate(() => document.body.innerText); const reveal = async (name) => { const loc = pg.locator(`[aria-label="Join ${name}"]`); if (await loc.count()) return loc; for (let r = 0; r < 2; r++) for (const h of HEADERS) { const hl = pg.getByText(h, { exact: true }); if (await hl.count()) { await hl.first().click(); await pg.waitForTimeout(250); if (await loc.count()) return loc; } } return loc; }; - const tierOf = (name) => pg.evaluate((n) => { const s = document.body.innerText.split('\n').map((x) => x.trim()); const i = s.indexOf(n); if (i < 0) return 'absent'; for (let j = i; j >= 0; j--) if (/^(elsewhere|direct messages)$/i.test(s[j])) return s[j]; return 'none-above'; }, name); + const tierOf = (name) => revealedTier(pg, name); const tap = async (n) => { const l = await reveal(n); log('JOINCTRL', n, await l.count()); await l.first().click(); log('CLICK', n, t()); }; if (MODE === 'twodm') { await tap('Slow DM'); await pg.waitForTimeout(300); await tap('Late DM'); await pg.waitForTimeout(45000); } else if (MODE === 'convert') { await tap('Friend DM'); await pg.waitForTimeout(6000); - log('TIER before', await tierOf('Friend DM')); + tierBefore = await tierOf('Friend DM'); log('TIER before', tierBefore); await pg.goto('http://127.0.0.1:8080/#/direct/!dm1:test/'); await pg.waitForTimeout(4000); const ed = pg.locator('[contenteditable="true"]'); log('EDITORS', await ed.count(), pg.url()); await ed.first().click(); await pg.keyboard.type('/converttoroom', { delay: 30 }); await pg.waitForTimeout(500); @@ -35,7 +37,12 @@ const HEADERS = ['GameCult', 'Projects', 'nibu', 'eureka', 'Nibu', 'Eureka', 'El log('RELOAD', t()); await open(); await pg.waitForTimeout(30000); } - for (const h of HEADERS) { const hl = pg.getByText(h, { exact: true }); if (await hl.count()) { await hl.first().click(); await pg.waitForTimeout(250); } } - log('TIER Slow DM', await tierOf('Slow DM'), '| Late DM', await tierOf('Late DM'), '| Friend DM', await tierOf('Friend DM')); - await b.close(); + const slow = await tierOf('Slow DM'), late = await tierOf('Late DM'), friend = await tierOf('Friend DM'); + log('TIER Slow DM', slow, '| Late DM', late, '| Friend DM', friend); + if (MODE === 'twodm') { expect('Slow DM is filed under Direct Messages', isDm(slow), slow); expect('Late DM is filed under Direct Messages', isDm(late), late); } + else if (MODE === 'convert') { + expect('Friend DM was filed under Direct Messages before the conversion', isDm(tierBefore), tierBefore); + expect('the converted room left Direct Messages and is still listed', !isDm(friend) && friend !== 'absent', friend); + } else expect('Slow DM is filed under Direct Messages after the reload', isDm(slow), slow); + await b.close(); process.exitCode = done(); })().catch((e) => { log('ERROR', String(e.stack || e)); process.exitCode = 1; }); diff --git a/harness/estate/fakehs.cjs b/harness/estate/fakehs.cjs index a8180204..4a6875e0 100644 --- a/harness/estate/fakehs.cjs +++ b/harness/estate/fakehs.cjs @@ -91,6 +91,7 @@ http.createServer((req, res) => { if (id === PROJ[1].id) return json(res, 403, { errcode: 'M_FORBIDDEN', error: 'You are not invited to this room.' }); const prior = pending.find((q) => q.id === DM2 || q.id === DM3); pending.push({ id, at: (id === DM3 || id === DM2) && prior ? prior.at : Date.now() + (SLOW.has(id) ? 24000 : 1000) }); + if (process.env.JOIN_504 === '1' && id === DM1) { console.log('JOIN_504 ' + Date.now() + ' ' + id); res.writeHead(504, {'Content-Type':'text/html'}); return res.end('504 Gateway Time-out'); } if (process.env.JOIN_DROP === '1' && id === DM1) { console.log('JOIN_DROPPED ' + Date.now() + ' ' + id); return req.socket.destroy(); } if (process.env.JOIN_DELAY === '1') { console.log('JOIN_DELAYED ' + Date.now() + ' ' + id); return setTimeout(() => json(res, 200, { room_id: id }), 6000); } return json(res, 200, { room_id: id }); diff --git a/harness/estate/run.sh b/harness/estate/run.sh index 26b026b8..65242ab0 100644 --- a/harness/estate/run.sh +++ b/harness/estate/run.sh @@ -8,19 +8,19 @@ npm run build > /tmp/build.log 2>&1 || { tail -30 /tmp/build.log; exit 1; } echo BUILD_OK $(git rev-parse HEAD) printf '{"defaultHomeserver":0,"homeserverList":["127.0.0.1:8080"],"allowCustomHomeservers":true,"featuredCommunities":{"spaces":["#gamecult:test"],"rooms":[],"servers":["test"]},"hashRouter":{"enabled":true,"basename":"/"}}' > dist/config.json mkdir -p /tmp/pw && cd /tmp/pw && npm init -y >/dev/null && npm i --no-audit --no-fund playwright@1.48.2 >/tmp/pw.log 2>&1 -cp /src/harness/estate/drive.cjs /src/harness/estate/drive-failures.cjs /tmp/pw/ +cp /src/harness/estate/check.cjs /src/harness/estate/drive.cjs /src/harness/estate/drive-failures.cjs /src/harness/estate/drive-routes.cjs /tmp/pw/ set +e for m in twodm reload convert; do HSLOG=/tmp/hslog-$m.txt NOROOT=0 node /src/harness/estate/fakehs.cjs /src/dist > /tmp/hs-$m.out 2>&1 & HS=$!; sleep 2 - MODE=$m node /tmp/pw/drive.cjs; echo "DRIVE $m RC=$?" + HSLOG=/tmp/hslog-$m.txt MODE=$m node /tmp/pw/drive.cjs; rc=$?; echo "DRIVE $m RC=$rc"; [ $rc -eq 0 ] || FAILED="$FAILED $m" kill $HS; wait $HS 2>/dev/null; sleep 1 echo "=== hs $m"; grep -E "MDIRECT_PUT|DELIVER|STATE_" /tmp/hs-$m.out; grep -E " JOIN " /tmp/hslog-$m.txt done failure() { m=$1; shift env "$@" HSLOG=/tmp/hslog-$m.txt NOROOT=0 node /src/harness/estate/fakehs.cjs /src/dist > /tmp/hs-$m.out 2>&1 & HS=$!; sleep 2 - MODE=$m node /tmp/pw/drive-failures.cjs; echo "DRIVE $m RC=$?" + HSLOG=/tmp/hslog-$m.txt MODE=$m node /tmp/pw/${DRIVER:-drive-failures}.cjs; rc=$?; echo "DRIVE $m RC=$rc"; [ $rc -eq 0 ] || FAILED="$FAILED $m" kill $HS; wait $HS 2>/dev/null; sleep 1 echo "=== hs $m"; grep -E "MDIRECT|DELIVER|JOIN_|STATE_" /tmp/hs-$m.out; grep -E " JOIN " /tmp/hslog-$m.txt; } failure pjfail FAIL_MDIRECT=1 @@ -29,4 +29,7 @@ failure jdrop JOIN_DROP=1 failure admin INVITER_ADMIN=1 failure inboxadmin INVITER_ADMIN=1 failure inboxreload JOIN_DELAY=1 -echo DONE +DRIVER=drive-routes failure deeplink +DRIVER=drive-routes failure gw504 JOIN_504=1 +echo "FAILED_DRIVES:${FAILED:- none}" +[ -z "$FAILED" ] diff --git a/public/poses/aqua/amused.webp b/public/poses/aqua/amused.webp deleted file mode 100644 index 50ae021b..00000000 Binary files a/public/poses/aqua/amused.webp and /dev/null differ diff --git a/public/poses/aqua/annoyed.webp b/public/poses/aqua/annoyed.webp deleted file mode 100644 index 924b789d..00000000 Binary files a/public/poses/aqua/annoyed.webp and /dev/null differ diff --git a/public/poses/aqua/concerned.webp b/public/poses/aqua/concerned.webp deleted file mode 100644 index 09228316..00000000 Binary files a/public/poses/aqua/concerned.webp and /dev/null differ diff --git a/public/poses/aqua/conduct.webp b/public/poses/aqua/conduct.webp deleted file mode 100644 index 828d254f..00000000 Binary files a/public/poses/aqua/conduct.webp and /dev/null differ diff --git a/public/poses/aqua/determined.webp b/public/poses/aqua/determined.webp deleted file mode 100644 index c1a49115..00000000 Binary files a/public/poses/aqua/determined.webp and /dev/null differ diff --git a/public/poses/aqua/flourish.webp b/public/poses/aqua/flourish.webp deleted file mode 100644 index 46c6171b..00000000 Binary files a/public/poses/aqua/flourish.webp and /dev/null differ diff --git a/public/poses/aqua/happy.webp b/public/poses/aqua/happy.webp deleted file mode 100644 index 1dcb13a2..00000000 Binary files a/public/poses/aqua/happy.webp and /dev/null differ diff --git a/public/poses/aqua/listen.webp b/public/poses/aqua/listen.webp deleted file mode 100644 index b6447807..00000000 Binary files a/public/poses/aqua/listen.webp and /dev/null differ diff --git a/public/poses/aqua/neutral.webp b/public/poses/aqua/neutral.webp deleted file mode 100644 index d8f03a89..00000000 Binary files a/public/poses/aqua/neutral.webp and /dev/null differ diff --git a/public/poses/aqua/patch.webp b/public/poses/aqua/patch.webp deleted file mode 100644 index 7c47973b..00000000 Binary files a/public/poses/aqua/patch.webp and /dev/null differ diff --git a/public/poses/aqua/surprised.webp b/public/poses/aqua/surprised.webp deleted file mode 100644 index bd7dbe03..00000000 Binary files a/public/poses/aqua/surprised.webp and /dev/null differ diff --git a/public/poses/aqua/thinking.webp b/public/poses/aqua/thinking.webp deleted file mode 100644 index 8c0bde4c..00000000 Binary files a/public/poses/aqua/thinking.webp and /dev/null differ diff --git a/public/poses/eureka/amused.webp b/public/poses/eureka/amused.webp deleted file mode 100644 index bbe1e9d9..00000000 Binary files a/public/poses/eureka/amused.webp and /dev/null differ diff --git a/public/poses/eureka/annoyed.webp b/public/poses/eureka/annoyed.webp deleted file mode 100644 index ee832a1d..00000000 Binary files a/public/poses/eureka/annoyed.webp and /dev/null differ diff --git a/public/poses/eureka/concerned.webp b/public/poses/eureka/concerned.webp deleted file mode 100644 index b3c71b2b..00000000 Binary files a/public/poses/eureka/concerned.webp and /dev/null differ diff --git a/public/poses/eureka/determined.webp b/public/poses/eureka/determined.webp deleted file mode 100644 index 547d4464..00000000 Binary files a/public/poses/eureka/determined.webp and /dev/null differ diff --git a/public/poses/eureka/happy.webp b/public/poses/eureka/happy.webp deleted file mode 100644 index 782a3463..00000000 Binary files a/public/poses/eureka/happy.webp and /dev/null differ diff --git a/public/poses/eureka/hood.webp b/public/poses/eureka/hood.webp deleted file mode 100644 index 1565d1d7..00000000 Binary files a/public/poses/eureka/hood.webp and /dev/null differ diff --git a/public/poses/eureka/inspect.webp b/public/poses/eureka/inspect.webp deleted file mode 100644 index 2d7bb798..00000000 Binary files a/public/poses/eureka/inspect.webp and /dev/null differ diff --git a/public/poses/eureka/neutral.webp b/public/poses/eureka/neutral.webp deleted file mode 100644 index a0ec077a..00000000 Binary files a/public/poses/eureka/neutral.webp and /dev/null differ diff --git a/public/poses/eureka/probe.webp b/public/poses/eureka/probe.webp deleted file mode 100644 index 8217aed3..00000000 Binary files a/public/poses/eureka/probe.webp and /dev/null differ diff --git a/public/poses/eureka/report.webp b/public/poses/eureka/report.webp deleted file mode 100644 index c6ca480e..00000000 Binary files a/public/poses/eureka/report.webp and /dev/null differ diff --git a/public/poses/eureka/surprised.webp b/public/poses/eureka/surprised.webp deleted file mode 100644 index 067fc33c..00000000 Binary files a/public/poses/eureka/surprised.webp and /dev/null differ diff --git a/public/poses/eureka/thinking.webp b/public/poses/eureka/thinking.webp deleted file mode 100644 index 4789ee16..00000000 Binary files a/public/poses/eureka/thinking.webp and /dev/null differ diff --git a/public/poses/heimdall/amused.webp b/public/poses/heimdall/amused.webp deleted file mode 100644 index d84ad757..00000000 Binary files a/public/poses/heimdall/amused.webp and /dev/null differ diff --git a/public/poses/heimdall/annoyed.webp b/public/poses/heimdall/annoyed.webp deleted file mode 100644 index 8bbb4d10..00000000 Binary files a/public/poses/heimdall/annoyed.webp and /dev/null differ diff --git a/public/poses/heimdall/badge.webp b/public/poses/heimdall/badge.webp deleted file mode 100644 index c78cacbc..00000000 Binary files a/public/poses/heimdall/badge.webp and /dev/null differ diff --git a/public/poses/heimdall/barrier.webp b/public/poses/heimdall/barrier.webp deleted file mode 100644 index d35ea9ff..00000000 Binary files a/public/poses/heimdall/barrier.webp and /dev/null differ diff --git a/public/poses/heimdall/concerned.webp b/public/poses/heimdall/concerned.webp deleted file mode 100644 index 549719a2..00000000 Binary files a/public/poses/heimdall/concerned.webp and /dev/null differ diff --git a/public/poses/heimdall/determined.webp b/public/poses/heimdall/determined.webp deleted file mode 100644 index cbe34ae1..00000000 Binary files a/public/poses/heimdall/determined.webp and /dev/null differ diff --git a/public/poses/heimdall/happy.webp b/public/poses/heimdall/happy.webp deleted file mode 100644 index a9bdc79b..00000000 Binary files a/public/poses/heimdall/happy.webp and /dev/null differ diff --git a/public/poses/heimdall/neutral.webp b/public/poses/heimdall/neutral.webp deleted file mode 100644 index ca9ed41f..00000000 Binary files a/public/poses/heimdall/neutral.webp and /dev/null differ diff --git a/public/poses/heimdall/protect.webp b/public/poses/heimdall/protect.webp deleted file mode 100644 index 7daafa22..00000000 Binary files a/public/poses/heimdall/protect.webp and /dev/null differ diff --git a/public/poses/heimdall/revoke.webp b/public/poses/heimdall/revoke.webp deleted file mode 100644 index 96eb3215..00000000 Binary files a/public/poses/heimdall/revoke.webp and /dev/null differ diff --git a/public/poses/heimdall/surprised.webp b/public/poses/heimdall/surprised.webp deleted file mode 100644 index f50c455d..00000000 Binary files a/public/poses/heimdall/surprised.webp and /dev/null differ diff --git a/public/poses/heimdall/thinking.webp b/public/poses/heimdall/thinking.webp deleted file mode 100644 index 9c5e89a5..00000000 Binary files a/public/poses/heimdall/thinking.webp and /dev/null differ diff --git a/public/poses/kiko/amused.webp b/public/poses/kiko/amused.webp deleted file mode 100644 index a9f7be7d..00000000 Binary files a/public/poses/kiko/amused.webp and /dev/null differ diff --git a/public/poses/kiko/annoyed.webp b/public/poses/kiko/annoyed.webp deleted file mode 100644 index b2063e8f..00000000 Binary files a/public/poses/kiko/annoyed.webp and /dev/null differ diff --git a/public/poses/kiko/concerned.webp b/public/poses/kiko/concerned.webp deleted file mode 100644 index 5a1b9f42..00000000 Binary files a/public/poses/kiko/concerned.webp and /dev/null differ diff --git a/public/poses/kiko/confetti.webp b/public/poses/kiko/confetti.webp deleted file mode 100644 index 9610c0de..00000000 Binary files a/public/poses/kiko/confetti.webp and /dev/null differ diff --git a/public/poses/kiko/debug.webp b/public/poses/kiko/debug.webp deleted file mode 100644 index 653e1073..00000000 Binary files a/public/poses/kiko/debug.webp and /dev/null differ diff --git a/public/poses/kiko/determined.webp b/public/poses/kiko/determined.webp deleted file mode 100644 index d5e14232..00000000 Binary files a/public/poses/kiko/determined.webp and /dev/null differ diff --git a/public/poses/kiko/happy.webp b/public/poses/kiko/happy.webp deleted file mode 100644 index a777070b..00000000 Binary files a/public/poses/kiko/happy.webp and /dev/null differ diff --git a/public/poses/kiko/neutral.webp b/public/poses/kiko/neutral.webp deleted file mode 100644 index 8ae26999..00000000 Binary files a/public/poses/kiko/neutral.webp and /dev/null differ diff --git a/public/poses/kiko/sprint.webp b/public/poses/kiko/sprint.webp deleted file mode 100644 index 2fb4de3b..00000000 Binary files a/public/poses/kiko/sprint.webp and /dev/null differ diff --git a/public/poses/kiko/surprised.webp b/public/poses/kiko/surprised.webp deleted file mode 100644 index 37adb7a6..00000000 Binary files a/public/poses/kiko/surprised.webp and /dev/null differ diff --git a/public/poses/kiko/thinking.webp b/public/poses/kiko/thinking.webp deleted file mode 100644 index 2ad2c9af..00000000 Binary files a/public/poses/kiko/thinking.webp and /dev/null differ diff --git a/public/poses/kiko/tinker.webp b/public/poses/kiko/tinker.webp deleted file mode 100644 index e53019f8..00000000 Binary files a/public/poses/kiko/tinker.webp and /dev/null differ diff --git a/public/poses/libby/amused.webp b/public/poses/libby/amused.webp deleted file mode 100644 index 03006036..00000000 Binary files a/public/poses/libby/amused.webp and /dev/null differ diff --git a/public/poses/libby/annoyed.webp b/public/poses/libby/annoyed.webp deleted file mode 100644 index d4810a1e..00000000 Binary files a/public/poses/libby/annoyed.webp and /dev/null differ diff --git a/public/poses/libby/concerned.webp b/public/poses/libby/concerned.webp deleted file mode 100644 index bc11d149..00000000 Binary files a/public/poses/libby/concerned.webp and /dev/null differ diff --git a/public/poses/libby/determined.webp b/public/poses/libby/determined.webp deleted file mode 100644 index 2170715b..00000000 Binary files a/public/poses/libby/determined.webp and /dev/null differ diff --git a/public/poses/libby/happy.webp b/public/poses/libby/happy.webp deleted file mode 100644 index 182ec8be..00000000 Binary files a/public/poses/libby/happy.webp and /dev/null differ diff --git a/public/poses/libby/neutral.webp b/public/poses/libby/neutral.webp deleted file mode 100644 index ae5a76ad..00000000 Binary files a/public/poses/libby/neutral.webp and /dev/null differ diff --git a/public/poses/libby/research.webp b/public/poses/libby/research.webp deleted file mode 100644 index 8bf7d487..00000000 Binary files a/public/poses/libby/research.webp and /dev/null differ diff --git a/public/poses/libby/schema.webp b/public/poses/libby/schema.webp deleted file mode 100644 index 2dc8b116..00000000 Binary files a/public/poses/libby/schema.webp and /dev/null differ diff --git a/public/poses/libby/shush.webp b/public/poses/libby/shush.webp deleted file mode 100644 index 07466e6e..00000000 Binary files a/public/poses/libby/shush.webp and /dev/null differ diff --git a/public/poses/libby/stamp.webp b/public/poses/libby/stamp.webp deleted file mode 100644 index 854d374c..00000000 Binary files a/public/poses/libby/stamp.webp and /dev/null differ diff --git a/public/poses/libby/surprised.webp b/public/poses/libby/surprised.webp deleted file mode 100644 index 2ca82ba7..00000000 Binary files a/public/poses/libby/surprised.webp and /dev/null differ diff --git a/public/poses/libby/thinking.webp b/public/poses/libby/thinking.webp deleted file mode 100644 index 9a0e9b76..00000000 Binary files a/public/poses/libby/thinking.webp and /dev/null differ diff --git a/public/poses/nibu/amused.webp b/public/poses/nibu/amused.webp deleted file mode 100644 index 62f3a160..00000000 Binary files a/public/poses/nibu/amused.webp and /dev/null differ diff --git a/public/poses/nibu/annoyed.webp b/public/poses/nibu/annoyed.webp deleted file mode 100644 index e9ce2d5d..00000000 Binary files a/public/poses/nibu/annoyed.webp and /dev/null differ diff --git a/public/poses/nibu/concerned.webp b/public/poses/nibu/concerned.webp deleted file mode 100644 index 10f7b1e1..00000000 Binary files a/public/poses/nibu/concerned.webp and /dev/null differ diff --git a/public/poses/nibu/console.webp b/public/poses/nibu/console.webp deleted file mode 100644 index afeac6b9..00000000 Binary files a/public/poses/nibu/console.webp and /dev/null differ diff --git a/public/poses/nibu/determined.webp b/public/poses/nibu/determined.webp deleted file mode 100644 index 96c5868e..00000000 Binary files a/public/poses/nibu/determined.webp and /dev/null differ diff --git a/public/poses/nibu/glitch.webp b/public/poses/nibu/glitch.webp deleted file mode 100644 index 686978be..00000000 Binary files a/public/poses/nibu/glitch.webp and /dev/null differ diff --git a/public/poses/nibu/happy.webp b/public/poses/nibu/happy.webp deleted file mode 100644 index e9a10235..00000000 Binary files a/public/poses/nibu/happy.webp and /dev/null differ diff --git a/public/poses/nibu/lore.webp b/public/poses/nibu/lore.webp deleted file mode 100644 index 9e10a464..00000000 Binary files a/public/poses/nibu/lore.webp and /dev/null differ diff --git a/public/poses/nibu/neutral.webp b/public/poses/nibu/neutral.webp deleted file mode 100644 index b07dc83b..00000000 Binary files a/public/poses/nibu/neutral.webp and /dev/null differ diff --git a/public/poses/nibu/surprised.webp b/public/poses/nibu/surprised.webp deleted file mode 100644 index 1454b77b..00000000 Binary files a/public/poses/nibu/surprised.webp and /dev/null differ diff --git a/public/poses/nibu/thinking.webp b/public/poses/nibu/thinking.webp deleted file mode 100644 index fdf6bdac..00000000 Binary files a/public/poses/nibu/thinking.webp and /dev/null differ diff --git a/public/poses/nibu/triumph.webp b/public/poses/nibu/triumph.webp deleted file mode 100644 index ea6157b4..00000000 Binary files a/public/poses/nibu/triumph.webp and /dev/null differ diff --git a/public/poses/weksa/amused.webp b/public/poses/weksa/amused.webp deleted file mode 100644 index 8ec99ef3..00000000 Binary files a/public/poses/weksa/amused.webp and /dev/null differ diff --git a/public/poses/weksa/annoyed.webp b/public/poses/weksa/annoyed.webp deleted file mode 100644 index 9f43f936..00000000 Binary files a/public/poses/weksa/annoyed.webp and /dev/null differ diff --git a/public/poses/weksa/argue.webp b/public/poses/weksa/argue.webp deleted file mode 100644 index 7f23efcb..00000000 Binary files a/public/poses/weksa/argue.webp and /dev/null differ diff --git a/public/poses/weksa/concerned.webp b/public/poses/weksa/concerned.webp deleted file mode 100644 index c98206f9..00000000 Binary files a/public/poses/weksa/concerned.webp and /dev/null differ diff --git a/public/poses/weksa/determined.webp b/public/poses/weksa/determined.webp deleted file mode 100644 index b5a33793..00000000 Binary files a/public/poses/weksa/determined.webp and /dev/null differ diff --git a/public/poses/weksa/fieldwork.webp b/public/poses/weksa/fieldwork.webp deleted file mode 100644 index cfbef5c5..00000000 Binary files a/public/poses/weksa/fieldwork.webp and /dev/null differ diff --git a/public/poses/weksa/happy.webp b/public/poses/weksa/happy.webp deleted file mode 100644 index 81aa31ca..00000000 Binary files a/public/poses/weksa/happy.webp and /dev/null differ diff --git a/public/poses/weksa/interlingua.webp b/public/poses/weksa/interlingua.webp deleted file mode 100644 index 88cc4649..00000000 Binary files a/public/poses/weksa/interlingua.webp and /dev/null differ diff --git a/public/poses/weksa/map.webp b/public/poses/weksa/map.webp deleted file mode 100644 index 2cbfa701..00000000 Binary files a/public/poses/weksa/map.webp and /dev/null differ diff --git a/public/poses/weksa/neutral.webp b/public/poses/weksa/neutral.webp deleted file mode 100644 index 925e5934..00000000 Binary files a/public/poses/weksa/neutral.webp and /dev/null differ diff --git a/public/poses/weksa/surprised.webp b/public/poses/weksa/surprised.webp deleted file mode 100644 index 5e74a195..00000000 Binary files a/public/poses/weksa/surprised.webp and /dev/null differ diff --git a/public/poses/weksa/thinking.webp b/public/poses/weksa/thinking.webp deleted file mode 100644 index 8f286291..00000000 Binary files a/public/poses/weksa/thinking.webp and /dev/null differ diff --git a/src/app/components/message/layout/Bubble.tsx b/src/app/components/message/layout/Bubble.tsx index 7fc5171c..93ff84bc 100644 --- a/src/app/components/message/layout/Bubble.tsx +++ b/src/app/components/message/layout/Bubble.tsx @@ -5,12 +5,11 @@ import * as css from './layout.css'; type BubbleArrowProps = { variant: ContainerColor; - pose?: boolean; }; -function BubbleLeftArrow({ variant, pose }: BubbleArrowProps) { +function BubbleLeftArrow({ variant }: BubbleArrowProps) { return ( ( - ({ hideBubble, pose, before, header, children, ...props }, ref) => ( - - + ({ hideBubble, before, header, children, ...props }, ref) => ( + + {before} @@ -55,15 +48,11 @@ export const BubbleLayout = as<'div', BubbleLayoutProps>( className={ hideBubble ? undefined - : classNames( - css.BubbleContent, - before ? css.BubbleContentArrowLeft : undefined, - pose && css.BubbleContentPoseStacked - ) + : classNames(css.BubbleContent, before ? css.BubbleContentArrowLeft : undefined) } direction="Column" > - {before ? : null} + {before ? : null} {children} diff --git a/src/app/components/message/layout/layout.css.ts b/src/app/components/message/layout/layout.css.ts index cb53a62d..cc2cd0c6 100644 --- a/src/app/components/message/layout/layout.css.ts +++ b/src/app/components/message/layout/layout.css.ts @@ -138,34 +138,6 @@ export const BubbleBefore = style({ minWidth: toRem(36), }); -// Pose portraits: beside the bubble on wide screens; on phones the row stacks, so the -// portrait costs a little height instead of a column of width, and the left arrow goes. -export const BubblePose = style({ - '@media': { - 'screen and (max-width: 750px)': { - flexDirection: 'column', - gap: config.space.S100, - }, - }, -}); - -export const BubbleBeforePose = style({ - minWidth: toRem(64), - '@media': { - 'screen and (max-width: 750px)': { - minWidth: 0, - }, - }, -}); - -export const BubbleArrowPose = style({ - '@media': { - 'screen and (max-width: 750px)': { - display: 'none', - }, - }, -}); - export const BubbleContent = style({ maxWidth: toRem(800), padding: config.space.S200, @@ -179,34 +151,6 @@ export const BubbleContentArrowLeft = style({ borderTopLeftRadius: 0, }); -export const BubbleContentPoseStacked = style({ - '@media': { - 'screen and (max-width: 750px)': { - borderTopLeftRadius: config.radii.R500, - }, - }, -}); - -export const PoseButton = style({ - padding: 0, - border: 'none', - background: 'none', - cursor: 'pointer', - lineHeight: 0, -}); - -export const PosePortrait = style({ - width: toRem(64), - height: toRem(64), - objectFit: 'contain', - '@media': { - 'screen and (max-width: 750px)': { - width: toRem(48), - height: toRem(48), - }, - }, -}); - export const BubbleLeftArrow = style({ width: toRem(9), height: toRem(8), diff --git a/src/app/components/message/pose/PoseAvatar.tsx b/src/app/components/message/pose/PoseAvatar.tsx deleted file mode 100644 index ed8bc485..00000000 --- a/src/app/components/message/pose/PoseAvatar.tsx +++ /dev/null @@ -1,30 +0,0 @@ -import React from 'react'; -import * as css from '../layout/layout.css'; -import { poseSrc } from './poses'; - -type PoseAvatarProps = { - mind: string; - pose: string; - userId: string; - onClick: React.MouseEventHandler; -}; - -export function PoseAvatar({ mind, pose, userId, onClick }: PoseAvatarProps) { - return ( - {`${mind}, - - ); -} diff --git a/src/app/components/message/pose/poses.test.ts b/src/app/components/message/pose/poses.test.ts deleted file mode 100644 index 0915cfa7..00000000 --- a/src/app/components/message/pose/poses.test.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { describe, expect, it } from 'vitest'; -import { mindOfSender, poseSrc, resolvePose } from './poses'; - -describe('resolvePose', () => { - it('keeps shared and own-signature labels', () => { - expect(resolvePose('aqua', 'amused')).toBe('amused'); - expect(resolvePose('aqua', 'conduct')).toBe('conduct'); - expect(resolvePose('kiko', ' Debug ')).toBe('debug'); - }); - it('falls back to neutral for missing, unknown, non-string or foreign-signature labels', () => { - expect(resolvePose('aqua', undefined)).toBe('neutral'); - expect(resolvePose('aqua', 'smug')).toBe('neutral'); - expect(resolvePose('aqua', 7)).toBe('neutral'); - expect(resolvePose('aqua', 'probe')).toBe('neutral'); - expect(resolvePose('nobody', 'probe')).toBe('neutral'); - }); -}); - -describe('mindOfSender', () => { - it('matches localpart or first display-name word', () => { - expect(mindOfSender('Eureka')).toBe('eureka'); - expect(mindOfSender('x', 'Libby the Archivist')).toBe('libby'); - }); - it('ignores humans and Object prototype names', () => { - expect(mindOfSender('alice', 'Alice')).toBeUndefined(); - expect(mindOfSender('constructor')).toBeUndefined(); - expect(mindOfSender()).toBeUndefined(); - }); -}); - -describe('poseSrc', () => { - it('builds the asset path', () => { - expect(poseSrc('nibu', 'glitch', '/app/')).toBe('/app/public/poses/nibu/glitch.webp'); - }); -}); diff --git a/src/app/components/message/pose/poses.ts b/src/app/components/message/pose/poses.ts deleted file mode 100644 index 58ce59b8..00000000 --- a/src/app/components/message/pose/poses.ts +++ /dev/null @@ -1,48 +0,0 @@ -// Pose labels travel in the event content under POSE_KEY. Art exists per Mind; -// every Mind has the shared set plus four signature poses of its own. -export const POSE_KEY = 'org.gamecult.pose'; - -export const SHARED_POSES = [ - 'neutral', - 'happy', - 'amused', - 'thinking', - 'concerned', - 'annoyed', - 'surprised', - 'determined', -] as const; - -export const MIND_POSES: Record = { - aqua: ['conduct', 'listen', 'patch', 'flourish'], - eureka: ['probe', 'inspect', 'report', 'hood'], - heimdall: ['badge', 'barrier', 'protect', 'revoke'], - kiko: ['tinker', 'confetti', 'sprint', 'debug'], - libby: ['stamp', 'research', 'shush', 'schema'], - nibu: ['console', 'glitch', 'lore', 'triumph'], - weksa: ['map', 'fieldwork', 'argue', 'interlingua'], -}; - -export const NEUTRAL = 'neutral'; - -// A sender is a known Mind when its Matrix localpart or the first word of its -// display name is the Mind's name, case-insensitively. -export const mindOfSender = (localpart?: string, displayName?: string): string | undefined => { - const candidates = [localpart, displayName?.split(/\s+/)[0]]; - return candidates - .map((c) => c?.toLowerCase()) - .find( - (c): c is string => c !== undefined && Object.prototype.hasOwnProperty.call(MIND_POSES, c) - ); -}; - -// Unknown, missing or non-string labels, and another Mind's signature, fall back to neutral. -export const resolvePose = (mind: string, label: unknown): string => { - if (typeof label !== 'string') return NEUTRAL; - const l = label.trim().toLowerCase(); - const known = (SHARED_POSES as readonly string[]).includes(l) || MIND_POSES[mind]?.includes(l); - return known ? l : NEUTRAL; -}; - -export const poseSrc = (mind: string, pose: string, base = '/'): string => - `${base}public/poses/${mind}/${pose}.webp`; diff --git a/src/app/components/room-card/RoomCard.tsx b/src/app/components/room-card/RoomCard.tsx index 34a7e24b..64aaaacb 100644 --- a/src/app/components/room-card/RoomCard.tsx +++ b/src/app/components/room-card/RoomCard.tsx @@ -1,5 +1,5 @@ import React, { ReactNode, useCallback, useRef, useState } from 'react'; -import { MatrixError, Room } from 'matrix-js-sdk'; +import { MatrixError } from 'matrix-js-sdk'; import { Avatar, Badge, @@ -31,6 +31,7 @@ import { RoomType, StateEvent } from '../../../types/matrix/room'; import { useJoinedRoomId } from '../../hooks/useJoinedRoomId'; import { useElementSizeObserver } from '../../hooks/useElementSizeObserver'; import { getRoomAvatarUrl, getStateEvent } from '../../utils/room'; +import { joinEstateRoomOrThrow } from '../../features/estate/joinEstateRoom'; import { useStateEventCallback } from '../../hooks/useStateEventCallback'; import { useMediaAuthentication } from '../../hooks/useMediaAuthentication'; @@ -197,8 +198,10 @@ export const RoomCard = as<'div', RoomCardProps>( ) ); - const [joinState, join] = useAsyncCallback( - useCallback(() => mx.joinRoom(roomIdOrAlias, { viaServers }), [mx, roomIdOrAlias, viaServers]) + const [joinState, join] = useAsyncCallback( + useCallback(async () => { + await joinEstateRoomOrThrow(mx, roomIdOrAlias, viaServers); + }, [mx, roomIdOrAlias, viaServers]) ); const joining = joinState.status === AsyncStatus.Loading || joinState.status === AsyncStatus.Success; diff --git a/src/app/components/room-intro/RoomIntro.tsx b/src/app/components/room-intro/RoomIntro.tsx index ce550992..2e4e3ebc 100644 --- a/src/app/components/room-intro/RoomIntro.tsx +++ b/src/app/components/room-intro/RoomIntro.tsx @@ -17,6 +17,7 @@ import { useMediaAuthentication } from '../../hooks/useMediaAuthentication'; import { useSetting } from '../../state/hooks/settings'; import { settingsAtom } from '../../state/settings'; import { InviteUserPrompt } from '../invite-user-prompt'; +import { joinEstateRoomOrThrow } from '../../features/estate/joinEstateRoom'; export type RoomIntroProps = { room: Room; @@ -43,7 +44,7 @@ export const RoomIntro = as<'div', RoomIntroProps>(({ room, ...props }, ref) => const prevRoomId = createContent?.predecessor?.room_id; const [prevRoomState, joinPrevRoom] = useAsyncCallback( - useCallback(async (roomId: string) => mx.joinRoom(roomId), [mx]) + useCallback((roomId: string) => joinEstateRoomOrThrow(mx, roomId), [mx]) ); const [hour24Clock] = useSetting(settingsAtom, 'hour24Clock'); diff --git a/src/app/features/estate/joinEstateRoom.test.ts b/src/app/features/estate/joinEstateRoom.test.ts index d206a608..932e7cce 100644 --- a/src/app/features/estate/joinEstateRoom.test.ts +++ b/src/app/features/estate/joinEstateRoom.test.ts @@ -1,5 +1,11 @@ import { describe, expect, it, vi } from 'vitest'; -import { activateEstateRoom, awaitMyJoin } from './joinEstateRoom'; +import { + activateEstateRoom, + awaitMyJoin, + joinEstateRoomIdOrAlias, + joinEstateRoomOrThrow, + runJoinCommand, +} from './joinEstateRoom'; const room = (state: 'joined' | 'invited' | 'joinable') => ({ roomId: '!r:gamecult.org', @@ -52,13 +58,19 @@ describe('activateEstateRoom', () => { it('falls back to the error message, then to a generic one', async () => { const named = recordingClient( - vi.fn().mockRejectedValue(Object.assign(new Error('Boom'), { httpStatus: 500 })) + vi + .fn() + .mockRejectedValue( + Object.assign(new Error('Boom'), { httpStatus: 403, errcode: 'M_FORBIDDEN' }) + ) ); expect(await activateEstateRoom(named.mx, room('joinable'))).toEqual({ kind: 'refused', message: 'Boom', }); - const bare = recordingClient(vi.fn().mockRejectedValue({ httpStatus: 500 })); + const bare = recordingClient( + vi.fn().mockRejectedValue({ httpStatus: 403, errcode: 'M_FORBIDDEN' }) + ); expect(await activateEstateRoom(bare.mx, room('joinable'))).toEqual({ kind: 'refused', message: 'Could not join', @@ -68,6 +80,7 @@ describe('activateEstateRoom', () => { it('reports the server refusal and does not decide access itself', async () => { const refusal = Object.assign(new Error('M_FORBIDDEN'), { httpStatus: 403, + errcode: 'M_FORBIDDEN', data: { error: 'You are not invited to this room.' }, }); const { mx, joinRoom } = recordingClient(vi.fn().mockRejectedValue(refusal)); @@ -78,13 +91,22 @@ describe('activateEstateRoom', () => { }); /** A client holding DM invites as the server sends them: the mark is in the invite event only. */ -const dmClient = (opts: { refuse?: boolean; drop?: boolean; invites: Record }) => { +const dmClient = (opts: { + status?: number; + errcode?: string; + refuse?: boolean; + drop?: boolean; + failWrite?: boolean; + invites: Record; +}) => { let direct: Record | undefined; const writes: Record[] = []; const joined: string[] = []; + const joinOpts: unknown[] = []; const mx = { getSafeUserId: () => '@me:test', getRoom: (roomId: string) => ({ + getMyMembership: () => 'invite', getMember: () => ({ events: { member: { @@ -96,21 +118,29 @@ const dmClient = (opts: { refuse?: boolean; drop?: boolean; invites: Record (direct ? { getContent: () => direct } : undefined), setAccountData: async (_t: string, content: Record) => { + if (opts.failWrite) throw new Error('account data write failed'); await new Promise((r) => { setTimeout(r, 5); }); writes.push(structuredClone(content)); direct = structuredClone(content); }, - joinRoom: async (roomId: string) => { + joinRoom: async (roomId: string, joinArgs?: unknown) => { + joinOpts.push(joinArgs); // the join lands only after m.direct has been written: record what it held joined.push(JSON.stringify(direct ?? {})); - if (opts.refuse) throw Object.assign(new Error('M_FORBIDDEN'), { httpStatus: 403 }); + if (opts.refuse) + throw Object.assign(new Error('M_FORBIDDEN'), { httpStatus: 403, errcode: 'M_FORBIDDEN' }); + if (opts.status) + throw Object.assign(new Error('Gateway Time-out'), { + httpStatus: opts.status, + errcode: opts.errcode, + }); if (opts.drop) throw new Error('fetch failed'); return { roomId }; }, }; - return { mx: mx as never, writes, joined, current: () => direct }; + return { mx: mx as never, writes, joined, joinOpts, current: () => direct }; }; const tap = (id: string) => ({ roomId: id, state: 'invited' as const, via: ['test'] }); @@ -149,6 +179,122 @@ describe('activateEstateRoom when the join gets no answer', () => { }); }); +describe('activateEstateRoom when the filing cannot be written', () => { + it('reports the failure and sends no join', async () => { + const c = dmClient({ failWrite: true, invites: { '!dm1:test': '@friend:test' } }); + const result = await activateEstateRoom(c.mx, tap('!dm1:test')); + expect(result).toEqual({ kind: 'refused', message: 'account data write failed' }); + expect(c.joined).toEqual([]); + }); +}); + +describe('activateEstateRoom when a room that is not a direct message refuses', () => { + it('reports the refusal and leaves m.direct alone', async () => { + const joinRoom = vi + .fn() + .mockRejectedValue( + Object.assign(new Error('no'), { httpStatus: 403, errcode: 'M_FORBIDDEN' }) + ); + const { mx, calls } = recordingClient(joinRoom); + const result = await activateEstateRoom(mx, room('joinable')); + expect(result.kind).toBe('refused'); + expect(calls).toEqual(['joinRoom']); + }); +}); + +describe('activateEstateRoom refusal bounds', () => { + it.each([400, 429, 499])('unfiles the room on a %i that carries an errcode', async (status) => { + const c = dmClient({ + status, + errcode: 'M_LIMIT_EXCEEDED', + invites: { '!dm1:test': '@friend:test' }, + }); + const result = await activateEstateRoom(c.mx, tap('!dm1:test')); + expect(result.kind).toBe('refused'); + expect((result as { message: string }).message).not.toMatch(/tap again to retry/); + expect(c.current()).toEqual({ '@friend:test': [] }); + }); + + it.each([399, 500])('keeps the room listed on a %i that carries an errcode', async (status) => { + const c = dmClient({ status, errcode: 'M_UNKNOWN', invites: { '!dm1:test': '@friend:test' } }); + await activateEstateRoom(c.mx, tap('!dm1:test')); + expect(c.current()).toEqual({ '@friend:test': ['!dm1:test'] }); + }); +}); + +describe('activateEstateRoom when a gateway answers instead of the server', () => { + it.each([502, 503, 504, 404])('keeps the room listed on a %i with no errcode', async (status) => { + const c = dmClient({ status, invites: { '!dm1:test': '@friend:test' } }); + const result = await activateEstateRoom(c.mx, tap('!dm1:test')); + expect(result.kind).toBe('refused'); + expect((result as { message: string }).message).toMatch(/tap again to retry/); + expect(c.current()).toEqual({ '@friend:test': ['!dm1:test'] }); + }); + + it('keeps the room listed on a 5xx even when it carries an errcode', async () => { + const c = dmClient({ + status: 500, + errcode: 'M_UNKNOWN', + invites: { '!dm1:test': '@friend:test' }, + }); + await activateEstateRoom(c.mx, tap('!dm1:test')); + expect(c.current()).toEqual({ '@friend:test': ['!dm1:test'] }); + }); +}); + +describe('joinEstateRoomIdOrAlias, the room card and /join', () => { + it('files a direct invite opened by its link before the join is sent', async () => { + const c = dmClient({ invites: { '!dm1:test': '@friend:test' } }); + const result = await joinEstateRoomIdOrAlias(c.mx, '!dm1:test', ['test']); + expect(result).toEqual({ kind: 'joined', roomId: '!dm1:test' }); + expect(c.joined).toEqual([JSON.stringify({ '@friend:test': ['!dm1:test'] })]); + }); + + it('hands the via servers to the join', async () => { + const c = dmClient({ invites: { '!dm1:test': '@friend:test' } }); + await joinEstateRoomIdOrAlias(c.mx, '!dm1:test', ['other.org']); + expect(c.joinOpts).toEqual([{ viaServers: ['other.org'] }]); + }); + + it('joins an alias or an unheld room without touching m.direct', async () => { + const { mx, calls } = recordingClient(); + await joinEstateRoomIdOrAlias(mx, '#room:gamecult.org'); + expect(calls).toEqual(['joinRoom']); + }); +}); + +describe('joinEstateRoomOrThrow, the lobby, tombstone and predecessor buttons', () => { + it('files a direct invite and answers the joined room id', async () => { + const c = dmClient({ invites: { '!dm1:test': '@friend:test' } }); + await expect(joinEstateRoomOrThrow(c.mx, '!dm1:test', ['test'])).resolves.toBe('!dm1:test'); + expect(c.joined).toEqual([JSON.stringify({ '@friend:test': ['!dm1:test'] })]); + }); + + it('throws the refusal and unfiles the room', async () => { + const c = dmClient({ refuse: true, invites: { '!dm1:test': '@friend:test' } }); + await expect(joinEstateRoomOrThrow(c.mx, '!dm1:test')).rejects.toThrow('M_FORBIDDEN'); + expect(c.current()).toEqual({ '@friend:test': [] }); + }); +}); + +describe('runJoinCommand, /join', () => { + it('reports each refusal and joins the others', async () => { + const c = dmClient({ refuse: true, invites: { '!dm1:test': '@friend:test' } }); + const reported: string[] = []; + await runJoinCommand(c.mx, '!dm1:test notanaddress', (m) => reported.push(m)); + expect(reported).toEqual(['M_FORBIDDEN']); + expect(c.joined).toHaveLength(1); + }); + + it('reports nothing when the join is accepted', async () => { + const c = dmClient({ invites: { '!dm1:test': '@friend:test' } }); + const reported: string[] = []; + await runJoinCommand(c.mx, '!dm1:test', (m) => reported.push(m)); + expect(reported).toEqual([]); + expect(c.joined).toHaveLength(1); + }); +}); + describe('awaitMyJoin', () => { /** A store that gains the room when the test says so, emitting like the SDK. */ const store = () => { @@ -157,8 +303,12 @@ describe('awaitMyJoin', () => { return { mx: { getRoom: () => (membership ? { getMyMembership: () => membership! } : null), - on: (_e: string, h: (room: { roomId: string }, m: string) => void) => handlers.add(h), - off: (_e: string, h: (room: { roomId: string }, m: string) => void) => handlers.delete(h), + on: (e: string, h: (room: { roomId: string }, m: string) => void) => { + if (e === 'Room.myMembership') handlers.add(h); + }, + off: (e: string, h: (room: { roomId: string }, m: string) => void) => { + if (e === 'Room.myMembership') handlers.delete(h); + }, }, handlers, become: (roomId: string, m: string) => { diff --git a/src/app/features/estate/joinEstateRoom.ts b/src/app/features/estate/joinEstateRoom.ts index a3be428b..4e1629d0 100644 --- a/src/app/features/estate/joinEstateRoom.ts +++ b/src/app/features/estate/joinEstateRoom.ts @@ -1,5 +1,11 @@ import { EstateRoom } from './buildEstate'; -import { addRoomIdToMDirect, removeRoomIdFromMDirect } from '../../utils/matrix'; +import { + addRoomIdToMDirect, + isRoomAlias, + isRoomId, + removeRoomIdFromMDirect, +} from '../../utils/matrix'; +import { splitWithSpace } from '../../utils/common'; import { isDirectInvite } from '../../utils/room'; export type EstateActivation = @@ -8,7 +14,7 @@ export type EstateActivation = | { kind: 'refused'; message: string }; const LOST_JOIN_RESPONSE = - 'The connection dropped before the server answered. The join may have gone through; tap again to retry.'; + 'The server did not answer the join. It may have gone through; tap again to retry.'; type JoinClient = Parameters[0]; @@ -21,21 +27,31 @@ type JoinClient = Parameters[0]; * An invite marked is_direct carries the mark in the invite event the client * already holds, and the join event does not repeat it. So the room is listed * in m.direct under the inviter before the join is sent, and taken out again if - * the join is refused by a server answer. A join that fails without one (lost - * response, dropped connection) may still have been accepted, so the entry - * stays and the tap is retryable. Nothing needs to recognise the DM after it - * arrives. The inbox Accept goes through here too: one owner for joining. + * the join is refused by a Matrix error answer (a 4xx carrying an errcode). A + * join that fails any other way (lost response, dropped connection, a gateway's + * 5xx or a status with no errcode) may still have been accepted upstream, so the + * entry stays and the tap is retryable. Nothing needs to recognise the DM after it + * arrives. Every client join goes through here: the estate tap, the inbox Accept, + * the room card, /join, the lobby and space Join buttons, the tombstone and + * predecessor links. One owner for joining. */ export const activateEstateRoom = async ( mx: JoinClient, - room: Pick + room: Pick & { via?: string[] } ): Promise => { if (room.state === 'joined') return { kind: 'open', roomId: room.roomId }; const refusal = (e: unknown): EstateActivation => { const err = e as { data?: { error?: string }; message?: string }; return { kind: 'refused', message: err.data?.error ?? err.message ?? 'Could not join' }; }; - const answered = (e: unknown) => typeof (e as { httpStatus?: unknown }).httpStatus === 'number'; + const refusedByServer = (e: unknown) => { + const err = e as { httpStatus?: unknown; errcode?: unknown; data?: { errcode?: unknown } }; + const status = err.httpStatus; + const errcode = err.errcode ?? err.data?.errcode; + return ( + typeof status === 'number' && status >= 400 && status < 500 && typeof errcode === 'string' + ); + }; const invite = room.state === 'invited' ? mx.getRoom(room.roomId) : null; const inviter = isDirectInvite(invite, mx.getSafeUserId()) ? invite?.getMember(mx.getSafeUserId())?.events?.member?.getSender() @@ -49,12 +65,57 @@ export const activateEstateRoom = async ( const joined = await mx.joinRoom(room.roomId, { viaServers: room.via }); return { kind: 'joined', roomId: joined.roomId }; } catch (e) { - if (!answered(e)) return { kind: 'refused', message: LOST_JOIN_RESPONSE }; + if (!refusedByServer(e)) return { kind: 'refused', message: LOST_JOIN_RESPONSE }; if (inviter) await removeRoomIdFromMDirect(mx, room.roomId).catch(() => undefined); return refusal(e); } }; +/** + * activateEstateRoom for a caller that holds only an id or alias (room card, + * /join): a room the client has an invite for is an invited room. + */ +export const joinEstateRoomIdOrAlias = ( + mx: JoinClient, + roomIdOrAlias: string, + via?: string[] +): Promise => + activateEstateRoom(mx, { + roomId: roomIdOrAlias, + state: mx.getRoom(roomIdOrAlias)?.getMyMembership() === 'invite' ? 'invited' : 'joinable', + via, + }); + +/** + * joinEstateRoomIdOrAlias for a caller that reports failure by throwing (a + * useAsyncCallback button): the joined room id, or an Error carrying the refusal. + */ +export const joinEstateRoomOrThrow = async ( + mx: JoinClient, + roomIdOrAlias: string, + via?: string[] +): Promise => { + const result = await joinEstateRoomIdOrAlias(mx, roomIdOrAlias, via); + if (result.kind === 'refused') throw new Error(result.message); + return result.roomId; +}; + +/** + * The /join command: every room id or alias in the payload is joined, and each + * refusal is handed to report, never dropped. + */ +export const runJoinCommand = async ( + mx: JoinClient, + payload: string, + report: (message: string) => void +): Promise => { + const addresses = splitWithSpace(payload).filter((a) => isRoomId(a) || isRoomAlias(a)); + const results = await Promise.all(addresses.map((a) => joinEstateRoomIdOrAlias(mx, a))); + results.forEach((r) => { + if (r.kind === 'refused') report(r.message); + }); +}; + type MembershipSource = { getRoom(roomId: string): { getMyMembership(): string } | null; on(event: 'Room.myMembership', handler: (room: { roomId: string }, m: string) => void): unknown; diff --git a/src/app/features/lobby/RoomItem.tsx b/src/app/features/lobby/RoomItem.tsx index 7de59acd..132aaf8c 100644 --- a/src/app/features/lobby/RoomItem.tsx +++ b/src/app/features/lobby/RoomItem.tsx @@ -19,7 +19,7 @@ import { toRem, } from 'folds'; import FocusTrap from 'focus-trap-react'; -import { JoinRule, MatrixError, Room } from 'matrix-js-sdk'; +import { JoinRule, Room } from 'matrix-js-sdk'; import { IHierarchyRoom } from 'matrix-js-sdk/lib/@types/spaces'; import { RoomAvatar, RoomIcon } from '../../components/room-avatar'; import { SequenceCard } from '../../components/sequence-card'; @@ -38,6 +38,7 @@ import { getDirectRoomAvatarUrl, getRoomAvatarUrl } from '../../utils/room'; import { ItemDraggableTarget, useDraggableItem } from './DnD'; import { mxcUrlToHttp } from '../../utils/matrix'; import { useMediaAuthentication } from '../../hooks/useMediaAuthentication'; +import { joinEstateRoomOrThrow } from '../estate/joinEstateRoom'; type RoomJoinButtonProps = { roomId: string; @@ -46,8 +47,8 @@ type RoomJoinButtonProps = { function RoomJoinButton({ roomId, via }: RoomJoinButtonProps) { const mx = useMatrixClient(); - const [joinState, join] = useAsyncCallback( - useCallback(() => mx.joinRoom(roomId, { viaServers: via }), [mx, roomId, via]) + const [joinState, join] = useAsyncCallback( + useCallback(() => joinEstateRoomOrThrow(mx, roomId, via), [mx, roomId, via]) ); const canJoin = joinState.status === AsyncStatus.Idle || joinState.status === AsyncStatus.Error; @@ -60,9 +61,8 @@ function RoomJoinButton({ roomId, via }: RoomJoinButtonProps) { - {joinState.error.data?.error || joinState.error.message} + {joinState.error.message} - {joinState.error.name} } @@ -75,7 +75,7 @@ function RoomJoinButton({ roomId, via }: RoomJoinButtonProps) { size="400" filled tabIndex={0} - aria-label={joinState.error.data?.error || joinState.error.message} + aria-label={joinState.error.message} /> )} diff --git a/src/app/features/lobby/SpaceItem.tsx b/src/app/features/lobby/SpaceItem.tsx index ed3eaff9..e1ffbfe5 100644 --- a/src/app/features/lobby/SpaceItem.tsx +++ b/src/app/features/lobby/SpaceItem.tsx @@ -18,7 +18,7 @@ import { } from 'folds'; import FocusTrap from 'focus-trap-react'; import classNames from 'classnames'; -import { MatrixError, Room } from 'matrix-js-sdk'; +import { Room } from 'matrix-js-sdk'; import { IHierarchyRoom } from 'matrix-js-sdk/lib/@types/spaces'; import { HierarchyItem } from '../../hooks/useSpaceHierarchy'; import { useMatrixClient } from '../../hooks/useMatrixClient'; @@ -38,6 +38,7 @@ import { useOpenCreateSpaceModal } from '../../state/hooks/createSpaceModal'; import { AddExistingModal } from '../add-existing'; import { CreateRoomType } from '../../components/create-room/types'; import { BetaNoticeBadge } from '../../components/BetaNoticeBadge'; +import { joinEstateRoomOrThrow } from '../estate/joinEstateRoom'; function SpaceProfileLoading() { return ( @@ -112,8 +113,8 @@ function UnjoinedSpaceProfile({ }: UnjoinedSpaceProfileProps) { const mx = useMatrixClient(); - const [joinState, join] = useAsyncCallback( - useCallback(() => mx.joinRoom(roomId, { viaServers: via }), [mx, roomId, via]) + const [joinState, join] = useAsyncCallback( + useCallback(() => joinEstateRoomOrThrow(mx, roomId, via), [mx, roomId, via]) ); const canJoin = joinState.status === AsyncStatus.Idle || joinState.status === AsyncStatus.Error; diff --git a/src/app/features/room/RoomTombstone.tsx b/src/app/features/room/RoomTombstone.tsx index 24f0b80e..3556e6fc 100644 --- a/src/app/features/room/RoomTombstone.tsx +++ b/src/app/features/room/RoomTombstone.tsx @@ -8,6 +8,7 @@ import { Membership } from '../../../types/matrix/room'; import { RoomInputPlaceholder } from './RoomInputPlaceholder'; import { useRoomNavigate } from '../../hooks/useRoomNavigate'; import { getViaServers } from '../../plugins/via-servers'; +import { joinEstateRoomOrThrow } from '../estate/joinEstateRoom'; type RoomTombstoneProps = { roomId: string; body?: string; replacementRoomId: string }; export function RoomTombstone({ roomId, body, replacementRoomId }: RoomTombstoneProps) { @@ -18,16 +19,14 @@ export function RoomTombstone({ roomId, body, replacementRoomId }: RoomTombstone useCallback(() => { const currentRoom = mx.getRoom(roomId); const via = currentRoom ? getViaServers(currentRoom) : []; - return mx.joinRoom(replacementRoomId, { - viaServers: via, - }); + return joinEstateRoomOrThrow(mx, replacementRoomId, via); }, [mx, roomId, replacementRoomId]) ); const replacementRoom = mx.getRoom(replacementRoomId); const handleOpen = () => { if (replacementRoom) navigateRoom(replacementRoom.roomId); - if (joinState.status === AsyncStatus.Success) navigateRoom(joinState.data.roomId); + if (joinState.status === AsyncStatus.Success) navigateRoom(joinState.data); }; return ( diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx index 42d74a6b..2d87e9bd 100644 --- a/src/app/features/room/message/Message.tsx +++ b/src/app/features/room/message/Message.tsx @@ -58,10 +58,7 @@ import { isRoomAlias, mxcUrlToHttp, } from '../../../utils/matrix'; -import { MessageLayout, MessageSpacing, settingsAtom } from '../../../state/settings'; -import { useSetting } from '../../../state/hooks/settings'; -import { PoseAvatar } from '../../../components/message/pose/PoseAvatar'; -import { POSE_KEY, mindOfSender, resolvePose } from '../../../components/message/pose/poses'; +import { MessageLayout, MessageSpacing } from '../../../state/settings'; import { useMatrixClient } from '../../../hooks/useMatrixClient'; import { useRecentEmoji } from '../../../hooks/useRecentEmoji'; import * as css from './styles.css'; @@ -791,12 +788,6 @@ export const Message = as<'div', MessageProps>( ); - const [poseBubbles] = useSetting(settingsAtom, 'poseBubbles'); - const mind = - poseBubbles && messageLayout === MessageLayout.Bubble - ? mindOfSender(getMxIdLocalPart(senderId), senderDisplayName) - : undefined; - const avatarJSX = !collapse && messageLayout !== MessageLayout.Compact && ( ( ); - const poseJSX = !collapse && mind && ( - - ); - const msgContentJSX = ( {reply} @@ -1153,10 +1135,7 @@ export const Message = as<'div', MessageProps>( )} {messageLayout === MessageLayout.Bubble && ( - + {msgContentJSX} )} diff --git a/src/app/features/settings/general/General.tsx b/src/app/features/settings/general/General.tsx index 5b51cd8c..b861a060 100644 --- a/src/app/features/settings/general/General.tsx +++ b/src/app/features/settings/general/General.tsx @@ -884,7 +884,6 @@ function Messages() { settingsAtom, 'legacyUsernameColor' ); - const [poseBubbles, setPoseBubbles] = useSetting(settingsAtom, 'poseBubbles'); const [hideMembershipEvents, setHideMembershipEvents] = useSetting( settingsAtom, 'hideMembershipEvents' @@ -919,13 +918,6 @@ function Messages() { } /> - - } - /> - { [Command.Join]: { name: Command.Join, description: 'Join room with address. Example: /join address1 address2', - exe: async (payload) => { - const rawIds = splitWithSpace(payload); - const roomIdOrAliases = rawIds.filter( - (idOrAlias) => isRoomId(idOrAlias) || isRoomAlias(idOrAlias) - ); - roomIdOrAliases.forEach(async (idOrAlias) => { - await mx.joinRoom(idOrAlias); - }); - }, + exe: (payload) => runJoinCommand(mx, payload, (message) => window.alert(message)), }, [Command.Leave]: { name: Command.Leave, diff --git a/src/app/state/settings.ts b/src/app/state/settings.ts index 1110642b..6a894350 100644 --- a/src/app/state/settings.ts +++ b/src/app/state/settings.ts @@ -39,7 +39,6 @@ export interface Settings { encUrlPreview: boolean; showHiddenEvents: boolean; legacyUsernameColor: boolean; - poseBubbles: boolean; showNotifications: boolean; isNotificationSounds: boolean; @@ -74,7 +73,6 @@ const defaultSettings: Settings = { encUrlPreview: false, showHiddenEvents: false, legacyUsernameColor: false, - poseBubbles: false, showNotifications: true, isNotificationSounds: true, diff --git a/vite.config.js b/vite.config.js index 891c8216..a5af94d8 100644 --- a/vite.config.js +++ b/vite.config.js @@ -42,10 +42,6 @@ const copyFiles = { src: 'public/locales', dest: 'public/', }, - { - src: 'public/poses', - dest: 'public/', - }, ], };