graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-23 07:03:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: all users being marked as not approved on cards

Browse source
This commit is contained in:
Mar0xy 2023-10-18 23:50:43 +02:00
parent 6e2eabbbc9
commit e1f13f641e
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -370,6 +370,7 @@ export class UserEntityService implements OnModuleInit {
isCat: user.isCat, isCat: user.isCat,
isSilenced: user.isSilenced || this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote), isSilenced: user.isSilenced || this.roleService.getUserPolicies(user.id).then(r => !r.canPublicNote),
speakAsCat: user.speakAsCat ?? falsy, speakAsCat: user.speakAsCat ?? falsy,
approved: user.approved,
instance: user.host ? this.federatedInstanceService.federatedInstanceCache.fetch(user.host).then(instance => instance ? { instance: user.host ? this.federatedInstanceService.federatedInstanceCache.fetch(user.host).then(instance => instance ? {
name: instance.name, name: instance.name,
softwareName: instance.softwareName, softwareName: instance.softwareName,
@ -489,7 +490,6 @@ export class UserEntityService implements OnModuleInit {
...(opts.includeSecrets ? { ...(opts.includeSecrets ? {
email: profile!.email, email: profile!.email,
emailVerified: profile!.emailVerified, emailVerified: profile!.emailVerified,
approved: user.approved,
signupReason: user.signupReason, signupReason: user.signupReason,
securityKeysList: profile!.twoFactorEnabled securityKeysList: profile!.twoFactorEnabled
? this.userSecurityKeysRepository.find({ ? this.userSecurityKeysRepository.find({

1
packages/misskey-js/src/entities.ts
View file

@ -16,6 +16,7 @@ export type UserLite = {
onlineStatus: 'online' | 'active' | 'offline' | 'unknown'; onlineStatus: 'online' | 'active' | 'offline' | 'unknown';
avatarUrl: string; avatarUrl: string;
avatarBlurhash: string; avatarBlurhash: string;
approved: boolean;
emojis: { emojis: {
name: string; name: string;
url: string; url: string;