Merge branch 'dev' into center-preview-images

cinnyapp · Dec 29, 2023 · 798265e · 798265e
2 parents a9495fa + bb88eb7
commit 798265e
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 24 deletions.
diff --git a/config.json b/config.json
@@ -1,7 +1,6 @@
 {
-  "defaultHomeserver": 3,
+  "defaultHomeserver": 2,
   "homeserverList": [
-    "0wnz.at",
     "converser.eu",
     "envs.net",
     "matrix.org",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
     "linkify-html": "4.0.2",
     "linkify-react": "4.1.1",
     "linkifyjs": "4.0.2",
-    "matrix-js-sdk": "24.1.0",
+    "matrix-js-sdk": "29.1.0",
     "millify": "6.1.0",
     "pdfjs-dist": "3.10.111",
     "prismjs": "1.29.0",

diff --git a/src/app/components/image-viewer/ImageViewer.css.ts b/src/app/components/image-viewer/ImageViewer.css.ts
@@ -32,8 +32,10 @@ export const ImageViewerImg = style([
   DefaultReset,
   {
     objectFit: 'contain',
-    width: '100%',
-    height: '100%',
+    width: 'auto',
+    height: 'auto',
+    maxWidth: '100%',
+    maxHeight: '100%',
     backgroundColor: color.Surface.Container,
     transition: 'transform 100ms linear',
   },

diff --git a/src/app/organisms/join-alias/JoinAlias.jsx b/src/app/organisms/join-alias/JoinAlias.jsx
@@ -62,7 +62,7 @@ function JoinAliasContent({ term, requestClose }) {
     let via;
     if (alias.startsWith('#')) {
       try {
-        const aliasData = await mx.resolveRoomAlias(alias);
+        const aliasData = await mx.getRoomIdForAlias(alias);
         via = aliasData?.servers.slice(0, 3) || [];
         if (mountStore.getItem()) {
           setProcess(`Joining ${alias}...`);

diff --git a/src/util/matrixUtil.js b/src/util/matrixUtil.js
@@ -41,7 +41,7 @@ export function getUsernameOfRoomMember(roomMember) {
 
 export async function isRoomAliasAvailable(alias) {
   try {
-    const result = await initMatrix.matrixClient.resolveRoomAlias(alias);
+    const result = await initMatrix.matrixClient.getRoomIdForAlias(alias);
     if (result.room_id) return false;
     return false;
   } catch (e) {