Better invites management (#2336)

* move block users to account settings

* filter invites and add more options

* add better rate limit recovery in rateLimitedActions util function

src/app/utils/matrix.ts

@@ -304,6 +304,14 @@ export const rateLimitedActions = async <T, R = void>(
   maxRetryCount?: number
 ) => {
   let retryCount = 0;
+
+  let actionInterval = 0;
+
+  const sleepForMs = (ms: number) =>
+    new Promise((resolve) => {
+      setTimeout(resolve, ms);
+    });
+
   const performAction = async (dataItem: T) => {
     const [err] = await to<R, MatrixError>(callback(dataItem));
 
@@ -312,10 +320,9 @@ export const rateLimitedActions = async <T, R = void>(
         return;
       }
 
-      const waitMS = err.getRetryAfterMs() ?? 200;
-      await new Promise((resolve) => {
-        setTimeout(resolve, waitMS);
-      });
+      const waitMS = err.getRetryAfterMs() ?? 3000;
+      actionInterval = waitMS + 500;
+      await sleepForMs(waitMS);
       retryCount += 1;
 
       await performAction(dataItem);
@@ -327,5 +334,9 @@ export const rateLimitedActions = async <T, R = void>(
     retryCount = 0;
     // eslint-disable-next-line no-await-in-loop
     await performAction(dataItem);
+    if (actionInterval > 0) {
+      // eslint-disable-next-line no-await-in-loop
+      await sleepForMs(actionInterval);
+    }
   }
 };

src/app/utils/room.ts

@@ -19,6 +19,7 @@ import {
 import { CryptoBackend } from 'matrix-js-sdk/lib/common-crypto/CryptoBackend';
 import { AccountDataEvent } from '../../types/matrix/accountData';
 import {
+  Membership,
   MessageEvent,
   NotificationType,
   RoomToParents,
@@ -171,7 +172,7 @@ export const getNotificationType = (mx: MatrixClient, roomId: string): Notificat
   }
 
   if (!roomPushRule) {
-    const overrideRules = mx.getAccountData('m.push_rules')?.getContent<IPushRules>()
+    const overrideRules = mx.getAccountData(EventType.PushRules)?.getContent<IPushRules>()
       ?.global?.override;
     if (!overrideRules) return NotificationType.Default;
 
@@ -443,3 +444,32 @@ export const getMentionContent = (userIds: string[], room: boolean): IMentions =
 
   return mMentions;
 };
+
+export const getCommonRooms = (
+  mx: MatrixClient,
+  rooms: string[],
+  otherUserId: string
+): string[] => {
+  const commonRooms: string[] = [];
+
+  rooms.forEach((roomId) => {
+    const room = mx.getRoom(roomId);
+    if (!room || room.getMyMembership() !== Membership.Join) return;
+
+    const common = room.hasMembershipState(otherUserId, Membership.Join);
+    if (common) {
+      commonRooms.push(roomId);
+    }
+  });
+
+  return commonRooms;
+};
+
+export const bannedInRooms = (mx: MatrixClient, rooms: string[], otherUserId: string): boolean =>
+  rooms.some((roomId) => {
+    const room = mx.getRoom(roomId);
+    if (!room || room.getMyMembership() !== Membership.Join) return false;
+
+    const banned = room.hasMembershipState(otherUserId, Membership.Ban);
+    return banned;
+  });