diff --git a/.changeset/avatars.md b/.changeset/avatars.md new file mode 100644 index 000000000..954693d0d --- /dev/null +++ b/.changeset/avatars.md @@ -0,0 +1,5 @@ +--- +sable: minor +--- + +Add avatars to calls by forking element call, among other things. diff --git a/.gitignore b/.gitignore index 1c1104414..5cc8aa47a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ devAssets *.tfbackend !*.tfbackend.example crash.log +build.sh diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..21b4a2cc4 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "element-call"] + path = element-call + url = https://github.com/melogale/element-call.git diff --git a/.prettierignore b/.prettierignore index dd3a20e64..cc2e80225 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,6 @@ dist node_modules +element-call package.json package-lock.json LICENSE diff --git a/element-call b/element-call new file mode 160000 index 000000000..ecef381c2 --- /dev/null +++ b/element-call @@ -0,0 +1 @@ +Subproject commit ecef381c246c177af28b8c99c5076da19878a136 diff --git a/eslint.config.js b/eslint.config.js index 9fa0c87bb..fcd06a9b4 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -134,6 +134,7 @@ const projectOverrides = defineConfig([ ]); export default defineConfig([ + { ignores: ['element-call/'] }, includeIgnoreFile(gitignorePath), ...jsConfig, ...reactConfig, diff --git a/package-lock.json b/package-lock.json index 5683a6d19..2a8fa778d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -71,7 +71,7 @@ }, "devDependencies": { "@cloudflare/vite-plugin": "^1.26.0", - "@element-hq/element-call-embedded": "0.16.3", + "@element-hq/element-call-embedded": "file:element-call/embedded/web", "@esbuild-plugins/node-globals-polyfill": "^0.2.3", "@eslint/compat": "2.0.2", "@eslint/js": "9.39.3", @@ -110,6 +110,11 @@ "npm": "11.x" } }, + "element-call/embedded/web": { + "name": "@element-hq/element-call-embedded", + "version": "0.0.0", + "dev": true + }, "node_modules/@apideck/better-ajv-errors": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz", @@ -1912,10 +1917,8 @@ } }, "node_modules/@element-hq/element-call-embedded": { - "version": "0.16.3", - "resolved": "https://registry.npmjs.org/@element-hq/element-call-embedded/-/element-call-embedded-0.16.3.tgz", - "integrity": "sha512-OViKJonDaDNVBUW9WdV9mk78/Ruh34C7XsEgt3O8D9z+64C39elbIgllHSoH5S12IRlv9RYrrV37FZLo6QWsDQ==", - "dev": true + "resolved": "element-call/embedded/web", + "link": true }, "node_modules/@emnapi/core": { "version": "1.8.1", @@ -17884,10 +17887,7 @@ } }, "@element-hq/element-call-embedded": { - "version": "0.16.3", - "resolved": "https://registry.npmjs.org/@element-hq/element-call-embedded/-/element-call-embedded-0.16.3.tgz", - "integrity": "sha512-OViKJonDaDNVBUW9WdV9mk78/Ruh34C7XsEgt3O8D9z+64C39elbIgllHSoH5S12IRlv9RYrrV37FZLo6QWsDQ==", - "dev": true + "version": "file:element-call/embedded/web" }, "@emnapi/core": { "version": "1.8.1", @@ -26905,4 +26905,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 2667d1481..25f4ca223 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ }, "devDependencies": { "@cloudflare/vite-plugin": "^1.26.0", - "@element-hq/element-call-embedded": "0.16.3", + "@element-hq/element-call-embedded": "file:element-call/embedded/web", "@esbuild-plugins/node-globals-polyfill": "^0.2.3", "@eslint/compat": "2.0.2", "@eslint/js": "9.39.3", diff --git a/src/app/plugins/call/utils.ts b/src/app/plugins/call/utils.ts index 0ea72b3c8..8c4955b4e 100644 --- a/src/app/plugins/call/utils.ts +++ b/src/app/plugins/call/utils.ts @@ -18,6 +18,8 @@ export function getCallCapabilities( capabilities.add(MatrixCapabilities.MSC3846TurnServers); capabilities.add(MatrixCapabilities.MSC4157SendDelayedEvent); capabilities.add(MatrixCapabilities.MSC4157UpdateDelayedEvent); + capabilities.add('moe.sable.thumbnails'); + capabilities.add('moe.sable.media_proxy'); capabilities.add(`org.matrix.msc2762.timeline:${roomId}`); capabilities.add(`org.matrix.msc2762.state:${roomId}`); diff --git a/src/sw.ts b/src/sw.ts index 7185fbd30..815c3be71 100644 --- a/src/sw.ts +++ b/src/sw.ts @@ -270,6 +270,20 @@ self.addEventListener('fetch', (event: FetchEvent) => { return; } + // Since widgets like element call have their own client ids, + // we need this logic. We just go through the sessions list and get a session + // with the right base url. Media requests to a homeserver simply are fine with any account + // on the homeserver authenticating it, so this is fine. But it can be technically wrong. + // If you have two tabs for different users on the same homeserver, it might authenticate + // as the wrong one. + // Thus any logic in the future which cares about which user is authenticating the request + // might break this. Also, again, it is technically wrong. + const byBaseUrl = [...sessions.values()].find((s) => validMediaRequest(url, s.baseUrl)); + if (byBaseUrl) { + event.respondWith(fetch(url, { ...fetchConfig(byBaseUrl.accessToken), redirect })); + return; + } + event.respondWith( requestSessionWithTimeout(clientId).then((s) => { if (s && validMediaRequest(url, s.baseUrl)) {