mv element.io @types __mocks__/ debian docker module_system/ playwright res src test webapp Dockerfile .dockerignore .eslintignore .stylelintrc.cjs babel.config.cjs recorder-worklet-loader.cjs .modernizr.json components.json config.json config.sample.json package.json project.json tsconfig.json tsconfig.module_system.json jest.config.ts playwright.config.ts webpack.config.ts build_config.sample.yaml apps/web/

mkdir apps/web/scripts
mv scripts/{cleanup.sh,ci_package.sh,copy-res.ts,deploy.py,package.sh} apps/web/scripts

And a couple of gitignore tweaks

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

apps/web/test/unit-tests/notifications/ContentRules-test.ts

@@ -0,0 +1,87 @@
+/*
+Copyright 2024 New Vector Ltd.
+Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2016 OpenMarket Ltd
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { TweakName, PushRuleActionName, type TweakHighlight, type TweakSound } from "matrix-js-sdk/src/matrix";
+
+import { ContentRules, PushRuleVectorState } from "../../../src/notifications";
+
+const NORMAL_RULE = {
+    actions: [PushRuleActionName.Notify, { set_tweak: TweakName.Highlight, value: false } as TweakHighlight],
+    default: false,
+    enabled: true,
+    pattern: "vdh2",
+    rule_id: "vdh2",
+};
+
+const LOUD_RULE = {
+    actions: [
+        PushRuleActionName.Notify,
+        { set_tweak: TweakName.Highlight } as TweakHighlight,
+        { set_tweak: TweakName.Sound, value: "default" } as TweakSound,
+    ],
+    default: false,
+    enabled: true,
+    pattern: "vdh2",
+    rule_id: "vdh2",
+};
+
+const USERNAME_RULE = {
+    actions: [
+        PushRuleActionName.Notify,
+        { set_tweak: TweakName.Sound, value: "default" } as TweakSound,
+        { set_tweak: TweakName.Highlight } as TweakHighlight,
+    ],
+    default: true,
+    enabled: true,
+    pattern: "richvdh",
+    rule_id: ".m.rule.contains_user_name",
+};
+
+describe("ContentRules", function () {
+    describe("parseContentRules", function () {
+        it("should handle there being no keyword rules", function () {
+            const rules = { global: { content: [USERNAME_RULE] } };
+            const parsed = ContentRules.parseContentRules(rules);
+            expect(parsed.rules).toEqual([]);
+            expect(parsed.vectorState).toEqual(PushRuleVectorState.ON);
+            expect(parsed.externalRules).toEqual([]);
+        });
+
+        it("should parse regular keyword notifications", function () {
+            const rules = { global: { content: [NORMAL_RULE, USERNAME_RULE] } };
+
+            const parsed = ContentRules.parseContentRules(rules);
+            expect(parsed.rules.length).toEqual(1);
+            expect(parsed.rules[0]).toEqual(NORMAL_RULE);
+            expect(parsed.vectorState).toEqual(PushRuleVectorState.ON);
+            expect(parsed.externalRules).toEqual([]);
+        });
+
+        it("should parse loud keyword notifications", function () {
+            const rules = { global: { content: [LOUD_RULE, USERNAME_RULE] } };
+
+            const parsed = ContentRules.parseContentRules(rules);
+            expect(parsed.rules.length).toEqual(1);
+            expect(parsed.rules[0]).toEqual(LOUD_RULE);
+            expect(parsed.vectorState).toEqual(PushRuleVectorState.LOUD);
+            expect(parsed.externalRules).toEqual([]);
+        });
+
+        it("should parse mixed keyword notifications", function () {
+            const rules = { global: { content: [LOUD_RULE, NORMAL_RULE, USERNAME_RULE] } };
+
+            const parsed = ContentRules.parseContentRules(rules);
+            expect(parsed.rules.length).toEqual(1);
+            expect(parsed.rules[0]).toEqual(LOUD_RULE);
+            expect(parsed.vectorState).toEqual(PushRuleVectorState.LOUD);
+            expect(parsed.externalRules.length).toEqual(1);
+            expect(parsed.externalRules[0]).toEqual(NORMAL_RULE);
+        });
+    });
+});

apps/web/test/unit-tests/notifications/PushRuleVectorState-test.ts

@@ -0,0 +1,57 @@
+/*
+Copyright 2024 New Vector Ltd.
+Copyright 2022 The Matrix.org Foundation C.I.C.
+Copyright 2016 OpenMarket Ltd
+
+SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
+Please see LICENSE files in the repository root for full details.
+*/
+
+import { PushRuleActionName, type TweakHighlight, TweakName, type TweakSound } from "matrix-js-sdk/src/matrix";
+
+import { PushRuleVectorState } from "../../../src/notifications";
+
+describe("PushRuleVectorState", function () {
+    describe("contentRuleVectorStateKind", function () {
+        it("should understand normal notifications", function () {
+            const rule = {
+                actions: [PushRuleActionName.Notify],
+                default: false,
+                enabled: false,
+                rule_id: "1",
+            };
+
+            expect(PushRuleVectorState.contentRuleVectorStateKind(rule)).toEqual(PushRuleVectorState.ON);
+        });
+
+        it("should handle loud notifications", function () {
+            const rule = {
+                actions: [
+                    PushRuleActionName.Notify,
+                    { set_tweak: TweakName.Highlight, value: true } as TweakHighlight,
+                    { set_tweak: TweakName.Sound, value: "default" } as TweakSound,
+                ],
+                default: false,
+                enabled: false,
+                rule_id: "1",
+            };
+
+            expect(PushRuleVectorState.contentRuleVectorStateKind(rule)).toEqual(PushRuleVectorState.LOUD);
+        });
+
+        it("should understand missing highlight.value", function () {
+            const rule = {
+                actions: [
+                    PushRuleActionName.Notify,
+                    { set_tweak: TweakName.Highlight } as TweakHighlight,
+                    { set_tweak: TweakName.Sound, value: "default" } as TweakSound,
+                ],
+                default: false,
+                enabled: false,
+                rule_id: "1",
+            };
+
+            expect(PushRuleVectorState.contentRuleVectorStateKind(rule)).toEqual(PushRuleVectorState.LOUD);
+        });
+    });
+});