summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/stream
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-08-16 17:51:28 +0900
committerGitHub <noreply@github.com>2023-08-16 17:51:28 +0900
commit792622aeadf3e36d50cddec3c64b2ff0105ea927 (patch)
treec42a71da86be3c33e2752b4c673e280b1158e57b /packages/backend/src/server/api/stream
parentbuild(deps): bump actions/setup-node from 3.7.0 to 3.8.0 (#11726) (diff)
downloadsharkey-792622aeadf3e36d50cddec3c64b2ff0105ea927.tar.gz
sharkey-792622aeadf3e36d50cddec3c64b2ff0105ea927.tar.bz2
sharkey-792622aeadf3e36d50cddec3c64b2ff0105ea927.zip
refactor: prefix Mi for all entities (#11719)
* wip * wip * wip * wip * Update RepositoryModule.ts * wip * wip * wip * Revert "wip" This reverts commit c1c13b37d2aaf3c65bc148212da302b0eb7868bf.
Diffstat (limited to 'packages/backend/src/server/api/stream')
-rw-r--r--packages/backend/src/server/api/stream/channels/user-list.ts4
-rw-r--r--packages/backend/src/server/api/stream/index.ts16
-rw-r--r--packages/backend/src/server/api/stream/types.ts126
3 files changed, 73 insertions, 73 deletions
diff --git a/packages/backend/src/server/api/stream/channels/user-list.ts b/packages/backend/src/server/api/stream/channels/user-list.ts
index 06b62e97c7..557b934722 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -5,7 +5,7 @@
import { Inject, Injectable } from '@nestjs/common';
import type { UserListJoiningsRepository, UserListsRepository } from '@/models/index.js';
-import type { User } from '@/models/entities/User.js';
+import type { MiUser } from '@/models/entities/User.js';
import { isUserRelated } from '@/misc/is-user-related.js';
import type { Packed } from '@/misc/json-schema.js';
import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
@@ -18,7 +18,7 @@ class UserListChannel extends Channel {
public static shouldShare = false;
public static requireCredential = false;
private listId: string;
- public listUsers: User['id'][] = [];
+ public listUsers: MiUser['id'][] = [];
private listUsersClock: NodeJS.Timer;
constructor(
diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index 62eaf1abc1..2991691151 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -4,14 +4,14 @@
*/
import * as WebSocket from 'ws';
-import type { User } from '@/models/entities/User.js';
-import type { AccessToken } from '@/models/entities/AccessToken.js';
+import type { MiUser } from '@/models/entities/User.js';
+import type { MiAccessToken } from '@/models/entities/AccessToken.js';
import type { Packed } from '@/misc/json-schema.js';
import type { NoteReadService } from '@/core/NoteReadService.js';
import type { NotificationService } from '@/core/NotificationService.js';
import { bindThis } from '@/decorators.js';
import { CacheService } from '@/core/CacheService.js';
-import { UserProfile } from '@/models/index.js';
+import { MiUserProfile } from '@/models/index.js';
import type { ChannelsService } from './ChannelsService.js';
import type { EventEmitter } from 'events';
import type Channel from './channel.js';
@@ -21,14 +21,14 @@ import type { StreamEventEmitter, StreamMessages } from './types.js';
* Main stream connection
*/
export default class Connection {
- public user?: User;
- public token?: AccessToken;
+ public user?: MiUser;
+ public token?: MiAccessToken;
private wsConnection: WebSocket.WebSocket;
public subscriber: StreamEventEmitter;
private channels: Channel[] = [];
private subscribingNotes: any = {};
private cachedNotes: Packed<'Note'>[] = [];
- public userProfile: UserProfile | null = null;
+ public userProfile: MiUserProfile | null = null;
public following: Set<string> = new Set();
public followingChannels: Set<string> = new Set();
public userIdsWhoMeMuting: Set<string> = new Set();
@@ -42,8 +42,8 @@ export default class Connection {
private notificationService: NotificationService,
private cacheService: CacheService,
- user: User | null | undefined,
- token: AccessToken | null | undefined,
+ user: MiUser | null | undefined,
+ token: MiAccessToken | null | undefined,
) {
if (user) this.user = user;
if (token) this.token = token;
diff --git a/packages/backend/src/server/api/stream/types.ts b/packages/backend/src/server/api/stream/types.ts
index 751a23de8d..531c00bdf6 100644
--- a/packages/backend/src/server/api/stream/types.ts
+++ b/packages/backend/src/server/api/stream/types.ts
@@ -3,51 +3,51 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
-import type { Channel } from '@/models/entities/Channel.js';
-import type { User } from '@/models/entities/User.js';
-import type { UserProfile } from '@/models/entities/UserProfile.js';
-import type { Note } from '@/models/entities/Note.js';
-import type { Antenna } from '@/models/entities/Antenna.js';
-import type { DriveFile } from '@/models/entities/DriveFile.js';
-import type { DriveFolder } from '@/models/entities/DriveFolder.js';
-import type { UserList } from '@/models/entities/UserList.js';
-import type { AbuseUserReport } from '@/models/entities/AbuseUserReport.js';
-import type { Signin } from '@/models/entities/Signin.js';
-import type { Page } from '@/models/entities/Page.js';
+import type { MiChannel } from '@/models/entities/Channel.js';
+import type { MiUser } from '@/models/entities/User.js';
+import type { MiUserProfile } from '@/models/entities/UserProfile.js';
+import type { MiNote } from '@/models/entities/Note.js';
+import type { MiAntenna } from '@/models/entities/Antenna.js';
+import type { MiDriveFile } from '@/models/entities/DriveFile.js';
+import type { MiDriveFolder } from '@/models/entities/DriveFolder.js';
+import type { MiUserList } from '@/models/entities/UserList.js';
+import type { MiAbuseUserReport } from '@/models/entities/AbuseUserReport.js';
+import type { MiSignin } from '@/models/entities/Signin.js';
+import type { MiPage } from '@/models/entities/Page.js';
import type { Packed } from '@/misc/json-schema.js';
-import type { Webhook } from '@/models/entities/Webhook.js';
-import type { Meta } from '@/models/entities/Meta.js';
-import { Role, RoleAssignment } from '@/models/index.js';
+import type { MiWebhook } from '@/models/entities/Webhook.js';
+import type { MiMeta } from '@/models/entities/Meta.js';
+import { MiRole, MiRoleAssignment } from '@/models/index.js';
import type Emitter from 'strict-event-emitter-types';
import type { EventEmitter } from 'events';
//#region Stream type-body definitions
export interface InternalStreamTypes {
- userChangeSuspendedState: { id: User['id']; isSuspended: User['isSuspended']; };
- userTokenRegenerated: { id: User['id']; oldToken: string; newToken: string; };
- remoteUserUpdated: { id: User['id']; };
- follow: { followerId: User['id']; followeeId: User['id']; };
- unfollow: { followerId: User['id']; followeeId: User['id']; };
- blockingCreated: { blockerId: User['id']; blockeeId: User['id']; };
- blockingDeleted: { blockerId: User['id']; blockeeId: User['id']; };
- policiesUpdated: Role['policies'];
- roleCreated: Role;
- roleDeleted: Role;
- roleUpdated: Role;
- userRoleAssigned: RoleAssignment;
- userRoleUnassigned: RoleAssignment;
- webhookCreated: Webhook;
- webhookDeleted: Webhook;
- webhookUpdated: Webhook;
- antennaCreated: Antenna;
- antennaDeleted: Antenna;
- antennaUpdated: Antenna;
- metaUpdated: Meta;
- followChannel: { userId: User['id']; channelId: Channel['id']; };
- unfollowChannel: { userId: User['id']; channelId: Channel['id']; };
- updateUserProfile: UserProfile;
- mute: { muterId: User['id']; muteeId: User['id']; };
- unmute: { muterId: User['id']; muteeId: User['id']; };
+ userChangeSuspendedState: { id: MiUser['id']; isSuspended: MiUser['isSuspended']; };
+ userTokenRegenerated: { id: MiUser['id']; oldToken: string; newToken: string; };
+ remoteUserUpdated: { id: MiUser['id']; };
+ follow: { followerId: MiUser['id']; followeeId: MiUser['id']; };
+ unfollow: { followerId: MiUser['id']; followeeId: MiUser['id']; };
+ blockingCreated: { blockerId: MiUser['id']; blockeeId: MiUser['id']; };
+ blockingDeleted: { blockerId: MiUser['id']; blockeeId: MiUser['id']; };
+ policiesUpdated: MiRole['policies'];
+ roleCreated: MiRole;
+ roleDeleted: MiRole;
+ roleUpdated: MiRole;
+ userRoleAssigned: MiRoleAssignment;
+ userRoleUnassigned: MiRoleAssignment;
+ webhookCreated: MiWebhook;
+ webhookDeleted: MiWebhook;
+ webhookUpdated: MiWebhook;
+ antennaCreated: MiAntenna;
+ antennaDeleted: MiAntenna;
+ antennaUpdated: MiAntenna;
+ metaUpdated: MiMeta;
+ followChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
+ unfollowChannel: { userId: MiUser['id']; channelId: MiChannel['id']; };
+ updateUserProfile: MiUserProfile;
+ mute: { muterId: MiUser['id']; muteeId: MiUser['id']; };
+ unmute: { muterId: MiUser['id']; muteeId: MiUser['id']; };
}
export interface BroadcastTypes {
@@ -79,10 +79,10 @@ export interface MainStreamTypes {
unfollow: Packed<'User'>;
meUpdated: Packed<'User'>;
pageEvent: {
- pageId: Page['id'];
+ pageId: MiPage['id'];
event: string;
var: any;
- userId: User['id'];
+ userId: MiUser['id'];
user: Packed<'User'>;
};
urlUploadFinished: {
@@ -91,22 +91,22 @@ export interface MainStreamTypes {
};
readAllNotifications: undefined;
unreadNotification: Packed<'Notification'>;
- unreadMention: Note['id'];
+ unreadMention: MiNote['id'];
readAllUnreadMentions: undefined;
- unreadSpecifiedNote: Note['id'];
+ unreadSpecifiedNote: MiNote['id'];
readAllUnreadSpecifiedNotes: undefined;
readAllAntennas: undefined;
- unreadAntenna: Antenna;
+ unreadAntenna: MiAntenna;
readAllAnnouncements: undefined;
myTokenRegenerated: undefined;
- signin: Signin;
+ signin: MiSignin;
registryUpdated: {
scope?: string[];
key: string;
value: any | null;
};
driveFileCreated: Packed<'DriveFile'>;
- readAntenna: Antenna;
+ readAntenna: MiAntenna;
receiveFollowRequest: Packed<'User'>;
announcementCreated: {
announcement: Packed<'Announcement'>;
@@ -115,17 +115,17 @@ export interface MainStreamTypes {
export interface DriveStreamTypes {
fileCreated: Packed<'DriveFile'>;
- fileDeleted: DriveFile['id'];
+ fileDeleted: MiDriveFile['id'];
fileUpdated: Packed<'DriveFile'>;
folderCreated: Packed<'DriveFolder'>;
- folderDeleted: DriveFolder['id'];
+ folderDeleted: MiDriveFolder['id'];
folderUpdated: Packed<'DriveFolder'>;
}
export interface NoteStreamTypes {
pollVoted: {
choice: number;
- userId: User['id'];
+ userId: MiUser['id'];
};
deleted: {
deletedAt: Date;
@@ -136,16 +136,16 @@ export interface NoteStreamTypes {
name: string;
url: string;
} | null;
- userId: User['id'];
+ userId: MiUser['id'];
};
unreacted: {
reaction: string;
- userId: User['id'];
+ userId: MiUser['id'];
};
}
type NoteStreamEventTypes = {
[key in keyof NoteStreamTypes]: {
- id: Note['id'];
+ id: MiNote['id'];
body: NoteStreamTypes[key];
};
};
@@ -156,7 +156,7 @@ export interface UserListStreamTypes {
}
export interface AntennaStreamTypes {
- note: Note;
+ note: MiNote;
}
export interface RoleTimelineStreamTypes {
@@ -165,9 +165,9 @@ export interface RoleTimelineStreamTypes {
export interface AdminStreamTypes {
newAbuseUserReport: {
- id: AbuseUserReport['id'];
- targetUserId: User['id'],
- reporterId: User['id'],
+ id: MiAbuseUserReport['id'];
+ targetUserId: MiUser['id'],
+ reporterId: MiUser['id'],
comment: string;
};
}
@@ -209,31 +209,31 @@ export type StreamMessages = {
payload: EventUnionFromDictionary<SerializedAll<BroadcastTypes>>;
};
main: {
- name: `mainStream:${User['id']}`;
+ name: `mainStream:${MiUser['id']}`;
payload: EventUnionFromDictionary<SerializedAll<MainStreamTypes>>;
};
drive: {
- name: `driveStream:${User['id']}`;
+ name: `driveStream:${MiUser['id']}`;
payload: EventUnionFromDictionary<SerializedAll<DriveStreamTypes>>;
};
note: {
- name: `noteStream:${Note['id']}`;
+ name: `noteStream:${MiNote['id']}`;
payload: EventUnionFromDictionary<SerializedAll<NoteStreamEventTypes>>;
};
userList: {
- name: `userListStream:${UserList['id']}`;
+ name: `userListStream:${MiUserList['id']}`;
payload: EventUnionFromDictionary<SerializedAll<UserListStreamTypes>>;
};
roleTimeline: {
- name: `roleTimelineStream:${Role['id']}`;
+ name: `roleTimelineStream:${MiRole['id']}`;
payload: EventUnionFromDictionary<SerializedAll<RoleTimelineStreamTypes>>;
};
antenna: {
- name: `antennaStream:${Antenna['id']}`;
+ name: `antennaStream:${MiAntenna['id']}`;
payload: EventUnionFromDictionary<SerializedAll<AntennaStreamTypes>>;
};
admin: {
- name: `adminStream:${User['id']}`;
+ name: `adminStream:${MiUser['id']}`;
payload: EventUnionFromDictionary<SerializedAll<AdminStreamTypes>>;
};
notes: {