misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

don't include instance silence in user silence flag

Browse source
This commit is contained in:
Hazelnoot 2025-07-26 22:23:44 -04:00
parent bc16dc78d4
commit 1b4263eba2
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packages/backend/src/core/entities/UserEntityService.ts
View file

@ -543,12 +543,6 @@ export class UserEntityService implements OnModuleInit {
let fetchPoliciesPromise: Promise<RolePolicies> | null = null;
const fetchPolicies = () => fetchPoliciesPromise ??= this.roleService.getUserPolicies(user);
const instancePromise = Promise.resolve(user.host
? opts.instances?.has(user.host)
? opts.instances.get(user.host)
: this.federatedInstanceService.fetch(user.host)
: null);
const bypassSilence = isMe || (meId && myFollowings ? myFollowings.has(meId) : false);
const packed = {
@ -579,13 +573,13 @@ export class UserEntityService implements OnModuleInit {
rejectQuotes: user.rejectQuotes,
attributionDomains: user.attributionDomains,
isSilenced: user.isSilenced,
isSilencedForMe: !bypassSilence && instancePromise.then(i => user.isSilenced || i?.isSilenced),
isSilencedForMe: !bypassSilence && user.isSilenced,
speakAsCat: user.speakAsCat ?? false,
approved: user.approved,
requireSigninToViewContents: user.requireSigninToViewContents === false ? undefined : true,
makeNotesFollowersOnlyBefore: user.makeNotesFollowersOnlyBefore ?? undefined,
makeNotesHiddenBefore: user.makeNotesHiddenBefore ?? undefined,
instance: instancePromise.then(instance => instance ? {
instance: user.host ? Promise.resolve(opts.instances?.has(user.host) ? opts.instances.get(user.host) : this.federatedInstanceService.fetch(user.host)).then(instance => instance ? {
name: instance.name,
softwareName: instance.softwareName,
softwareVersion: instance.softwareVersion,
@ -595,7 +589,7 @@ export class UserEntityService implements OnModuleInit {
isSilenced: instance.isSilenced,
isSilencedForMe: !bypassSilence && instance.isSilenced,
mandatoryCW: instance.mandatoryCW,
} : undefined),
} : undefined) : undefined,
followersCount: followersCount ?? 0,
followingCount: followingCount ?? 0,
notesCount: user.notesCount,