Apply PR suggestion

.github/workflows/build-pull-request.yml

@@ -12,10 +12,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3.0.2
-      - name: Setup node
-        uses: actions/setup-node@v3.3.0
-        with:
-          node-version: 17.9.0
       - name: Build app
         run: npm ci && npm run build
       - name: Upload artifact

.github/workflows/netlify-dev.yml

@@ -14,12 +14,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3.0.2
-      - name: Setup node
-        uses: actions/setup-node@v3.3.0
-        with:
-          node-version: 17.9.0
       - name: Build and deploy to Netlify
-        uses: jsmrcaga/action-netlify-deploy@53de32e559b0b3833615b9788c7a090cd2fddb03
+        uses: jsmrcaga/action-netlify-deploy@fb6a5f936a4b06a8f7793e69fc5a022ffe39807a
         with:
           install_command: "npm ci"
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}

.github/workflows/prod-deploy.yml

@@ -11,10 +11,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3.0.2
-      - name: Setup node
-        uses: actions/setup-node@v3.3.0
-        with:
-          node-version: 17.9.0
       - name: Build
         run: |
           npm ci
@@ -49,12 +45,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3.0.2
-      - name: Setup node
-        uses: actions/setup-node@v3.3.0
-        with:
-          node-version: 17.9.0
       - name: Build and deploy to Netlify
-        uses: jsmrcaga/action-netlify-deploy@53de32e559b0b3833615b9788c7a090cd2fddb03
+        uses: jsmrcaga/action-netlify-deploy@fb6a5f936a4b06a8f7793e69fc5a022ffe39807a
         with:
           install_command: "npm ci"
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
@@ -72,9 +64,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3.0.2
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.0.0
+        uses: docker/setup-qemu-action@v1.2.0
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.0.0
+        uses: docker/setup-buildx-action@v1.6.0
       - name: Login to Docker Hub
         uses: docker/login-action@v2.0.0
         with:

Dockerfile

@@ -10,7 +10,7 @@ RUN npm run build
 
 
 ## App
-FROM nginx:1.23.0-alpine
+FROM nginx:1.21.6-alpine
 
 COPY --from=builder /src/dist /app
 

config.json

@@ -6,7 +6,7 @@
     "halogen.city",
     "kde.org",
     "matrix.org",
-    "mozilla.org"
+    "chat.mozilla.org"
   ],
   "allowCustomHomeservers": true
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cinny",
-  "version": "2.0.4",
+  "version": "2.0.3",
   "description": "Yet another matrix client",
   "main": "index.js",
   "engines": {
@@ -15,7 +15,7 @@
   "author": "Ajay Bura",
   "license": "MIT",
   "dependencies": {
-    "@fontsource/inter": "^4.5.11",
+    "@fontsource/inter": "^4.5.10",
     "@fontsource/roboto": "^4.5.7",
     "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
     "@tippyjs/react": "^4.2.6",
@@ -26,11 +26,10 @@
     "file-saver": "^2.0.5",
     "flux": "^4.0.3",
     "formik": "^2.2.9",
-    "html-react-parser": "^2.0.0",
+    "html-react-parser": "^1.4.12",
     "katex": "^0.15.6",
-    "linkify-html": "^4.0.0-beta.5",
-    "linkifyjs": "^4.0.0-beta.5",
-    "matrix-js-sdk": "^18.1.0",
+    "linkifyjs": "^2.1.9",
+    "matrix-js-sdk": "^17.2.0",
     "micromark": "^3.0.10",
     "micromark-extension-gfm": "^2.0.1",
     "micromark-extension-math": "^2.0.2",
@@ -50,9 +49,9 @@
     "twemoji": "^14.0.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.6",
-    "@babel/preset-env": "^7.18.6",
-    "@babel/preset-react": "^7.18.6",
+    "@babel/core": "^7.18.0",
+    "@babel/preset-env": "^7.18.0",
+    "@babel/preset-react": "^7.17.12",
     "assert": "^2.0.0",
     "babel-loader": "^8.2.5",
     "browserify-fs": "^1.0.0",
@@ -62,27 +61,27 @@
     "crypto-browserify": "^3.12.0",
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^4.0.0",
-    "eslint": "^8.19.0",
+    "eslint": "^8.16.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "^6.6.0",
-    "eslint-plugin-react": "^7.30.1",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-react": "^7.30.0",
+    "eslint-plugin-react-hooks": "^4.5.0",
     "favicons": "^6.2.2",
     "favicons-webpack-plugin": "^5.0.2",
-    "html-loader": "^3.1.2",
+    "html-loader": "^3.1.0",
     "html-webpack-plugin": "^5.3.1",
-    "mini-css-extract-plugin": "^2.6.1",
+    "mini-css-extract-plugin": "^2.6.0",
     "path-browserify": "^1.0.1",
-    "sass": "^1.53.0",
-    "sass-loader": "^13.0.2",
+    "sass": "^1.52.1",
+    "sass-loader": "^13.0.0",
     "stream-browserify": "^3.0.0",
     "style-loader": "^3.3.1",
     "url": "^0.11.0",
     "util": "^0.12.4",
-    "webpack": "^5.73.0",
-    "webpack-cli": "^4.10.0",
-    "webpack-dev-server": "^4.9.3",
+    "webpack": "^5.72.1",
+    "webpack-cli": "^4.9.2",
+    "webpack-dev-server": "^4.9.0",
     "webpack-merge": "^5.7.3"
   }
 }

