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 commitdefbb41648
. * Revert "clean up" This reverts commitf94919cb9c
. * 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>
151 lines
5 KiB
TypeScript
151 lines
5 KiB
TypeScript
import { publishMainStream, publishGroupMessagingStream } from '@/services/stream.js';
|
|
import { publishMessagingStream } from '@/services/stream.js';
|
|
import { publishMessagingIndexStream } from '@/services/stream.js';
|
|
import { pushNotification } from '@/services/push-notification.js';
|
|
import { User, IRemoteUser } from '@/models/entities/user.js';
|
|
import { MessagingMessage } from '@/models/entities/messaging-message.js';
|
|
import { MessagingMessages, UserGroupJoinings, Users } from '@/models/index.js';
|
|
import { In } from 'typeorm';
|
|
import { IdentifiableError } from '@/misc/identifiable-error.js';
|
|
import { UserGroup } from '@/models/entities/user-group.js';
|
|
import { toArray } from '@/prelude/array.js';
|
|
import { renderReadActivity } from '@/remote/activitypub/renderer/read.js';
|
|
import { renderActivity } from '@/remote/activitypub/renderer/index.js';
|
|
import { deliver } from '@/queue/index.js';
|
|
import orderedCollection from '@/remote/activitypub/renderer/ordered-collection.js';
|
|
|
|
/**
|
|
* Mark messages as read
|
|
*/
|
|
export async function readUserMessagingMessage(
|
|
userId: User['id'],
|
|
otherpartyId: User['id'],
|
|
messageIds: MessagingMessage['id'][]
|
|
) {
|
|
if (messageIds.length === 0) return;
|
|
|
|
const messages = await MessagingMessages.findBy({
|
|
id: In(messageIds),
|
|
});
|
|
|
|
for (const message of messages) {
|
|
if (message.recipientId !== userId) {
|
|
throw new IdentifiableError('e140a4bf-49ce-4fb6-b67c-b78dadf6b52f', 'Access denied (user).');
|
|
}
|
|
}
|
|
|
|
// Update documents
|
|
await MessagingMessages.update({
|
|
id: In(messageIds),
|
|
userId: otherpartyId,
|
|
recipientId: userId,
|
|
isRead: false,
|
|
}, {
|
|
isRead: true,
|
|
});
|
|
|
|
// Publish event
|
|
publishMessagingStream(otherpartyId, userId, 'read', messageIds);
|
|
publishMessagingIndexStream(userId, 'read', messageIds);
|
|
|
|
if (!await Users.getHasUnreadMessagingMessage(userId)) {
|
|
// 全ての(いままで未読だった)自分宛てのメッセージを(これで)読みましたよというイベントを発行
|
|
publishMainStream(userId, 'readAllMessagingMessages');
|
|
pushNotification(userId, 'readAllMessagingMessages', undefined);
|
|
} else {
|
|
// そのユーザーとのメッセージで未読がなければイベント発行
|
|
const count = await MessagingMessages.count({
|
|
where: {
|
|
userId: otherpartyId,
|
|
recipientId: userId,
|
|
isRead: false,
|
|
},
|
|
take: 1
|
|
});
|
|
|
|
if (!count) {
|
|
pushNotification(userId, 'readAllMessagingMessagesOfARoom', { userId: otherpartyId });
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Mark messages as read
|
|
*/
|
|
export async function readGroupMessagingMessage(
|
|
userId: User['id'],
|
|
groupId: UserGroup['id'],
|
|
messageIds: MessagingMessage['id'][]
|
|
) {
|
|
if (messageIds.length === 0) return;
|
|
|
|
// check joined
|
|
const joining = await UserGroupJoinings.findOneBy({
|
|
userId: userId,
|
|
userGroupId: groupId,
|
|
});
|
|
|
|
if (joining == null) {
|
|
throw new IdentifiableError('930a270c-714a-46b2-b776-ad27276dc569', 'Access denied (group).');
|
|
}
|
|
|
|
const messages = await MessagingMessages.findBy({
|
|
id: In(messageIds),
|
|
});
|
|
|
|
const reads: MessagingMessage['id'][] = [];
|
|
|
|
for (const message of messages) {
|
|
if (message.userId === userId) continue;
|
|
if (message.reads.includes(userId)) continue;
|
|
|
|
// Update document
|
|
await MessagingMessages.createQueryBuilder().update()
|
|
.set({
|
|
reads: (() => `array_append("reads", '${joining.userId}')`) as any,
|
|
})
|
|
.where('id = :id', { id: message.id })
|
|
.execute();
|
|
|
|
reads.push(message.id);
|
|
}
|
|
|
|
// Publish event
|
|
publishGroupMessagingStream(groupId, 'read', {
|
|
ids: reads,
|
|
userId: userId,
|
|
});
|
|
publishMessagingIndexStream(userId, 'read', reads);
|
|
|
|
if (!await Users.getHasUnreadMessagingMessage(userId)) {
|
|
// 全ての(いままで未読だった)自分宛てのメッセージを(これで)読みましたよというイベントを発行
|
|
publishMainStream(userId, 'readAllMessagingMessages');
|
|
pushNotification(userId, 'readAllMessagingMessages', undefined);
|
|
} else {
|
|
// そのグループにおいて未読がなければイベント発行
|
|
const unreadExist = await MessagingMessages.createQueryBuilder('message')
|
|
.where(`message.groupId = :groupId`, { groupId: groupId })
|
|
.andWhere('message.userId != :userId', { userId: userId })
|
|
.andWhere('NOT (:userId = ANY(message.reads))', { userId: userId })
|
|
.andWhere('message.createdAt > :joinedAt', { joinedAt: joining.createdAt }) // 自分が加入する前の会話については、未読扱いしない
|
|
.getOne().then(x => x != null);
|
|
|
|
if (!unreadExist) {
|
|
pushNotification(userId, 'readAllMessagingMessagesOfARoom', { groupId });
|
|
}
|
|
}
|
|
}
|
|
|
|
export async function deliverReadActivity(user: { id: User['id']; host: null; }, recipient: IRemoteUser, messages: MessagingMessage | MessagingMessage[]) {
|
|
messages = toArray(messages).filter(x => x.uri);
|
|
const contents = messages.map(x => renderReadActivity(user, x));
|
|
|
|
if (contents.length > 1) {
|
|
const collection = orderedCollection(null, contents.length, undefined, undefined, contents);
|
|
deliver(user, renderActivity(collection), recipient.inbox);
|
|
} else {
|
|
for (const content of contents) {
|
|
deliver(user, renderActivity(content), recipient.inbox);
|
|
}
|
|
}
|
|
}
|