fix merge errors
This commit is contained in:
parent
0684691993
commit
36205cc496
4 changed files with 19 additions and 15 deletions
|
|
@ -199,7 +199,6 @@ export class NoteCreateService implements OnApplicationShutdown {
|
|||
@Inject(DI.channelFollowingsRepository)
|
||||
private channelFollowingsRepository: ChannelFollowingsRepository,
|
||||
|
||||
private userEntityService: UserEntityService,
|
||||
private noteEntityService: NoteEntityService,
|
||||
private idService: IdService,
|
||||
private globalEventService: GlobalEventService,
|
||||
|
|
@ -676,7 +675,7 @@ export class NoteCreateService implements OnApplicationShutdown {
|
|||
}
|
||||
|
||||
if (!silent) {
|
||||
if (this.isLocalUser(user)) this.activeUsersChart.write(user);
|
||||
if (isLocalUser(user)) this.activeUsersChart.write(user);
|
||||
|
||||
// Pack the note
|
||||
const noteObj = await this.noteEntityService.pack(note, null, { skipHide: true, withReactionAndUserPairCache: true });
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue