mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-13 10:53: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>
62 lines
2.3 KiB
TypeScript
62 lines
2.3 KiB
TypeScript
import { publishMainStream } from '@/services/stream.js';
|
|
import { pushNotification } from '@/services/push-notification.js';
|
|
import { Notifications, Mutings, UserProfiles, Users } from '@/models/index.js';
|
|
import { genId } from '@/misc/gen-id.js';
|
|
import { User } from '@/models/entities/user.js';
|
|
import { Notification } from '@/models/entities/notification.js';
|
|
import { sendEmailNotification } from './send-email-notification.js';
|
|
|
|
export async function createNotification(
|
|
notifieeId: User['id'],
|
|
type: Notification['type'],
|
|
data: Partial<Notification>
|
|
) {
|
|
if (data.notifierId && (notifieeId === data.notifierId)) {
|
|
return null;
|
|
}
|
|
|
|
const profile = await UserProfiles.findOneBy({ userId: notifieeId });
|
|
|
|
const isMuted = profile?.mutingNotificationTypes.includes(type);
|
|
|
|
// Create notification
|
|
const notification = await Notifications.insert({
|
|
id: genId(),
|
|
createdAt: new Date(),
|
|
notifieeId: notifieeId,
|
|
type: type,
|
|
// 相手がこの通知をミュートしているようなら、既読を予めつけておく
|
|
isRead: isMuted,
|
|
...data,
|
|
} as Partial<Notification>)
|
|
.then(x => Notifications.findOneByOrFail(x.identifiers[0]));
|
|
|
|
const packed = await Notifications.pack(notification, {});
|
|
|
|
// Publish notification event
|
|
publishMainStream(notifieeId, 'notification', packed);
|
|
|
|
// 2秒経っても(今回作成した)通知が既読にならなかったら「未読の通知がありますよ」イベントを発行する
|
|
setTimeout(async () => {
|
|
const fresh = await Notifications.findOneBy({ id: notification.id });
|
|
if (fresh == null) return; // 既に削除されているかもしれない
|
|
if (fresh.isRead) return;
|
|
|
|
//#region ただしミュートしているユーザーからの通知なら無視
|
|
const mutings = await Mutings.findBy({
|
|
muterId: notifieeId,
|
|
});
|
|
if (data.notifierId && mutings.map(m => m.muteeId).includes(data.notifierId)) {
|
|
return;
|
|
}
|
|
//#endregion
|
|
|
|
publishMainStream(notifieeId, 'unreadNotification', packed);
|
|
pushNotification(notifieeId, 'notification', packed);
|
|
|
|
if (type === 'follow') sendEmailNotification.follow(notifieeId, await Users.findOneByOrFail({ id: data.notifierId! }));
|
|
if (type === 'receiveFollowRequest') sendEmailNotification.receiveFollowRequest(notifieeId, await Users.findOneByOrFail({ id: data.notifierId! }));
|
|
}, 2000);
|
|
|
|
return notification;
|
|
}
|