summaryrefslogtreecommitdiff
path: root/packages/backend/src/models
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/models
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/models')
-rw-r--r--packages/backend/src/models/RepositoryModule.ts10
-rw-r--r--packages/backend/src/models/entities/MessagingMessage.ts89
-rw-r--r--packages/backend/src/models/index.ts3
-rw-r--r--packages/backend/src/models/schema/messaging-message.ts73
-rw-r--r--packages/backend/src/models/schema/user.ts4
5 files changed, 1 insertions, 178 deletions
diff --git a/packages/backend/src/models/RepositoryModule.ts b/packages/backend/src/models/RepositoryModule.ts
index 2a235bc6fc..231dbb225b 100644
--- a/packages/backend/src/models/RepositoryModule.ts
+++ b/packages/backend/src/models/RepositoryModule.ts
@@ -1,6 +1,6 @@
import { Module } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
-import { User, Note, Announcement, AnnouncementRead, App, NoteFavorite, NoteThreadMuting, NoteReaction, NoteUnread, Notification, Poll, PollVote, UserProfile, UserKeypair, UserPending, AttestationChallenge, UserSecurityKey, UserPublickey, UserList, UserListJoining, UserGroup, UserGroupJoining, UserGroupInvitation, UserNotePining, UserIp, UsedUsername, Following, FollowRequest, Instance, Emoji, DriveFile, DriveFolder, Meta, Muting, Blocking, SwSubscription, Hashtag, AbuseUserReport, RegistrationTicket, AuthSession, AccessToken, Signin, MessagingMessage, Page, PageLike, GalleryPost, GalleryLike, ModerationLog, Clip, ClipNote, Antenna, AntennaNote, PromoNote, PromoRead, Relay, MutedNote, Channel, ChannelFollowing, ChannelNotePining, RegistryItem, Webhook, Ad, PasswordResetRequest, RetentionAggregation, FlashLike, Flash, Role, RoleAssignment } from './index.js';
+import { User, Note, Announcement, AnnouncementRead, App, NoteFavorite, NoteThreadMuting, NoteReaction, NoteUnread, Notification, Poll, PollVote, UserProfile, UserKeypair, UserPending, AttestationChallenge, UserSecurityKey, UserPublickey, UserList, UserListJoining, UserGroup, UserGroupJoining, UserGroupInvitation, UserNotePining, UserIp, UsedUsername, Following, FollowRequest, Instance, Emoji, DriveFile, DriveFolder, Meta, Muting, Blocking, SwSubscription, Hashtag, AbuseUserReport, RegistrationTicket, AuthSession, AccessToken, Signin, Page, PageLike, GalleryPost, GalleryLike, ModerationLog, Clip, ClipNote, Antenna, AntennaNote, PromoNote, PromoRead, Relay, MutedNote, Channel, ChannelFollowing, ChannelNotePining, RegistryItem, Webhook, Ad, PasswordResetRequest, RetentionAggregation, FlashLike, Flash, Role, RoleAssignment } from './index.js';
import type { DataSource } from 'typeorm';
import type { Provider } from '@nestjs/common';
@@ -256,12 +256,6 @@ const $signinsRepository: Provider = {
inject: [DI.db],
};
-const $messagingMessagesRepository: Provider = {
- provide: DI.messagingMessagesRepository,
- useFactory: (db: DataSource) => db.getRepository(MessagingMessage),
- inject: [DI.db],
-};
-
const $pagesRepository: Provider = {
provide: DI.pagesRepository,
useFactory: (db: DataSource) => db.getRepository(Page),
@@ -458,7 +452,6 @@ const $roleAssignmentsRepository: Provider = {
$authSessionsRepository,
$accessTokensRepository,
$signinsRepository,
- $messagingMessagesRepository,
$pagesRepository,
$pageLikesRepository,
$galleryPostsRepository,
@@ -528,7 +521,6 @@ const $roleAssignmentsRepository: Provider = {
$authSessionsRepository,
$accessTokensRepository,
$signinsRepository,
- $messagingMessagesRepository,
$pagesRepository,
$pageLikesRepository,
$galleryPostsRepository,
diff --git a/packages/backend/src/models/entities/MessagingMessage.ts b/packages/backend/src/models/entities/MessagingMessage.ts
deleted file mode 100644
index 69fc9815d4..0000000000
--- a/packages/backend/src/models/entities/MessagingMessage.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { id } from '../id.js';
-import { User } from './User.js';
-import { DriveFile } from './DriveFile.js';
-import { UserGroup } from './UserGroup.js';
-
-@Entity()
-export class MessagingMessage {
- @PrimaryColumn(id())
- public id: string;
-
- @Index()
- @Column('timestamp with time zone', {
- comment: 'The created date of the MessagingMessage.',
- })
- public createdAt: Date;
-
- @Index()
- @Column({
- ...id(),
- comment: 'The sender user ID.',
- })
- public userId: User['id'];
-
- @ManyToOne(type => User, {
- onDelete: 'CASCADE',
- })
- @JoinColumn()
- public user: User | null;
-
- @Index()
- @Column({
- ...id(), nullable: true,
- comment: 'The recipient user ID.',
- })
- public recipientId: User['id'] | null;
-
- @ManyToOne(type => User, {
- onDelete: 'CASCADE',
- })
- @JoinColumn()
- public recipient: User | null;
-
- @Index()
- @Column({
- ...id(), nullable: true,
- comment: 'The recipient group ID.',
- })
- public groupId: UserGroup['id'] | null;
-
- @ManyToOne(type => UserGroup, {
- onDelete: 'CASCADE',
- })
- @JoinColumn()
- public group: UserGroup | null;
-
- @Column('varchar', {
- length: 4096, nullable: true,
- })
- public text: string | null;
-
- @Column('boolean', {
- default: false,
- })
- public isRead: boolean;
-
- @Column('varchar', {
- length: 512, nullable: true,
- })
- public uri: string | null;
-
- @Column({
- ...id(),
- array: true, default: '{}',
- })
- public reads: User['id'][];
-
- @Column({
- ...id(),
- nullable: true,
- })
- public fileId: DriveFile['id'] | null;
-
- @ManyToOne(type => DriveFile, {
- onDelete: 'CASCADE',
- })
- @JoinColumn()
- public file: DriveFile | null;
-}
diff --git a/packages/backend/src/models/index.ts b/packages/backend/src/models/index.ts
index 50697597ad..1494905277 100644
--- a/packages/backend/src/models/index.ts
+++ b/packages/backend/src/models/index.ts
@@ -22,7 +22,6 @@ import { GalleryLike } from '@/models/entities/GalleryLike.js';
import { GalleryPost } from '@/models/entities/GalleryPost.js';
import { Hashtag } from '@/models/entities/Hashtag.js';
import { Instance } from '@/models/entities/Instance.js';
-import { MessagingMessage } from '@/models/entities/MessagingMessage.js';
import { Meta } from '@/models/entities/Meta.js';
import { ModerationLog } from '@/models/entities/ModerationLog.js';
import { MutedNote } from '@/models/entities/MutedNote.js';
@@ -93,7 +92,6 @@ export {
GalleryPost,
Hashtag,
Instance,
- MessagingMessage,
Meta,
ModerationLog,
MutedNote,
@@ -163,7 +161,6 @@ export type GalleryLikesRepository = Repository<GalleryLike>;
export type GalleryPostsRepository = Repository<GalleryPost>;
export type HashtagsRepository = Repository<Hashtag>;
export type InstancesRepository = Repository<Instance>;
-export type MessagingMessagesRepository = Repository<MessagingMessage>;
export type MetasRepository = Repository<Meta>;
export type ModerationLogsRepository = Repository<ModerationLog>;
export type MutedNotesRepository = Repository<MutedNote>;
diff --git a/packages/backend/src/models/schema/messaging-message.ts b/packages/backend/src/models/schema/messaging-message.ts
deleted file mode 100644
index b1ffa45955..0000000000
--- a/packages/backend/src/models/schema/messaging-message.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-export const packedMessagingMessageSchema = {
- type: 'object',
- properties: {
- id: {
- type: 'string',
- optional: false, nullable: false,
- format: 'id',
- example: 'xxxxxxxxxx',
- },
- createdAt: {
- type: 'string',
- optional: false, nullable: false,
- format: 'date-time',
- },
- userId: {
- type: 'string',
- optional: false, nullable: false,
- format: 'id',
- },
- user: {
- type: 'object',
- ref: 'UserLite',
- optional: true, nullable: false,
- },
- text: {
- type: 'string',
- optional: false, nullable: true,
- },
- fileId: {
- type: 'string',
- optional: true, nullable: true,
- format: 'id',
- },
- file: {
- type: 'object',
- optional: true, nullable: true,
- ref: 'DriveFile',
- },
- recipientId: {
- type: 'string',
- optional: false, nullable: true,
- format: 'id',
- },
- recipient: {
- type: 'object',
- optional: true, nullable: true,
- ref: 'UserLite',
- },
- groupId: {
- type: 'string',
- optional: false, nullable: true,
- format: 'id',
- },
- group: {
- type: 'object',
- optional: true, nullable: true,
- ref: 'UserGroup',
- },
- isRead: {
- type: 'boolean',
- optional: true, nullable: false,
- },
- reads: {
- type: 'array',
- optional: true, nullable: false,
- items: {
- type: 'string',
- optional: false, nullable: false,
- format: 'id',
- },
- },
- },
-} as const;
diff --git a/packages/backend/src/models/schema/user.ts b/packages/backend/src/models/schema/user.ts
index 1fc9352539..c390018b46 100644
--- a/packages/backend/src/models/schema/user.ts
+++ b/packages/backend/src/models/schema/user.ts
@@ -311,10 +311,6 @@ export const packedMeDetailedOnlySchema = {
type: 'boolean',
nullable: false, optional: false,
},
- hasUnreadMessagingMessage: {
- type: 'boolean',
- nullable: false, optional: false,
- },
hasUnreadNotification: {
type: 'boolean',
nullable: false, optional: false,