From 310d8e6140278c9a918031c183b9779b30430b63 Mon Sep 17 00:00:00 2001
From: Amia <9750071+aamiaa@users.noreply.github.com>
Date: Fri, 4 Jul 2025 15:04:12 +0200
Subject: [PATCH 1/2] Fix ImplicitRelationships & RelationshipNotifier (#3539)

---
 src/plugins/implicitRelationships/index.ts | 3 +--
 src/plugins/relationshipNotifier/utils.ts  | 4 ++--
 src/webpack/common/types/stores.d.ts       | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/plugins/implicitRelationships/index.ts b/src/plugins/implicitRelationships/index.ts
index 4a8cf5fb9..d57370a04 100644
--- a/src/plugins/implicitRelationships/index.ts
+++ b/src/plugins/implicitRelationships/index.ts
@@ -125,12 +125,11 @@ export default definePlugin({
         // Implicit relationships are defined as users that you:
         // 1. Have an affinity for
         // 2. Do not have a relationship with
-        await this.refreshUserAffinities();
         const userAffinities: Record<string, any>[] = UserAffinitiesStore.getUserAffinities();
         const relationships = RelationshipStore.getMutableRelationships();
         const nonFriendAffinities = userAffinities.filter(a => !RelationshipStore.getRelationshipType(a.otherUserId));
         nonFriendAffinities.forEach(a => {
-            relationships[a.otherUserId] = 5;
+            relationships.set(a.otherUserId, 5);
         });
         RelationshipStore.emitChange();
 
diff --git a/src/plugins/relationshipNotifier/utils.ts b/src/plugins/relationshipNotifier/utils.ts
index 75cf2d3ae..09ef5cddc 100644
--- a/src/plugins/relationshipNotifier/utils.ts
+++ b/src/plugins/relationshipNotifier/utils.ts
@@ -173,8 +173,8 @@ export async function syncFriends() {
     friends.requests = [];
 
     const relationShips = RelationshipStore.getMutableRelationships();
-    for (const id in relationShips) {
-        switch (relationShips[id]) {
+    for (const [id, type] of relationShips) {
+        switch (type) {
             case RelationshipType.FRIEND:
                 friends.friends.push(id);
                 break;
diff --git a/src/webpack/common/types/stores.d.ts b/src/webpack/common/types/stores.d.ts
index 9a2dd1323..f02359865 100644
--- a/src/webpack/common/types/stores.d.ts
+++ b/src/webpack/common/types/stores.d.ts
@@ -255,5 +255,5 @@ export class RelationshipStore extends FluxStore {
     getSince(userId: string): string;
 
     /** @returns Format: [userId: Enum value from constants.RelationshipTypes] */
-    getMutableRelationships(): Record<number, number>;
+    getMutableRelationships(): Map<string, number>;
 }

From 643122e323fd9b36b456b42ef13e159f5b10015e Mon Sep 17 00:00:00 2001
From: Etorix <92535668+EtorixDev@users.noreply.github.com>
Date: Fri, 4 Jul 2025 07:09:10 -0700
Subject: [PATCH 2/2] Experiments: fix edge case in experiment rollout
 detection (#3497)

Co-authored-by: V <vendicated@riseup.net>
---
 src/plugins/experiments/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx
index 967197ad4..eee732d06 100644
--- a/src/plugins/experiments/index.tsx
+++ b/src/plugins/experiments/index.tsx
@@ -68,8 +68,8 @@ export default definePlugin({
         {
             find: 'type:"user",revision',
             replacement: {
-                match: /!(\i)&&"CONNECTION_OPEN".+?;/g,
-                replace: "$1=!0;"
+                match: /!(\i)(?=&&"CONNECTION_OPEN")/,
+                replace: "!($1=true)"
             }
         },
         {