Fixed 267U.pre2
This commit is contained in:
@@ -0,0 +1,95 @@
|
||||
import { readUserMessagingMessage, readGroupMessagingMessage, deliverReadActivity } from "../../common/read-messaging-message.js";
|
||||
import Channel from "../channel.js";
|
||||
import { UserGroupJoinings, Users, MessagingMessages } from "../../../../models/index.js";
|
||||
export default class extends Channel {
|
||||
chName = "messaging";
|
||||
static shouldShare = false;
|
||||
static requireCredential = true;
|
||||
otherpartyId;
|
||||
otherparty;
|
||||
groupId;
|
||||
subCh;
|
||||
typers = new Map();
|
||||
emitTypersIntervalId;
|
||||
constructor(id, connection){
|
||||
super(id, connection);
|
||||
this.onEvent = this.onEvent.bind(this);
|
||||
this.onMessage = this.onMessage.bind(this);
|
||||
this.emitTypers = this.emitTypers.bind(this);
|
||||
}
|
||||
async init(params) {
|
||||
this.otherpartyId = params.otherparty;
|
||||
this.otherparty = this.otherpartyId ? await Users.findOneByOrFail({
|
||||
id: this.otherpartyId
|
||||
}) : null;
|
||||
this.groupId = params.group;
|
||||
// Check joining
|
||||
if (this.groupId) {
|
||||
const joining = await UserGroupJoinings.findOneBy({
|
||||
userId: this.user.id,
|
||||
userGroupId: this.groupId
|
||||
});
|
||||
if (joining == null) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
this.emitTypersIntervalId = setInterval(this.emitTypers, 5000);
|
||||
this.subCh = this.otherpartyId ? `messagingStream:${this.user.id}-${this.otherpartyId}` : `messagingStream:${this.groupId}`;
|
||||
// Subscribe messaging stream
|
||||
this.subscriber.on(this.subCh, this.onEvent);
|
||||
}
|
||||
onEvent(data) {
|
||||
if (data.type === "typing") {
|
||||
const id = data.body;
|
||||
const begin = !this.typers.has(id);
|
||||
this.typers.set(id, new Date());
|
||||
if (begin) {
|
||||
this.emitTypers();
|
||||
}
|
||||
} else {
|
||||
this.send(data);
|
||||
}
|
||||
}
|
||||
onMessage(type, body) {
|
||||
switch(type){
|
||||
case "read":
|
||||
if (this.otherpartyId) {
|
||||
readUserMessagingMessage(this.user.id, this.otherpartyId, [
|
||||
body.id
|
||||
]);
|
||||
// リモートユーザーからのメッセージだったら既読配信
|
||||
if (Users.isLocalUser(this.user) && Users.isRemoteUser(this.otherparty)) {
|
||||
MessagingMessages.findOneBy({
|
||||
id: body.id
|
||||
}).then((message)=>{
|
||||
if (message) deliverReadActivity(this.user, this.otherparty, message);
|
||||
});
|
||||
}
|
||||
} else if (this.groupId) {
|
||||
readGroupMessagingMessage(this.user.id, this.groupId, [
|
||||
body.id
|
||||
]);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
async emitTypers() {
|
||||
const now = new Date();
|
||||
// Remove not typing users
|
||||
for (const [userId, date] of this.typers.entries()){
|
||||
if (now.getTime() - date.getTime() > 5000) this.typers.delete(userId);
|
||||
}
|
||||
const userIds = Array.from(this.typers.keys());
|
||||
const users = await Users.packMany(userIds, null, {
|
||||
detail: false
|
||||
});
|
||||
this.send({
|
||||
type: "typers",
|
||||
body: users
|
||||
});
|
||||
}
|
||||
dispose() {
|
||||
this.subscriber.off(this.subCh, this.onEvent);
|
||||
clearInterval(this.emitTypersIntervalId);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user