v2.0.3

* feat: Add allowCustomHomeservers config option

* fix: Do not lock the homeserver input when the selection is changed

README.md

@@ -1,5 +1,10 @@
 # Cinny
 
+[![Star](https://img.shields.io/github/stars/ajbura/cinny)](https://github.com/ajbura/cinny/tree/dev)
+[![Chat](https://img.shields.io/badge/chat-on%20matrix-orange)](https://matrix.to/#/#cinny:matrix.org)
+[![Twitter](https://img.shields.io/twitter/url?url=https://twitter.com/@cinnyapp)](https://twitter.com/@cinnyapp)
+[![Support](https://img.shields.io/badge/sponsor-open%20collective-blue.svg)](https://opencollective.com/cinny)
+
 ## Table of Contents
 
 - [About](#about)

config.json

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

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "cinny",
-  "version": "2.0.0",
+  "version": "2.0.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "cinny",
-      "version": "2.0.0",
+      "version": "2.0.3",
       "license": "MIT",
       "dependencies": {
         "@fontsource/inter": "^4.5.10",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cinny",
-  "version": "2.0.0",
+  "version": "2.0.3",
   "description": "Yet another matrix client",
   "main": "index.js",
   "engines": {

src/app/molecules/message/Message.jsx

@@ -123,17 +123,26 @@ const MessageReplyWrapper = React.memo(({ roomTimeline, eventId }) => {
         const eTimeline = await mx.getEventTimeline(timelineSet, eventId);
         await roomTimeline.decryptAllEventsOfTimeline(eTimeline);
 
-        const mEvent = eTimeline.getTimelineSet().findEventById(eventId);
+        let mEvent = eTimeline.getTimelineSet().findEventById(eventId);
+        const editedList = roomTimeline.editedTimeline.get(mEvent.getId());
+        if (editedList) {
+          mEvent = editedList[editedList.length - 1];
+        }
 
         const rawBody = mEvent.getContent().body;
         const username = getUsernameOfRoomMember(mEvent.sender);
 
         if (isMountedRef.current === false) return;
         const fallbackBody = mEvent.isRedacted() ? '*** This message has been deleted ***' : '*** Unable to load reply ***';
+        let parsedBody = parseReply(rawBody)?.body ?? rawBody ?? fallbackBody;
+        if (editedList && parsedBody.startsWith(' * ')) {
+          parsedBody = parsedBody.slice(3);
+        }
+
         setReply({
           to: username,
           color: colorMXID(mEvent.getSender()),
-          body: parseReply(rawBody)?.body ?? rawBody ?? fallbackBody,
+          body: parsedBody,
           event: mEvent,
         });
       } catch {

src/app/molecules/room-visibility/RoomVisibility.jsx

@@ -70,7 +70,7 @@ function RoomVisibility({ roomId }) {
 
   const noSpaceParent = currentState.getStateEvents('m.space.parent').length === 0;
   const mCreate = currentState.getStateEvents('m.room.create')[0]?.getContent();
-  const roomVersion = Number(mCreate.room_version);
+  const roomVersion = Number(mCreate?.room_version ?? 0);
 
   const myPowerlevel = room.getMember(mx.getUserId())?.powerLevel || 0;
   const canChange = room.currentState.hasSufficientPowerLevelFor('state_default', myPowerlevel);

src/app/organisms/join-alias/JoinAlias.jsx

@@ -63,7 +63,7 @@ function JoinAliasContent({ term, requestClose }) {
     if (alias.startsWith('#')) {
       try {
         const aliasData = await mx.resolveRoomAlias(alias);
-        via = aliasData?.servers || [];
+        via = aliasData?.servers.slice(0, 3) || [];
         if (mountStore.getItem()) {
           setProcess(`Joining ${alias}...`);
         }

src/app/templates/auth/Auth.jsx

@@ -93,12 +93,13 @@ function Homeserver({ onChange }) {
       const result = await (await fetch(configFileUrl, { method: 'GET' })).json();
       const selectedHs = result?.defaultHomeserver;
       const hsList = result?.homeserverList;
+      const allowCustom = result?.allowCustomHomeservers ?? true;
       if (!hsList?.length > 0 || selectedHs < 0 || selectedHs >= hsList?.length) {
         throw new Error();
       }
-      setHs({ selected: hsList[selectedHs], list: hsList });
+      setHs({ selected: hsList[selectedHs], list: hsList, allowCustom: allowCustom });
     } catch {
-      setHs({ selected: 'matrix.org', list: ['matrix.org'] });
+      setHs({ selected: 'matrix.org', list: ['matrix.org'], allowCustom: true });
     }
   }, []);
 
@@ -106,14 +107,15 @@ function Homeserver({ onChange }) {
     const { value } = e.target;
     setProcess({ isLoading: false });
     debounce._(async () => {
-      setHs({ selected: value.trim(), list: hs.list });
+      setHs({ ...hs, selected: value.trim() });
     }, 700)();
   };
 
   return (
     <>
       <div className="homeserver-form">
-        <Input name="homeserver" onChange={handleHsInput} value={hs?.selected} forwardRef={hsRef} label="Homeserver" />
+        <Input name="homeserver" onChange={handleHsInput} value={hs?.selected} forwardRef={hsRef} label="Homeserver"
+          disabled={hs === null || !hs.allowCustom} />
         <ContextMenu
           placement="right"
           content={(hideMenu) => (
@@ -126,7 +128,7 @@ function Homeserver({ onChange }) {
                     onClick={() => {
                       hideMenu();
                       hsRef.current.value = hsName;
-                      setHs({ selected: hsName, list: hs.list });
+                      setHs({ ...hs, selected: hsName });
                     }}
                   >
                     {hsName}

src/client/action/room.js

@@ -118,7 +118,6 @@ async function leave(roomId) {
   const isDM = initMatrix.roomList.directs.has(roomId);
   try {
     await mx.leave(roomId);
-    await mx.forget(roomId);
     appDispatcher.dispatch({
       type: cons.actions.room.LEAVE,
       roomId,

src/client/event/hotkeys.js

@@ -2,25 +2,60 @@ import { openSearch, toggleRoomSettings } from '../action/navigation';
 import navigation from '../state/navigation';
 import { markAsRead } from '../action/notifications';
 
+function shouldFocusMessageField(code) {
+  // do not focus on F keys
+  if (/^F\d+$/.test(code)) return false;
+
+  // do not focus on numlock/scroll lock
+  if (
+    code.metaKey
+    || code.startsWith('OS')
+    || code.startsWith('Meta')
+    || code.startsWith('Shift')
+    || code.startsWith('Alt')
+    || code.startsWith('Control')
+    || code.startsWith('Arrow')
+    || code === 'Tab'
+    || code === 'Space'
+    || code === 'Enter'
+    || code === 'NumLock'
+    || code === 'ScrollLock'
+  ) {
+    return false;
+  }
+
+  return true;
+}
+
 function listenKeyboard(event) {
   // Ctrl/Cmd +
   if (event.ctrlKey || event.metaKey) {
-    // k - for search Modal
+    // open search modal
-    if (event.keyCode === 75) {
+    if (event.code === 'KeyK') {
       event.preventDefault();
       if (navigation.isRawModalVisible) return;
       openSearch();
     }
+
+    // focus message field on paste
+    if (event.code === 'KeyV') {
+      if (navigation.isRawModalVisible) return;
+      const msgTextarea = document.getElementById('message-textarea');
+      const { activeElement } = document;
+      if (activeElement !== msgTextarea
+        && ['input', 'textarea'].includes(activeElement.tagName.toLowerCase())
+      ) return;
+      msgTextarea?.focus();
+    }
   }
 
-  if (!event.ctrlKey && !event.altKey) {
+  if (!event.ctrlKey && !event.altKey && !event.metaKey) {
     if (navigation.isRawModalVisible) return;
-    if (['text', 'textarea'].includes(document.activeElement.type)) {
+    if (['input', 'textarea'].includes(document.activeElement.tagName.toLowerCase())) {
       return;
     }
 
-    // esc
+    if (event.code === 'Escape') {
-    if (event.keyCode === 27) {
       if (navigation.isRoomSettings) {
         toggleRoomSettings();
         return;
@@ -31,16 +66,12 @@ function listenKeyboard(event) {
       }
     }
 
-    // Don't allow these keys to type/focus message field
+    // focus the text field on most keypresses
-    if ((event.keyCode !== 8 && event.keyCode < 48)
+    if (shouldFocusMessageField(event.code)) {
-      || (event.keyCode >= 91 && event.keyCode <= 93)
+      // press any key to focus and type in message field
-      || (event.keyCode >= 112 && event.keyCode <= 183)) {
+      const msgTextarea = document.getElementById('message-textarea');
-      return;
+      msgTextarea?.focus();
     }
-
-    // press any key to focus and type in message field
-    const msgTextarea = document.getElementById('message-textarea');
-    msgTextarea?.focus();
   }
 }
 

src/client/state/cons.js

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

src/client/state/navigation.js

@@ -14,7 +14,7 @@ class Navigation extends EventEmitter {
     this.isRoomSettings = false;
     this.recentRooms = [];
 
-    this.isRawModalVisible = false;
+    this.rawModelStack = [];
   }
 
   _setSpacePath(roomId) {
@@ -47,8 +47,13 @@ class Navigation extends EventEmitter {
     }
   }
 
+  get isRawModalVisible() {
+    return this.rawModelStack.length > 0;
+  }
+
   setIsRawModalVisible(visible) {
-    this.isRawModalVisible = visible;
+    if (visible) this.rawModelStack.push(true);
+    else this.rawModelStack.pop();
   }
 
   navigate(action) {