summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-02-15 13:06:06 +0900
committerGitHub <noreply@github.com>2023-02-15 13:06:06 +0900
commit8f2049bcd261c3fb10afdc8c15cf4edffe1baa71 (patch)
treedc5aa1cefc24d3f6eb36bb1723d7433f8a19e5a2 /packages/backend/src/server/api/endpoints
parentMerge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff)
downloadsharkey-8f2049bcd261c3fb10afdc8c15cf4edffe1baa71.tar.gz
sharkey-8f2049bcd261c3fb10afdc8c15cf4edffe1baa71.tar.bz2
sharkey-8f2049bcd261c3fb10afdc8c15cf4edffe1baa71.zip
drop messaging (#9919)
* drop messaging (from backend) * wip
Diffstat (limited to 'packages/backend/src/server/api/endpoints')
-rw-r--r--packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts56
-rw-r--r--packages/backend/src/server/api/endpoints/messaging/history.ts110
-rw-r--r--packages/backend/src/server/api/endpoints/messaging/messages.ts165
-rw-r--r--packages/backend/src/server/api/endpoints/messaging/messages/create.ts179
-rw-r--r--packages/backend/src/server/api/endpoints/messaging/messages/delete.ts61
-rw-r--r--packages/backend/src/server/api/endpoints/messaging/messages/read.ts61
6 files changed, 0 insertions, 632 deletions
diff --git a/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts b/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts
deleted file mode 100644
index 109d6d1068..0000000000
--- a/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { MessagingMessagesRepository, UserGroupJoiningsRepository } from '@/models/index.js';
-import { GlobalEventService } from '@/core/GlobalEventService.js';
-import { DI } from '@/di-symbols.js';
-
-export const meta = {
- tags: ['account', 'messaging'],
-
- requireCredential: true,
-
- kind: 'write:account',
-} as const;
-
-export const paramDef = {
- type: 'object',
- properties: {},
- required: [],
-} as const;
-
-// eslint-disable-next-line import/no-default-export
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> {
- constructor(
- @Inject(DI.messagingMessagesRepository)
- private messagingMessagesRepository: MessagingMessagesRepository,
-
- @Inject(DI.userGroupJoiningsRepository)
- private userGroupJoiningsRepository: UserGroupJoiningsRepository,
-
- private globalEventService: GlobalEventService,
- ) {
- super(meta, paramDef, async (ps, me) => {
- // Update documents
- await this.messagingMessagesRepository.update({
- recipientId: me.id,
- isRead: false,
- }, {
- isRead: true,
- });
-
- const joinings = await this.userGroupJoiningsRepository.findBy({ userId: me.id });
-
- await Promise.all(joinings.map(j => this.messagingMessagesRepository.createQueryBuilder().update()
- .set({
- reads: (() => `array_append("reads", '${me.id}')`) as any,
- })
- .where('groupId = :groupId', { groupId: j.userGroupId })
- .andWhere('userId != :userId', { userId: me.id })
- .andWhere('NOT (:userId = ANY(reads))', { userId: me.id })
- .execute()));
-
- this.globalEventService.publishMainStream(me.id, 'readAllMessagingMessages');
- });
- }
-}
diff --git a/packages/backend/src/server/api/endpoints/messaging/history.ts b/packages/backend/src/server/api/endpoints/messaging/history.ts
deleted file mode 100644
index 0b6099d4ac..0000000000
--- a/packages/backend/src/server/api/endpoints/messaging/history.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { Brackets } from 'typeorm';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { MessagingMessage } from '@/models/entities/MessagingMessage.js';
-import type { MutingsRepository, UserGroupJoiningsRepository, MessagingMessagesRepository } from '@/models/index.js';
-import { MessagingMessageEntityService } from '@/core/entities/MessagingMessageEntityService.js';
-import { DI } from '@/di-symbols.js';
-
-export const meta = {
- tags: ['messaging'],
-
- requireCredential: true,
-
- kind: 'read:messaging',
-
- res: {
- type: 'array',
- optional: false, nullable: false,
- items: {
- type: 'object',
- optional: false, nullable: false,
- ref: 'MessagingMessage',
- },
- },
-} as const;
-
-export const paramDef = {
- type: 'object',
- properties: {
- limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
- group: { type: 'boolean', default: false },
- },
- required: [],
-} as const;
-
-// eslint-disable-next-line import/no-default-export
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> {
- constructor(
- @Inject(DI.messagingMessagesRepository)
- private messagingMessagesRepository: MessagingMessagesRepository,
-
- @Inject(DI.mutingsRepository)
- private mutingsRepository: MutingsRepository,
-
- @Inject(DI.userGroupJoiningsRepository)
- private userGroupJoiningsRepository: UserGroupJoiningsRepository,
-
- private messagingMessageEntityService: MessagingMessageEntityService,
- ) {
- super(meta, paramDef, async (ps, me) => {
- const mute = await this.mutingsRepository.findBy({
- muterId: me.id,
- });
-
- const groups = ps.group ? await this.userGroupJoiningsRepository.findBy({
- userId: me.id,
- }).then(xs => xs.map(x => x.userGroupId)) : [];
-
- if (ps.group && groups.length === 0) {
- return [];
- }
-
- const history: MessagingMessage[] = [];
-
- for (let i = 0; i < ps.limit; i++) {
- const found = ps.group
- ? history.map(m => m.groupId!)
- : history.map(m => (m.userId === me.id) ? m.recipientId! : m.userId!);
-
- const query = this.messagingMessagesRepository.createQueryBuilder('message')
- .orderBy('message.createdAt', 'DESC');
-
- if (ps.group) {
- query.where('message.groupId IN (:...groups)', { groups: groups });
-
- if (found.length > 0) {
- query.andWhere('message.groupId NOT IN (:...found)', { found: found });
- }
- } else {
- query.where(new Brackets(qb => { qb
- .where('message.userId = :userId', { userId: me.id })
- .orWhere('message.recipientId = :userId', { userId: me.id });
- }));
- query.andWhere('message.groupId IS NULL');
-
- if (found.length > 0) {
- query.andWhere('message.userId NOT IN (:...found)', { found: found });
- query.andWhere('message.recipientId NOT IN (:...found)', { found: found });
- }
-
- if (mute.length > 0) {
- query.andWhere('message.userId NOT IN (:...mute)', { mute: mute.map(m => m.muteeId) });
- query.andWhere('message.recipientId NOT IN (:...mute)', { mute: mute.map(m => m.muteeId) });
- }
- }
-
- const message = await query.getOne();
-
- if (message) {
- history.push(message);
- } else {
- break;
- }
- }
-
- return await Promise.all(history.map(h => this.messagingMessageEntityService.pack(h.id, me)));
- });
- }
-}
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages.ts b/packages/backend/src/server/api/endpoints/messaging/messages.ts
deleted file mode 100644
index 3673e252ae..0000000000
--- a/packages/backend/src/server/api/endpoints/messaging/messages.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { Brackets } from 'typeorm';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { UsersRepository, UserGroupsRepository, MessagingMessagesRepository, UserGroupJoiningsRepository } from '@/models/index.js';
-import { QueryService } from '@/core/QueryService.js';
-import { UserEntityService } from '@/core/entities/UserEntityService.js';
-import { MessagingMessageEntityService } from '@/core/entities/MessagingMessageEntityService.js';
-import { MessagingService } from '@/core/MessagingService.js';
-import { DI } from '@/di-symbols.js';
-import { ApiError } from '../../error.js';
-import { GetterService } from '@/server/api/GetterService.js';
-
-export const meta = {
- tags: ['messaging'],
-
- requireCredential: true,
-
- kind: 'read:messaging',
-
- res: {
- type: 'array',
- optional: false, nullable: false,
- items: {
- type: 'object',
- optional: false, nullable: false,
- ref: 'MessagingMessage',
- },
- },
-
- errors: {
- noSuchUser: {
- message: 'No such user.',
- code: 'NO_SUCH_USER',
- id: '11795c64-40ea-4198-b06e-3c873ed9039d',
- },
-
- noSuchGroup: {
- message: 'No such group.',
- code: 'NO_SUCH_GROUP',
- id: 'c4d9f88c-9270-4632-b032-6ed8cee36f7f',
- },
-
- groupAccessDenied: {
- message: 'You can not read messages of groups that you have not joined.',
- code: 'GROUP_ACCESS_DENIED',
- id: 'a053a8dd-a491-4718-8f87-50775aad9284',
- },
- },
-} as const;
-
-export const paramDef = {
- type: 'object',
- properties: {
- limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
- sinceId: { type: 'string', format: 'misskey:id' },
- untilId: { type: 'string', format: 'misskey:id' },
- markAsRead: { type: 'boolean', default: true },
- },
- anyOf: [
- {
- properties: {
- userId: { type: 'string', format: 'misskey:id' },
- },
- required: ['userId'],
- },
- {
- properties: {
- groupId: { type: 'string', format: 'misskey:id' },
- },
- required: ['groupId'],
- },
- ],
-} as const;
-
-// eslint-disable-next-line import/no-default-export
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> {
- constructor(
- @Inject(DI.messagingMessagesRepository)
- private messagingMessagesRepository: MessagingMessagesRepository,
-
- @Inject(DI.userGroupsRepository)
- private userGroupRepository: UserGroupsRepository,
-
- @Inject(DI.userGroupJoiningsRepository)
- private userGroupJoiningsRepository: UserGroupJoiningsRepository,
-
- private messagingMessageEntityService: MessagingMessageEntityService,
- private messagingService: MessagingService,
- private userEntityService: UserEntityService,
- private queryService: QueryService,
- private getterService: GetterService,
- ) {
- super(meta, paramDef, async (ps, me) => {
- if (ps.userId != null) {
- // Fetch recipient (user)
- const recipient = await this.getterService.getUser(ps.userId).catch(err => {
- if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
- throw err;
- });
-
- const query = this.queryService.makePaginationQuery(this.messagingMessagesRepository.createQueryBuilder('message'), ps.sinceId, ps.untilId)
- .andWhere(new Brackets(qb => { qb
- .where(new Brackets(qb => { qb
- .where('message.userId = :meId')
- .andWhere('message.recipientId = :recipientId');
- }))
- .orWhere(new Brackets(qb => { qb
- .where('message.userId = :recipientId')
- .andWhere('message.recipientId = :meId');
- }));
- }))
- .setParameter('meId', me.id)
- .setParameter('recipientId', recipient.id);
-
- const messages = await query.take(ps.limit).getMany();
-
- // Mark all as read
- if (ps.markAsRead) {
- this.messagingService.readUserMessagingMessage(me.id, recipient.id, messages.filter(m => m.recipientId === me.id).map(x => x.id));
-
- // リモートユーザーとのメッセージだったら既読配信
- if (this.userEntityService.isLocalUser(me) && this.userEntityService.isRemoteUser(recipient)) {
- this.messagingService.deliverReadActivity(me, recipient, messages);
- }
- }
-
- return await Promise.all(messages.map(message => this.messagingMessageEntityService.pack(message, me, {
- populateRecipient: false,
- })));
- } else if (ps.groupId != null) {
- // Fetch recipient (group)
- const recipientGroup = await this.userGroupRepository.findOneBy({ id: ps.groupId });
-
- if (recipientGroup == null) {
- throw new ApiError(meta.errors.noSuchGroup);
- }
-
- // check joined
- const joining = await this.userGroupJoiningsRepository.findOneBy({
- userId: me.id,
- userGroupId: recipientGroup.id,
- });
-
- if (joining == null) {
- throw new ApiError(meta.errors.groupAccessDenied);
- }
-
- const query = this.queryService.makePaginationQuery(this.messagingMessagesRepository.createQueryBuilder('message'), ps.sinceId, ps.untilId)
- .andWhere('message.groupId = :groupId', { groupId: recipientGroup.id });
-
- const messages = await query.take(ps.limit).getMany();
-
- // Mark all as read
- if (ps.markAsRead) {
- this.messagingService.readGroupMessagingMessage(me.id, recipientGroup.id, messages.map(x => x.id));
- }
-
- return await Promise.all(messages.map(message => this.messagingMessageEntityService.pack(message, me, {
- populateGroup: false,
- })));
- }
- });
- }
-}
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
deleted file mode 100644
index e9ffc7a9eb..0000000000
--- a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import ms from 'ms';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { BlockingsRepository, UserGroupJoiningsRepository, DriveFilesRepository, UserGroupsRepository } from '@/models/index.js';
-import type { User } from '@/models/entities/User.js';
-import type { UserGroup } from '@/models/entities/UserGroup.js';
-import { GetterService } from '@/server/api/GetterService.js';
-import { MessagingService } from '@/core/MessagingService.js';
-import { DI } from '@/di-symbols.js';
-import { ApiError } from '../../../error.js';
-
-export const meta = {
- tags: ['messaging'],
-
- requireCredential: true,
-
- kind: 'write:messaging',
-
- limit: {
- duration: ms('1hour'),
- max: 120,
- },
-
- res: {
- type: 'object',
- optional: false, nullable: false,
- ref: 'MessagingMessage',
- },
-
- errors: {
- recipientIsYourself: {
- message: 'You can not send a message to yourself.',
- code: 'RECIPIENT_IS_YOURSELF',
- id: '17e2ba79-e22a-4cbc-bf91-d327643f4a7e',
- },
-
- noSuchUser: {
- message: 'No such user.',
- code: 'NO_SUCH_USER',
- id: '11795c64-40ea-4198-b06e-3c873ed9039d',
- },
-
- noSuchGroup: {
- message: 'No such group.',
- code: 'NO_SUCH_GROUP',
- id: 'c94e2a5d-06aa-4914-8fa6-6a42e73d6537',
- },
-
- groupAccessDenied: {
- message: 'You can not send messages to groups that you have not joined.',
- code: 'GROUP_ACCESS_DENIED',
- id: 'd96b3cca-5ad1-438b-ad8b-02f931308fbd',
- },
-
- noSuchFile: {
- message: 'No such file.',
- code: 'NO_SUCH_FILE',
- id: '4372b8e2-185d-4146-8749-2f68864a3e5f',
- },
-
- contentRequired: {
- message: 'Content required. You need to set text or fileId.',
- code: 'CONTENT_REQUIRED',
- id: '25587321-b0e6-449c-9239-f8925092942c',
- },
-
- youHaveBeenBlocked: {
- message: 'You cannot send a message because you have been blocked by this user.',
- code: 'YOU_HAVE_BEEN_BLOCKED',
- id: 'c15a5199-7422-4968-941a-2a462c478f7d',
- },
- },
-} as const;
-
-export const paramDef = {
- type: 'object',
- properties: {
- text: { type: 'string', nullable: true, maxLength: 3000 },
- fileId: { type: 'string', format: 'misskey:id' },
- },
- anyOf: [
- {
- properties: {
- userId: { type: 'string', format: 'misskey:id' },
- },
- required: ['userId'],
- },
- {
- properties: {
- groupId: { type: 'string', format: 'misskey:id' },
- },
- required: ['groupId'],
- },
- ],
-} as const;
-
-// eslint-disable-next-line import/no-default-export
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> {
- constructor(
- @Inject(DI.userGroupsRepository)
- private userGroupsRepository: UserGroupsRepository,
-
- @Inject(DI.userGroupJoiningsRepository)
- private userGroupJoiningsRepository: UserGroupJoiningsRepository,
-
- @Inject(DI.blockingsRepository)
- private blockingsRepository: BlockingsRepository,
-
- @Inject(DI.driveFilesRepository)
- private driveFilesRepository: DriveFilesRepository,
-
- private getterService: GetterService,
- private messagingService: MessagingService,
- ) {
- super(meta, paramDef, async (ps, me) => {
- let recipientUser: User | null;
- let recipientGroup: UserGroup | null;
-
- if (ps.userId != null) {
- // Myself
- if (ps.userId === me.id) {
- throw new ApiError(meta.errors.recipientIsYourself);
- }
-
- // Fetch recipient (user)
- recipientUser = await this.getterService.getUser(ps.userId).catch(err => {
- if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
- throw err;
- });
-
- // Check blocking
- const block = await this.blockingsRepository.findOneBy({
- blockerId: recipientUser.id,
- blockeeId: me.id,
- });
- if (block) {
- throw new ApiError(meta.errors.youHaveBeenBlocked);
- }
- } else if (ps.groupId != null) {
- // Fetch recipient (group)
- recipientGroup = await this.userGroupsRepository.findOneBy({ id: ps.groupId! });
-
- if (recipientGroup == null) {
- throw new ApiError(meta.errors.noSuchGroup);
- }
-
- // check joined
- const joining = await this.userGroupJoiningsRepository.findOneBy({
- userId: me.id,
- userGroupId: recipientGroup.id,
- });
-
- if (joining == null) {
- throw new ApiError(meta.errors.groupAccessDenied);
- }
- }
-
- let file = null;
- if (ps.fileId != null) {
- file = await this.driveFilesRepository.findOneBy({
- id: ps.fileId,
- userId: me.id,
- });
-
- if (file == null) {
- throw new ApiError(meta.errors.noSuchFile);
- }
- }
-
- // テキストが無いかつ添付ファイルも無かったらエラー
- if (ps.text == null && file == null) {
- throw new ApiError(meta.errors.contentRequired);
- }
-
- return await this.messagingService.createMessage(me, recipientUser, recipientGroup, ps.text, file);
- });
- }
-}
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts b/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
deleted file mode 100644
index cd74f5f197..0000000000
--- a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import ms from 'ms';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { MessagingMessagesRepository } from '@/models/index.js';
-import { MessagingService } from '@/core/MessagingService.js';
-import { DI } from '@/di-symbols.js';
-import { ApiError } from '../../../error.js';
-
-export const meta = {
- tags: ['messaging'],
-
- requireCredential: true,
-
- kind: 'write:messaging',
-
- limit: {
- duration: ms('1hour'),
- max: 300,
- minInterval: ms('1sec'),
- },
-
- errors: {
- noSuchMessage: {
- message: 'No such message.',
- code: 'NO_SUCH_MESSAGE',
- id: '54b5b326-7925-42cf-8019-130fda8b56af',
- },
- },
-} as const;
-
-export const paramDef = {
- type: 'object',
- properties: {
- messageId: { type: 'string', format: 'misskey:id' },
- },
- required: ['messageId'],
-} as const;
-
-// eslint-disable-next-line import/no-default-export
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> {
- constructor(
- @Inject(DI.messagingMessagesRepository)
- private messagingMessagesRepository: MessagingMessagesRepository,
-
- private messagingService: MessagingService,
- ) {
- super(meta, paramDef, async (ps, me) => {
- const message = await this.messagingMessagesRepository.findOneBy({
- id: ps.messageId,
- userId: me.id,
- });
-
- if (message == null) {
- throw new ApiError(meta.errors.noSuchMessage);
- }
-
- await this.messagingService.deleteMessage(message);
- });
- }
-}
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/read.ts b/packages/backend/src/server/api/endpoints/messaging/messages/read.ts
deleted file mode 100644
index bddb6d932d..0000000000
--- a/packages/backend/src/server/api/endpoints/messaging/messages/read.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Inject, Injectable } from '@nestjs/common';
-import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { MessagingMessagesRepository } from '@/models/index.js';
-import { MessagingService } from '@/core/MessagingService.js';
-import { DI } from '@/di-symbols.js';
-import { ApiError } from '../../../error.js';
-
-export const meta = {
- tags: ['messaging'],
-
- requireCredential: true,
-
- kind: 'write:messaging',
-
- errors: {
- noSuchMessage: {
- message: 'No such message.',
- code: 'NO_SUCH_MESSAGE',
- id: '86d56a2f-a9c3-4afb-b13c-3e9bfef9aa14',
- },
- },
-} as const;
-
-export const paramDef = {
- type: 'object',
- properties: {
- messageId: { type: 'string', format: 'misskey:id' },
- },
- required: ['messageId'],
-} as const;
-
-// eslint-disable-next-line import/no-default-export
-@Injectable()
-export default class extends Endpoint<typeof meta, typeof paramDef> {
- constructor(
- @Inject(DI.messagingMessagesRepository)
- private messagingMessagesRepository: MessagingMessagesRepository,
-
- private messagingService: MessagingService,
- ) {
- super(meta, paramDef, async (ps, me) => {
- const message = await this.messagingMessagesRepository.findOneBy({ id: ps.messageId });
-
- if (message == null) {
- throw new ApiError(meta.errors.noSuchMessage);
- }
-
- if (message.recipientId) {
- await this.messagingService.readUserMessagingMessage(me.id, message.userId, [message.id]).catch(err => {
- if (err.id === 'e140a4bf-49ce-4fb6-b67c-b78dadf6b52f') throw new ApiError(meta.errors.noSuchMessage);
- throw err;
- });
- } else if (message.groupId) {
- await this.messagingService.readGroupMessagingMessage(me.id, message.groupId, [message.id]).catch(err => {
- if (err.id === '930a270c-714a-46b2-b776-ad27276dc569') throw new ApiError(meta.errors.noSuchMessage);
- throw err;
- });
- }
- });
- }
-}