Revert "Merge branch 'pushrules' into levitating"

This didn't work correctly, instead we will wait for cinnyapp#1988

This reverts commit 47e48e2, reversing
changes made to 62f4c2b.

src/app/molecules/global-notification/GlobalNotification.jsx

@@ -53,7 +53,7 @@ export function getTypeActions(type, highlightValue = false) {
 
 function useGlobalNotif() {
   const mx = useMatrixClient();
-  const pushRules = useAccountData('pushrules')?.getContent();
+  const pushRules = useAccountData('m.push_rules')?.getContent();
   const underride = pushRules?.global?.underride ?? [];
   const rulesToType = {
     [DM]: notifType.ON,
@@ -93,7 +93,7 @@ function useGlobalNotif() {
     }
     ruleContent.actions = getTypeActions(type);
 
-    mx.setAccountData('pushrules', content);
+    mx.setAccountData('m.push_rules', content);
   };
 
   const dmRule = underride.find((rule) => rule.rule_id === DM);

src/app/molecules/global-notification/KeywordNotification.jsx

@@ -29,7 +29,7 @@ const KEYWORD = 'keyword';
 
 function useKeywordNotif() {
   const mx = useMatrixClient();
-  const pushRules = useAccountData('pushrules')?.getContent();
+  const pushRules = useAccountData('m.push_rules')?.getContent();
   const override = pushRules?.global?.override ?? [];
   const content = pushRules?.global?.content ?? [];
 
@@ -92,7 +92,7 @@ function useKeywordNotif() {
       });
     }
 
-    mx.setAccountData('pushrules', evtContent);
+    mx.setAccountData('m.push_rules', evtContent);
   };
 
   const addKeyword = (keyword) => {
@@ -104,11 +104,11 @@ function useKeywordNotif() {
       default: false,
       actions: getTypeActions(rulesToType[KEYWORD] ?? notifType.NOISY, true),
     });
-    mx.setAccountData('pushrules', pushRules);
+    mx.setAccountData('m.push_rules', pushRules);
   };
   const removeKeyword = (rule) => {
     pushRules.global.content = content.filter((r) => r.rule_id !== rule.rule_id);
-    mx.setAccountData('pushrules', pushRules);
+    mx.setAccountData('m.push_rules', pushRules);
   };
 
   const dsRule = override.find((rule) => rule.rule_id === DISPLAY_NAME);

src/app/state/room-list/mutedRoomList.ts

@@ -49,7 +49,7 @@ export const useBindMutedRoomsAtom = (mx: MatrixClient, mutedAtom: typeof mutedR
   const setMuted = useSetAtom(mutedAtom);
 
   useEffect(() => {
-    const overrideRules = mx.getAccountData('pushrules')?.getContent<IPushRules>()
+    const overrideRules = mx.getAccountData('m.push_rules')?.getContent<IPushRules>()
       ?.global?.override;
     if (overrideRules) {
       const mutedRooms = overrideRules.reduce<string[]>((rooms, rule) => {

src/app/utils/room.ts

@@ -168,7 +168,7 @@ export const getNotificationType = (mx: MatrixClient, roomId: string): Notificat
   }
 
   if (!roomPushRule) {
-    const overrideRules = mx.getAccountData('pushrules')?.getContent<IPushRules>()
+    const overrideRules = mx.getAccountData('m.push_rules')?.getContent<IPushRules>()
       ?.global?.override;
     if (!overrideRules) return NotificationType.Default;