Copy Olm directly from node modules (fixes #206 )

Manage ignored users (#814 )
* Add options to display/ignore usersId's * Update string * Hide search icon in encrypted rooms (#763) * Fix styles
2022-09-05 10:55:49 +05:30 · 2022-09-05 08:30:45 +05:30 · 2022-09-04 19:51:58 +05:30
14 changed files with 2714 additions and 2334 deletions
@@ -1 +1,3 @@
-legacy-peer-deps=true
+legacy-peer-deps=true
+save-exact=true
+@matrix-org:registry=https://gitlab.matrix.org/api/v4/projects/27/packages/npm/
@@ -15,69 +15,69 @@
  "author": "Ajay Bura",
  "license": "MIT",
  "dependencies": {
-    "@fontsource/inter": "^4.5.12",
-    "@fontsource/roboto": "^4.5.8",
-    "@khanacademy/simple-markdown": "^0.8.3",
-    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz",
-    "@tippyjs/react": "^4.2.6",
-    "babel-polyfill": "^6.26.0",
-    "blurhash": "^1.1.5",
-    "browser-encrypt-attachment": "^0.3.0",
-    "dateformat": "^5.0.3",
-    "emojibase-data": "^7.0.1",
-    "file-saver": "^2.0.5",
-    "flux": "^4.0.3",
-    "formik": "^2.2.9",
-    "html-react-parser": "^3.0.4",
-    "katex": "^0.16.2",
-    "linkify-html": "^4.0.0-beta.5",
-    "linkifyjs": "^4.0.0-beta.5",
-    "matrix-js-sdk": "^19.4.0",
-    "prop-types": "^15.8.1",
-    "react": "^17.0.2",
-    "react-autosize-textarea": "^7.1.0",
-    "react-blurhash": "^0.1.3",
-    "react-dnd": "^15.1.2",
-    "react-dnd-html5-backend": "^15.1.3",
-    "react-dom": "^17.0.2",
-    "react-google-recaptcha": "^2.1.0",
-    "react-modal": "^3.15.1",
-    "sanitize-html": "^2.7.1",
-    "tippy.js": "^6.3.7",
-    "twemoji": "^14.0.2"
+    "@fontsource/inter": "4.5.12",
+    "@fontsource/roboto": "4.5.8",
+    "@khanacademy/simple-markdown": "0.8.3",
+    "@matrix-org/olm": "3.2.12",
+    "@tippyjs/react": "4.2.6",
+    "babel-polyfill": "6.26.0",
+    "blurhash": "1.1.5",
+    "browser-encrypt-attachment": "0.3.0",
+    "dateformat": "5.0.3",
+    "emojibase-data": "7.0.1",
+    "file-saver": "2.0.5",
+    "flux": "4.0.3",
+    "formik": "2.2.9",
+    "html-react-parser": "3.0.4",
+    "katex": "0.16.2",
+    "linkify-html": "4.0.0-beta.5",
+    "linkifyjs": "4.0.0-beta.5",
+    "matrix-js-sdk": "19.4.0",
+    "prop-types": "15.8.1",
+    "react": "17.0.2",
+    "react-autosize-textarea": "7.1.0",
+    "react-blurhash": "0.1.3",
+    "react-dnd": "15.1.2",
+    "react-dnd-html5-backend": "15.1.3",
+    "react-dom": "17.0.2",
+    "react-google-recaptcha": "2.1.0",
+    "react-modal": "3.15.1",
+    "sanitize-html": "2.7.1",
+    "tippy.js": "6.3.7",
+    "twemoji": "14.0.2"
  },
  "devDependencies": {
-    "@babel/core": "^7.18.13",
-    "@babel/preset-env": "^7.18.10",
-    "@babel/preset-react": "^7.18.6",
-    "assert": "^2.0.0",
-    "babel-loader": "^8.2.5",
-    "browserify-fs": "^1.0.0",
-    "buffer": "^6.0.3",
-    "clean-webpack-plugin": "^4.0.0",
-    "copy-webpack-plugin": "^11.0.0",
-    "crypto-browserify": "^3.12.0",
-    "css-loader": "^6.7.1",
-    "css-minimizer-webpack-plugin": "^4.0.0",
-    "eslint": "^8.23.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "^6.6.1",
-    "eslint-plugin-react": "^7.31.1",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "html-loader": "^4.1.0",
-    "html-webpack-plugin": "^5.3.1",
-    "mini-css-extract-plugin": "^2.6.1",
-    "path-browserify": "^1.0.1",
-    "sass": "^1.54.5",
-    "sass-loader": "^13.0.2",
-    "stream-browserify": "^3.0.0",
-    "style-loader": "^3.3.1",
-    "url": "^0.11.0",
-    "util": "^0.12.4",
-    "webpack": "^5.74.0",
-    "webpack-cli": "^4.10.0",
-    "webpack-dev-server": "^4.10.1",
-    "webpack-merge": "^5.7.3"
+    "@babel/core": "7.18.13",
+    "@babel/preset-env": "7.18.10",
+    "@babel/preset-react": "7.18.6",
+    "assert": "2.0.0",
+    "babel-loader": "8.2.5",
+    "browserify-fs": "1.0.0",
+    "buffer": "6.0.3",
+    "clean-webpack-plugin": "4.0.0",
+    "copy-webpack-plugin": "11.0.0",
+    "crypto-browserify": "3.12.0",
+    "css-loader": "6.7.1",
+    "css-minimizer-webpack-plugin": "4.0.0",
+    "eslint": "8.23.0",
+    "eslint-config-airbnb": "19.0.4",
+    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-jsx-a11y": "6.6.1",
+    "eslint-plugin-react": "7.31.1",
+    "eslint-plugin-react-hooks": "4.6.0",
+    "html-loader": "4.1.0",
+    "html-webpack-plugin": "5.3.1",
+    "mini-css-extract-plugin": "2.6.1",
+    "path-browserify": "1.0.1",
+    "sass": "1.54.5",
+    "sass-loader": "13.0.2",
+    "stream-browserify": "3.0.0",
+    "style-loader": "3.3.1",
+    "url": "0.11.0",
+    "util": "0.12.4",
+    "webpack": "5.74.0",
+    "webpack-cli": "4.10.0",
+    "webpack-dev-server": "4.10.1",
+    "webpack-merge": "5.7.3"
  }
 }
@@ -5,12 +5,12 @@ import initMatrix from '../../client/initMatrix';

 export function useAccountData(eventType) {
  const mx = initMatrix.matrixClient;
-  const [event, setEvent] = useState(mx.getAccountData(eventType)?.getContent());
+  const [event, setEvent] = useState(mx.getAccountData(eventType));

  useEffect(() => {
    const handleChange = (mEvent) => {
      if (mEvent.getType() !== eventType) return;
-      setEvent(mEvent.getContent());
+      setEvent(mEvent);
    };
    mx.on('accountData', handleChange);
    return () => {
@@ -53,7 +53,7 @@ export function getTypeActions(type, highlightValue = false) {

 function useGlobalNotif() {
  const mx = initMatrix.matrixClient;
-  const pushRules = useAccountData('m.push_rules');
+  const pushRules = useAccountData('m.push_rules')?.getContent();
  const underride = pushRules?.global?.underride ?? [];
  const rulesToType = {
    [DM]: notifType.ON,
@@ -0,0 +1,64 @@
+import React from 'react';
+import './IgnoreUserList.scss';
+
+import initMatrix from '../../../client/initMatrix';
+import * as roomActions from '../../../client/action/room';
+
+import Text from '../../atoms/text/Text';
+import Chip from '../../atoms/chip/Chip';
+import Input from '../../atoms/input/Input';
+import Button from '../../atoms/button/Button';
+import { MenuHeader } from '../../atoms/context-menu/ContextMenu';
+import SettingTile from '../setting-tile/SettingTile';
+
+import CrossIC from '../../../../public/res/ic/outlined/cross.svg';
+
+import { useAccountData } from '../../hooks/useAccountData';
+
+function IgnoreUserList() {
+  useAccountData('m.ignored_user_list');
+  const ignoredUsers = initMatrix.matrixClient.getIgnoredUsers();
+
+  const handleSubmit = (evt) => {
+    evt.preventDefault();
+    const { ignoreInput } = evt.target.elements;
+    const value = ignoreInput.value.trim();
+    const userIds = value.split(' ').filter((v) => v.match(/^@\S+:\S+$/));
+    if (userIds.length === 0) return;
+    ignoreInput.value = '';
+    roomActions.ignore(userIds);
+  };
+
+  return (
+    <div className="ignore-user-list">
+      <MenuHeader>Ignored users</MenuHeader>
+      <SettingTile
+        title="Ignore user"
+        content={(
+          <div className="ignore-user-list__users">
+            <Text variant="b3">Ignore userId if you do not want to receive their messages or invites.</Text>
+            <form onSubmit={handleSubmit}>
+              <Input name="ignoreInput" required />
+              <Button variant="primary" type="submit">Ignore</Button>
+            </form>
+            {ignoredUsers.length > 0 && (
+              <div>
+                {ignoredUsers.map((uId) => (
+                  <Chip
+                    iconSrc={CrossIC}
+                    key={uId}
+                    text={uId}
+                    iconColor={CrossIC}
+                    onClick={() => roomActions.unignore([uId])}
+                  />
+                ))}
+              </div>
+            )}
+          </div>
+        )}
+      />
+    </div>
+  );
+}
+
+export default IgnoreUserList;
@@ -0,0 +1,17 @@
+.ignore-user-list {
+  &__users {
+    & form,
+    & > div:last-child {
+      display: flex;
+      flex-wrap: wrap;
+      gap: var(--sp-tight);
+    }
+
+    & form {
+      margin: var(--sp-extra-tight) 0 var(--sp-normal);
+      .input-container {
+        flex-grow: 1;
+      }
+    }
+  }
+}
@@ -29,7 +29,7 @@ const KEYWORD = 'keyword';

 function useKeywordNotif() {
  const mx = initMatrix.matrixClient;
-  const pushRules = useAccountData('m.push_rules');
+  const pushRules = useAccountData('m.push_rules')?.getContent();
  const override = pushRules?.global?.override ?? [];
  const content = pushRules?.global?.content ?? [];

@@ -3,11 +3,12 @@
    & form,
    & > div:last-child {
      display: flex;
+      flex-wrap: wrap;
      gap: var(--sp-tight);
    }

    & form {
-      margin: var(--sp-ultra-tight) 0 var(--sp-normal);
+      margin: var(--sp-extra-tight) 0 var(--sp-normal);
      .input-container {
        flex-grow: 1;
      }
@@ -33,9 +33,10 @@ function RoomViewHeader({ roomId }) {
  const [, forceUpdate] = useForceUpdate();
  const mx = initMatrix.matrixClient;
  const isDM = initMatrix.roomList.directs.has(roomId);
-  let avatarSrc = mx.getRoom(roomId).getAvatarUrl(mx.baseUrl, 36, 36, 'crop');
-  avatarSrc = isDM ? mx.getRoom(roomId).getAvatarFallbackMember()?.getAvatarUrl(mx.baseUrl, 36, 36, 'crop') : avatarSrc;
-  const roomName = mx.getRoom(roomId).name;
+  const room = mx.getRoom(roomId);
+  let avatarSrc = room.getAvatarUrl(mx.baseUrl, 36, 36, 'crop');
+  avatarSrc = isDM ? room.getAvatarFallbackMember()?.getAvatarUrl(mx.baseUrl, 36, 36, 'crop') : avatarSrc;
+  const roomName = room.name;

  const roomHeaderBtnRef = useRef(null);
  useEffect(() => {
@@ -93,7 +94,7 @@ function RoomViewHeader({ roomId }) {
        </TitleWrapper>
        <RawIcon src={ChevronBottomIC} />
      </button>
-      <IconButton onClick={() => toggleRoomSettings(tabText.SEARCH)} tooltip="Search" src={SearchIC} />
+      {mx.isRoomEncrypted(roomId) === false && <IconButton onClick={() => toggleRoomSettings(tabText.SEARCH)} tooltip="Search" src={SearchIC} />}
      <IconButton className="room-header__drawer-btn" onClick={togglePeopleDrawer} tooltip="People" src={UserIC} />
      <IconButton className="room-header__members-btn" onClick={() => toggleRoomSettings(tabText.MEMBERS)} tooltip="Members" src={UserIC} />
      <IconButton
@@ -27,6 +27,7 @@ import ExportE2ERoomKeys from '../../molecules/import-export-e2e-room-keys/Expor
 import { ImagePackUser, ImagePackGlobal } from '../../molecules/image-pack/ImagePack';
 import GlobalNotification from '../../molecules/global-notification/GlobalNotification';
 import KeywordNotification from '../../molecules/global-notification/KeywordNotification';
+import IgnoreUserList from '../../molecules/global-notification/IgnoreUserList';

 import ProfileEditor from '../profile-editor/ProfileEditor';
 import CrossSigning from './CrossSigning';
@@ -173,6 +174,7 @@ function NotificationsSection() {
      </div>
      <GlobalNotification />
      <KeywordNotification />
+      <IgnoreUserList />
    </>
  );
 }
@@ -40,6 +40,7 @@
 .settings-notifications,
 .global-notification,
 .keyword-notification,
+.ignore-user-list,
 .settings-security__card,
 .settings-security .device-manage,
 .settings-about__card,
@@ -53,7 +53,7 @@ module.exports = {
    new HtmlWebpackPlugin({ template: './public/index.html' }),
    new CopyPlugin({
      patterns: [
-        { from: 'olm.wasm' },
+        { from: 'node_modules/@matrix-org/olm/olm.wasm' },
        { from: '_redirects' },
        { from: 'config.json' },
        { from: 'public/res/android'}
Author	SHA1	Message	Date
Krishan	157718093b	Copy Olm directly from node modules (fixes #206 )	2022-09-05 10:55:49 +05:30
Ajay Bura	8583ab19f0	Manage ignored users (#814 ) * Add options to display/ignore usersId's * Update string * Hide search icon in encrypted rooms (#763) * Fix styles	2022-09-05 08:30:45 +05:30
Krishan	1aa16a43ee	Pin all deps for greatest reliability/predictability (#812 )	2022-09-04 19:51:58 +05:30