sim1222/nca10.net
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement Talk has read federation (#5636)

Browse Source 
* Talk read

* fix

* 複数のRead ActivityはCollectionとして送るように

* あ
This commit is contained in:
MeiMei
2019-12-15 03:37:19 +09:00
committed by syuilo
parent 648be3005f
commit 3e85aad80a
12 changed files with 108 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/server/api/stream/channels/messaging.ts
View File

@ -1,7 +1,8 @@
import autobind from 'autobind-decorator';
import { readUserMessagingMessage, readGroupMessagingMessage } from '../../common/read-messaging-message';
import { readUserMessagingMessage, readGroupMessagingMessage, deliverReadActivity } from '../../common/read-messaging-message';
import Channel from '../channel';
import { UserGroupJoinings } from '../../../../models';
import { UserGroupJoinings, Users, MessagingMessages } from '../../../../models';
import { User, ILocalUser, IRemoteUser } from '../../../../models/entities/user';
export default class extends Channel {
public readonly chName = 'messaging';
@ -9,11 +10,13 @@ export default class extends Channel {
public static requireCredential = true;
private otherpartyId: string | null;
private otherparty?: User;
private groupId: string | null;
@autobind
public async init(params: any) {
this.otherpartyId = params.otherparty as string;
this.otherparty = await Users.findOne({ id: this.otherpartyId });
this.groupId = params.group as string;
// Check joining
@ -44,6 +47,13 @@ export default class extends Channel {
case 'read':
if (this.otherpartyId) {
readUserMessagingMessage(this.user!.id, this.otherpartyId, [body.id]);
// リモートユーザーからのメッセージだったら既読配信
if (Users.isLocalUser(this.user!) && Users.isRemoteUser(this.otherparty!)) {
MessagingMessages.findOne(body.id).then(message => {
if (message) deliverReadActivity(this.user as ILocalUser, this.otherparty as IRemoteUser, message);
});
}
} else if (this.groupId) {
readGroupMessagingMessage(this.user!.id, this.groupId, [body.id]);
}