src/app/molecules/room-aliases/RoomAliases.jsx

@@ -118,7 +118,7 @@ function RoomAliases({ roomId }) {
     const loadLocalAliases = async () => {
       let local = [];
       try {
-        const result = await mx.getLocalAliases(roomId);
+        const result = await mx.unstableGetLocalAliases(roomId);
         local = result.aliases.filter((alias) => !aliases.published.includes(alias));
       } catch {
         local = [];

src/app/molecules/room-notification/RoomNotification.jsx

@@ -20,7 +20,7 @@ const items = [{
   type: cons.notifs.DEFAULT,
 }, {
   iconSrc: BellRingIC,
-  text: 'All messages',
+  text: 'All message',
   type: cons.notifs.ALL_MESSAGES,
 }, {
   iconSrc: BellPingIC,

src/app/organisms/emoji-board/emoji.js

@@ -1,6 +1,5 @@
 import emojisData from 'emojibase-data/en/compact.json';
-import joypixels from 'emojibase-data/en/shortcodes/joypixels.json';
-import emojibase from 'emojibase-data/en/shortcodes/emojibase.json';
+import shortcodes from 'emojibase-data/en/shortcodes/joypixels.json';
 
 const emojiGroups = [{
   name: 'Smileys & people',
@@ -53,7 +52,7 @@ function addToGroup(emoji) {
 
 const emojis = [];
 emojisData.forEach((emoji) => {
-  const myShortCodes = joypixels[emoji.hexcode] || emojibase[emoji.hexcode];
+  const myShortCodes = shortcodes[emoji.hexcode];
   if (!myShortCodes) return;
   const em = {
     ...emoji,

src/app/organisms/emoji-board/recent.js

@@ -4,7 +4,7 @@ import { emojis } from './emoji';
 const eventType = 'io.element.recent_emoji';
 
 function getRecentEmojisRaw() {
-  return initMatrix.matrixClient.getAccountData(eventType)?.getContent().recent_emoji ?? [];
+  return initMatrix.matrixClient.getAccountData(eventType).getContent().recent_emoji ?? [];
 }
 
 export function getRecentEmojis(limit) {

src/app/organisms/settings/DeviceManage.jsx

@@ -155,7 +155,6 @@ function DeviceManage() {
     const lastIP = device.last_seen_ip;
     const lastTS = device.last_seen_ts;
     const isCurrentDevice = mx.deviceId === deviceId;
-    const canVerify = isVerified === false && (isMeVerified || isCurrentDevice);
 
     return (
       <SettingTile
@@ -172,7 +171,7 @@ function DeviceManage() {
             ? <Spinner size="small" />
             : (
               <>
-                {(isCSEnabled && canVerify) && <Button onClick={() => verify(deviceId, isCurrentDevice)} variant="positive">Verify</Button>}
+                {((isMeVerified && isVerified === false) || (isCurrentDevice && isVerified === false)) && <Button onClick={() => verify(deviceId, isCurrentDevice)} variant="positive">Verify</Button>}
                 <IconButton size="small" onClick={() => handleRename(device)} src={PencilIC} tooltip="Rename" />
                 <IconButton size="small" onClick={() => handleRemove(device)} src={BinIC} tooltip="Remove session" />
               </>

src/client/state/cons.js

@@ -1,5 +1,5 @@
 const cons = {
-  version: '2.0.4',
+  version: '2.0.3',
   secretKey: {
     ACCESS_TOKEN: 'cinny_access_token',
     DEVICE_ID: 'cinny_device_id',

src/util/sanitize.js

@@ -44,7 +44,7 @@ function transformSpanTag(tagName, attribs) {
 }
 
 function transformATag(tagName, attribs) {
-  const userLink = decodeURIComponent(attribs.href).match(/^https?:\/\/matrix.to\/#\/(@.+:.+)/);
+  const userLink = attribs.href.match(/^https?:\/\/matrix.to\/#\/(@.+:.+)/);
   if (userLink !== null) {
     // convert user link to pill
     const userId = userLink[1];

src/util/twemojify.jsx

@@ -1,7 +1,7 @@
 /* eslint-disable import/prefer-default-export */
 import React, { lazy, Suspense } from 'react';
 
-import linkifyHtml from 'linkify-html';
+import linkifyHtml from 'linkifyjs/html';
 import parse from 'html-react-parser';
 import twemoji from 'twemoji';
 import { sanitizeText } from './sanitize';