Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge: branch develop

Browse source
This commit is contained in:
Mar0xy 2023-10-18 19:56:42 +02:00
commit cf6e720139
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
97 changed files with 1565 additions and 853 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -366,8 +366,9 @@ export class UserEntityService implements OnModuleInit {
avatarBlurhash: user.avatarBlurhash,
description: mastoapi ? mastoapi.description : profile ? profile.description : '',
createdAt: this.idService.parse(user.id).date.toISOString(),
isBot: user.isBot ?? falsy,
isCat: user.isCat ?? falsy,
isBot: user.isBot,
isCat: user.isCat,
isSilenced: user.isSilenced || this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote),
speakAsCat: user.speakAsCat ?? falsy,
instance: user.host ? this.federatedInstanceService.federatedInstanceCache.fetch(user.host).then(instance => instance ? {
name: instance.name,
@ -404,8 +405,7 @@ export class UserEntityService implements OnModuleInit {
backgroundUrl: user.backgroundUrl,
backgroundBlurhash: user.backgroundBlurhash,
isLocked: user.isLocked,
isSilenced: this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote),
isSuspended: user.isSuspended ?? falsy,
isSuspended: user.isSuspended,
location: profile!.location,
birthday: profile!.birthday,
listenbrainz: profile!.listenbrainz,