mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-13 11:23:08 +02:00
766559c6e9
* clean up * ev => data * refactor * clean up * add type * antenna * channel * fix * add Packed type * add PackedRef * fix lint * add emoji schema * add reversiGame * add reversiMatching * remove signin schema (use Signin entity) * add schemas refs, fix Packed type * wip PackedHoge => Packed<'Hoge'> * add Packed type * note-reaction * user * user-group * user-list * note * app, messaging-message * notification * drive-file * drive-folder * following * muting * blocking * hashtag * page * app (with modifying schema) * import user? * channel * antenna * clip * gallery-post * emoji * Packed * reversi-matching * update stream.ts * https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339 * fix lint * clean up? * add app * fix * nanka iroiro * wip * wip * fix lint * fix loginId * fix * refactor * refactor * remove follow action * clean up * Revert "remove follow action" This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a. * Revert "clean up" This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2. * remove fetch specification * renoteの条件追加 * apiFetch => cli * bypass fetch? * fix * refactor: use path alias * temp: add submodule * remove submodule * enhane: unison-reloadに指定したパスに移動できるように * null * null * feat: ログインするアカウントのIDをクエリ文字列で指定する機能 * null * await? * rename * rename * Update read.ts * merge * get-note-summary * fix * swパッケージに * add missing packages * fix getNoteSummary * add webpack-cli * ✌️ * remove plugins * sw-inject分離したがテストしてない * fix notification.vue * remove a blank line * disconnect intersection observer * disconnect2 * fix notification.vue * remove a blank line * disconnect intersection observer * disconnect2 * fix * ✌️ * clean up config * typesを戻した * Update packages/client/src/components/notification.vue Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com> * disconnect * oops * Failed to load the script unexpectedly回避 sw.jsとlib.tsを分離してみた * truncate notification * Update packages/client/src/ui/_common_/common.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * clean up * clean up * キャッシュ対策 * Truncate push notification message * クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正 * components/drive-file-thumbnail.vue * components/drive-select-dialog.vue * components/drive-window.vue * merge * fix * Service Workerのビルドにesbuildを使うようにする * return createEmptyNotification() * fix * i18n.ts * update * ✌️ * remove ts-loader * fix * fix * enhance: Service Workerを常に登録するように * pollEnded * URLをsw.jsに戻す * clean up Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com> Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
108 lines
4.5 KiB
TypeScript
108 lines
4.5 KiB
TypeScript
import { CacheableUser, User } from '@/models/entities/user.js';
|
|
import { UserGroup } from '@/models/entities/user-group.js';
|
|
import { DriveFile } from '@/models/entities/drive-file.js';
|
|
import { MessagingMessages, UserGroupJoinings, Mutings, Users } from '@/models/index.js';
|
|
import { genId } from '@/misc/gen-id.js';
|
|
import { MessagingMessage } from '@/models/entities/messaging-message.js';
|
|
import { publishMessagingStream, publishMessagingIndexStream, publishMainStream, publishGroupMessagingStream } from '@/services/stream.js';
|
|
import { pushNotification } from '@/services/push-notification.js';
|
|
import { Not } from 'typeorm';
|
|
import { Note } from '@/models/entities/note.js';
|
|
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: { id: User['id']; host: User['host']; }, recipientUser: CacheableUser | undefined, recipientGroup: UserGroup | undefined, text: string | null | undefined, file: DriveFile | null, uri?: string) {
|
|
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: [] as any[],
|
|
uri,
|
|
} as MessagingMessage;
|
|
|
|
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,
|
|
}))),
|
|
} as Note;
|
|
|
|
const activity = renderActivity(renderCreate(await renderNote(note, false, true), note));
|
|
|
|
deliver(user, activity, recipientUser.inbox);
|
|
}
|
|
return messageObj;
|
|
}
|