fix(RelationshipNotifier): Ignore user-actioned friend requests (#1390)
This commit is contained in:
parent
cde8074f44
commit
2db0e71e5b
@ -50,7 +50,7 @@ export async function onRelationshipRemove({ relationship: { type, id } }: Relat
|
||||
() => openUserProfile(user.id)
|
||||
);
|
||||
break;
|
||||
case RelationshipType.FRIEND_REQUEST:
|
||||
case RelationshipType.INCOMING_REQUEST:
|
||||
if (settings.store.friendRequestCancels)
|
||||
notify(
|
||||
`A friend request from ${getUniqueUsername(user)} has been removed.`,
|
||||
|
@ -58,5 +58,7 @@ export const enum ChannelType {
|
||||
|
||||
export const enum RelationshipType {
|
||||
FRIEND = 1,
|
||||
FRIEND_REQUEST = 3,
|
||||
BLOCKED = 2,
|
||||
INCOMING_REQUEST = 3,
|
||||
OUTGOING_REQUEST = 4,
|
||||
}
|
||||
|
@ -80,7 +80,10 @@ export async function syncAndRunChecks() {
|
||||
|
||||
if (settings.store.friendRequestCancels && oldFriends?.requests?.length) {
|
||||
for (const id of oldFriends.requests) {
|
||||
if (friends.requests.includes(id)) continue;
|
||||
if (
|
||||
friends.requests.includes(id) ||
|
||||
[RelationshipType.FRIEND, RelationshipType.BLOCKED, RelationshipType.OUTGOING_REQUEST].includes(RelationshipStore.getRelationshipType(id))
|
||||
) continue;
|
||||
|
||||
const user = await UserUtils.fetchUser(id).catch(() => void 0);
|
||||
if (user)
|
||||
@ -164,7 +167,7 @@ export async function syncFriends() {
|
||||
case RelationshipType.FRIEND:
|
||||
friends.friends.push(id);
|
||||
break;
|
||||
case RelationshipType.FRIEND_REQUEST:
|
||||
case RelationshipType.INCOMING_REQUEST:
|
||||
friends.requests.push(id);
|
||||
break;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user