Fixed 267U.pre2

This commit is contained in:
2026-07-26 18:25:37 +09:00
parent 50bfaeafdf
commit 317d00a284
1286 changed files with 80222 additions and 1 deletions
@@ -0,0 +1,103 @@
import { MessagingMessages, UserGroupJoinings, Mutings, Users } from "../../models/index.js";
import { genId } from "../../misc/gen-id.js";
import { publishMessagingStream, publishMessagingIndexStream, publishMainStream, publishGroupMessagingStream } from "../stream.js";
import { pushNotification } from "../push-notification.js";
import { Not } from "typeorm";
import renderNote from "../../remote/activitypub/renderer/note.js";
import renderCreate from "../../remote/activitypub/renderer/create.js";
import { renderActivity } from "../../remote/activitypub/renderer/index.js";
import { deliver } from "../../queue/index.js";
export async function createMessage(user, recipientUser, recipientGroup, text, file, uri) {
const message = {
id: genId(),
createdAt: new Date(),
fileId: file ? file.id : null,
recipientId: recipientUser ? recipientUser.id : null,
groupId: recipientGroup ? recipientGroup.id : null,
text: text ? text.trim() : null,
userId: user.id,
isRead: false,
reads: [],
uri
};
await MessagingMessages.insert(message);
const messageObj = await MessagingMessages.pack(message);
if (recipientUser) {
if (Users.isLocalUser(user)) {
// 自分のストリーム
publishMessagingStream(message.userId, recipientUser.id, "message", messageObj);
publishMessagingIndexStream(message.userId, "message", messageObj);
publishMainStream(message.userId, "messagingMessage", messageObj);
}
if (Users.isLocalUser(recipientUser)) {
// 相手のストリーム
publishMessagingStream(recipientUser.id, message.userId, "message", messageObj);
publishMessagingIndexStream(recipientUser.id, "message", messageObj);
publishMainStream(recipientUser.id, "messagingMessage", messageObj);
}
} else if (recipientGroup) {
// グループのストリーム
publishGroupMessagingStream(recipientGroup.id, "message", messageObj);
// メンバーのストリーム
const joinings = await UserGroupJoinings.findBy({
userGroupId: recipientGroup.id
});
for (const joining of joinings){
publishMessagingIndexStream(joining.userId, "message", messageObj);
publishMainStream(joining.userId, "messagingMessage", messageObj);
}
}
// 2秒経っても(今回作成した)メッセージが既読にならなかったら「未読のメッセージがありますよ」イベントを発行する
setTimeout(async ()=>{
const freshMessage = await MessagingMessages.findOneBy({
id: message.id
});
if (freshMessage == null) return; // メッセージが削除されている場合もある
if (recipientUser && Users.isLocalUser(recipientUser)) {
if (freshMessage.isRead) return; // 既読
//#region ただしミュートされているなら発行しない
const mute = await Mutings.findBy({
muterId: recipientUser.id
});
if (mute.map((m)=>m.muteeId).includes(user.id)) return;
//#endregion
publishMainStream(recipientUser.id, "unreadMessagingMessage", messageObj);
pushNotification(recipientUser.id, "unreadMessagingMessage", messageObj);
} else if (recipientGroup) {
const joinings = await UserGroupJoinings.findBy({
userGroupId: recipientGroup.id,
userId: Not(user.id)
});
for (const joining of joinings){
if (freshMessage.reads.includes(joining.userId)) return; // 既読
publishMainStream(joining.userId, "unreadMessagingMessage", messageObj);
pushNotification(joining.userId, "unreadMessagingMessage", messageObj);
}
}
}, 2000);
if (recipientUser && Users.isLocalUser(user) && Users.isRemoteUser(recipientUser)) {
const note = {
id: message.id,
createdAt: message.createdAt,
fileIds: message.fileId ? [
message.fileId
] : [],
text: message.text,
userId: message.userId,
visibility: "specified",
mentions: [
recipientUser
].map((u)=>u.id),
mentionedRemoteUsers: JSON.stringify([
recipientUser
].map((u)=>({
uri: u.uri,
username: u.username,
host: u.host
})))
};
const activity = renderActivity(renderCreate(await renderNote(note, false, true), note));
deliver(user, activity, recipientUser.inbox);
}
return messageObj;
}