Merge branch 'dev' of https://github.com/cinnyapp/cinny into custom

Release v4.2.1 (#1953 )
Fix auth media check for dendrite (#1952 )
2024-09-20 01:32:07 -07:00 · 2024-09-14 23:24:34 +10:00 · 2024-09-14 18:54:06 +05:30
6 changed files with 9 additions and 8 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "cinny",
-  "version": "4.2.0",
+  "version": "4.2.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "cinny",
-      "version": "4.2.0",
+      "version": "4.2.1",
      "license": "AGPL-3.0-only",
      "dependencies": {
        "@atlaskit/pragmatic-drag-and-drop": "1.1.6",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "cinny",
-  "version": "4.2.0",
+  "version": "4.2.1",
  "description": "Yet another matrix client",
  "main": "index.js",
  "type": "module",
--- a/src/app/hooks/useMediaAuthentication.ts
+++ b/src/app/hooks/useMediaAuthentication.ts
@ -1,10 +1,11 @@
 import { useSpecVersions } from './useSpecVersions';

 export const useMediaAuthentication = (): boolean => {
-  const { versions } = useSpecVersions();
+  const { versions, unstable_features: unstableFeatures } = useSpecVersions();

  // Media authentication is introduced in spec version 1.11
-  const authenticatedMedia = versions.includes('v1.11');
+  const authenticatedMedia =
+    unstableFeatures?.['org.matrix.msc3916.stable'] || versions.includes('v1.11');

  return authenticatedMedia;
 };
--- a/src/app/pages/auth/AuthFooter.tsx
+++ b/src/app/pages/auth/AuthFooter.tsx
@ -15,7 +15,7 @@ export function AuthFooter() {
        target="_blank"
        rel="noreferrer"
      >
-        v4.2.0
+        v4.2.1
      </Text>
      <Text as="a" size="T300" href="https://twitter.com/cinnyapp" target="_blank" rel="noreferrer">
        Twitter
--- a/src/app/pages/client/WelcomePage.tsx
+++ b/src/app/pages/client/WelcomePage.tsx
@ -24,7 +24,7 @@ export function WelcomePage() {
                  target="_blank"
                  rel="noreferrer noopener"
                >
-                  v4.2.0
+                  v4.2.1
                </a>
              </span>
            }
--- a/src/client/state/cons.js
+++ b/src/client/state/cons.js
@ -1,5 +1,5 @@
 const cons = {
-  version: '4.2.0',
+  version: '4.2.1',
  secretKey: {
    ACCESS_TOKEN: 'cinny_access_token',
    DEVICE_ID: 'cinny_device_id',
Author	SHA1	Message	Date
tezlm	17f7b9ff8c	Merge branch 'dev' of https://github.com/cinnyapp/cinny into custom	2024-09-20 01:32:07 -07:00
Krishan	21164a9b61	Release v4.2.1 (#1953 )	2024-09-14 23:24:34 +10:00
Krishan	4923b17ad6	Fix auth media check for dendrite (#1952 )	2024-09-14 18:54:06 +05:30