diff --git a/src/plugins/experiments/index.tsx b/src/plugins/experiments/index.tsx index 724a3ed16..2fc6a5d69 100644 --- a/src/plugins/experiments/index.tsx +++ b/src/plugins/experiments/index.tsx @@ -56,8 +56,8 @@ export default definePlugin({ { find: 'type:"user",revision', replacement: { - match: /!(\i)&&"CONNECTION_OPEN".+?;/g, - replace: "$1=!0;" + match: /!(\i)(?=&&"CONNECTION_OPEN")/, + replace: "!($1=true)" } }, { 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[] = 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 73cb88814..511004006 100644 --- a/src/webpack/common/types/stores.d.ts +++ b/src/webpack/common/types/stores.d.ts @@ -294,5 +294,5 @@ export class RelationshipStore extends FluxStore { getSince(userId: string): string; /** @returns Format: [userId: Enum value from constants.RelationshipTypes] */ - getMutableRelationships(): Record; + getMutableRelationships(): Map; }