diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2021-10-21 01:04:10 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-21 01:04:10 +0900 |
| commit | 69b56f6658dcbef0a54fa030ebf30913ca3d30bd (patch) | |
| tree | 376ee75076a4c7de6be2c6b3a54168319b8ded84 /src/server/api/stream/channels/messaging.ts | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | sharkey-69b56f6658dcbef0a54fa030ebf30913ca3d30bd.tar.gz sharkey-69b56f6658dcbef0a54fa030ebf30913ca3d30bd.tar.bz2 sharkey-69b56f6658dcbef0a54fa030ebf30913ca3d30bd.zip | |
refactor: publishHogeStreamとStreamのEventEmitterに型定義する (#7769)
* wip
* wip
* wip
* :v:
* add main stream
* packedNotificationSchemaを更新
* read:gallery, write:gallery, read:gallery-likes, write:gallery-likesに翻訳を追加
* fix
* ok
* add header, choice, invitation
* add header, choice, invitation
* test
* fix
* fix
* yatta
* remove no longer needed "as PackedUser/PackedNote"
* clean up
* add simple-schema
* fix lint
* fix lint
* wip
* wip!
* wip
* fix
* wip
* wip
* :v:
* 送信側に型エラーがないことを3回確認した
* :v:
* wip
* update typescript
* define items in full Schema
* edit comment
* edit comment
* edit comment
* Update src/prelude/types.ts
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
* https://github.com/misskey-dev/misskey/pull/7769#discussion_r703058458
* user packとnote packの型不整合を修正
* revert https://github.com/misskey-dev/misskey/pull/7772#discussion_r706627736
* revert https://github.com/misskey-dev/misskey/pull/7772#discussion_r706627736
* user packとnote packの型不整合を修正
* add prelude/types.ts
* emoji
* signin
* game
* matching
* 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 changelog
* add changelog
* add changelog
* fix: アンテナが既読にならないのを修正
* revert fix
* https://github.com/misskey-dev/misskey/pull/7769#discussion_r711474875
* spec => payload
* edit commetn
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Diffstat (limited to 'src/server/api/stream/channels/messaging.ts')
| -rw-r--r-- | src/server/api/stream/channels/messaging.ts | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/api/stream/channels/messaging.ts b/src/server/api/stream/channels/messaging.ts index 015b0a7650..c049e880b9 100644 --- a/src/server/api/stream/channels/messaging.ts +++ b/src/server/api/stream/channels/messaging.ts @@ -3,6 +3,8 @@ import { readUserMessagingMessage, readGroupMessagingMessage, deliverReadActivit import Channel from '../channel'; import { UserGroupJoinings, Users, MessagingMessages } from '@/models/index'; import { User, ILocalUser, IRemoteUser } from '@/models/entities/user'; +import { UserGroup } from '@/models/entities/user-group'; +import { StreamMessages } from '../types'; export default class extends Channel { public readonly chName = 'messaging'; @@ -12,7 +14,7 @@ export default class extends Channel { private otherpartyId: string | null; private otherparty: User | null; private groupId: string | null; - private subCh: string; + private subCh: `messagingStream:${User['id']}-${User['id']}` | `messagingStream:${UserGroup['id']}`; private typers: Record<User['id'], Date> = {}; private emitTypersIntervalId: ReturnType<typeof setInterval>; @@ -45,7 +47,7 @@ export default class extends Channel { } @autobind - private onEvent(data: any) { + private onEvent(data: StreamMessages['messaging']['payload'] | StreamMessages['groupMessaging']['payload']) { if (data.type === 'typing') { const id = data.body; const begin = this.typers[id] == null; |