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

Merge branch 'develop' into mkjs-n

Browse source
This commit is contained in:
tamaina 2023-05-19 07:16:42 +00:00
commit c0cbbe6072
268 changed files with 4840 additions and 5205 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -466,7 +466,6 @@ export class UserEntityService implements OnModuleInit {
mutedInstances: profile!.mutedInstances,
mutingNotificationTypes: profile!.mutingNotificationTypes,
emailNotificationTypes: profile!.emailNotificationTypes,
showTimelineReplies: user.showTimelineReplies ?? falsy,
achievements: profile!.achievements,
loggedInDays: profile!.loggedInDates.length,
policies: this.roleService.getUserPolicies(user.id),