Skip to content

Commit 90349b2

Browse files
huanhuan
authored
Merge branch 'main' into feat/channel-message-wechaty
2 parents 53f8fd4 + 497fcaf commit 90349b2

File tree

5 files changed

+60
-45
lines changed

5 files changed

+60
-45
lines changed

‎src/mixins/room-mixin.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ const roomMixin = <MixinBase extends typeof PuppetSkeleton & ContactMixin & Room
3030
* Room
3131
*
3232
*/
33-
abstract roomAdd (roomId: string, contactId: string, inviteOnly?: boolean) : Promise<void>
34-
abstract roomAvatar (roomId: string) : Promise<FileBoxInterface>
35-
abstract roomCreate (contactIdList: string[], topic?: string) : Promise<string>
36-
abstract roomDel (roomId: string, contactId: string) : Promise<void>
37-
abstract roomList () : Promise<string[]>
38-
abstract roomQRCode (roomId: string) : Promise<string>
39-
abstract roomQuit (roomId: string) : Promise<void>
40-
abstract roomTopic (roomId: string) : Promise<string>
41-
abstract roomTopic (roomId: string, topic: string) : Promise<void>
33+
abstract roomAdd (roomId: string, contactId: string | string[], inviteOnly?: boolean): Promise<void>
34+
abstract roomAvatar (roomId: string) : Promise<FileBoxInterface>
35+
abstract roomCreate (contactIdList: string[], topic?: string) : Promise<string>
36+
abstract roomDel (roomId: string, contactId: string | string[]) : Promise<void>
37+
abstract roomList () : Promise<string[]>
38+
abstract roomQRCode (roomId: string) : Promise<string>
39+
abstract roomQuit (roomId: string) : Promise<void>
40+
abstract roomTopic (roomId: string) : Promise<string>
41+
abstract roomTopic (roomId: string, topic: string) : Promise<void>
4242

4343
/**
4444
* Issue #155 - https://github.com/wechaty/puppet/issues/155

‎src/mods/payloads.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import type {
1515
EventRoomJoinPayload,
1616
EventRoomLeavePayload,
1717
EventRoomTopicPayload,
18+
EventRoomAnnouncePayload,
1819
EventScanPayload,
1920
FriendshipPayload,
2021
FriendshipPayloadConfirm,
@@ -60,6 +61,7 @@ export type {
6061
EventRoomJoinPayload as EventRoomJoin,
6162
EventRoomLeavePayload as EventRoomLeave,
6263
EventRoomTopicPayload as EventRoomTopic,
64+
EventRoomAnnouncePayload as EventRoomAnnounce,
6365
EventScanPayload as EventScan,
6466
FriendshipPayload as Friendship,
6567
FriendshipPayloadConfirm as FriendshipConfirm,

‎src/puppet/events.ts

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,47 +18,50 @@ import type {
1818
EventScanPayload,
1919
EventReadyPayload,
2020
EventHeartbeatPayload,
21+
EventRoomAnnouncePayload,
2122
} from '../schemas/event.js'
2223

23-
export type PuppetDirtyListener = (payload: EventDirtyPayload) => void | Promise<void>
24-
export type PuppetDongListener = (payload: EventDongPayload) => void | Promise<void>
25-
export type PuppetErrorListener = (payload: EventErrorPayload) => void | Promise<void>
26-
export type PuppetFriendshipListener = (payload: EventFriendshipPayload) => void | Promise<void>
27-
export type PuppetHeartbeatListener = (payload: EventHeartbeatPayload) => void | Promise<void>
28-
export type PuppetLoginListener = (payload: EventLoginPayload) => void | Promise<void>
29-
export type PuppetLogoutListener = (payload: EventLogoutPayload) => void | Promise<void>
30-
export type PuppetMessageListener = (payload: EventMessagePayload) => void | Promise<void>
31-
export type PuppetPostListener = (payload: EventPostPayload) => void | Promise<void>
32-
export type PuppetReadyListener = (payload: EventReadyPayload) => void | Promise<void>
33-
export type PuppetResetListener = (payload: EventResetPayload) => void | Promise<void>
34-
export type PuppetRoomInviteListener = (payload: EventRoomInvitePayload) => void | Promise<void>
35-
export type PuppetRoomJoinListener = (payload: EventRoomJoinPayload) => void | Promise<void>
36-
export type PuppetRoomLeaveListener = (payload: EventRoomLeavePayload) => void | Promise<void>
37-
export type PuppetRoomTopicListener = (payload: EventRoomTopicPayload) => void | Promise<void>
38-
export type PuppetScanListener = (payload: EventScanPayload) => void | Promise<void>
24+
export type PuppetDirtyListener = (payload: EventDirtyPayload) => void | Promise<void>
25+
export type PuppetDongListener = (payload: EventDongPayload) => void | Promise<void>
26+
export type PuppetErrorListener = (payload: EventErrorPayload) => void | Promise<void>
27+
export type PuppetFriendshipListener = (payload: EventFriendshipPayload) => void | Promise<void>
28+
export type PuppetHeartbeatListener = (payload: EventHeartbeatPayload) => void | Promise<void>
29+
export type PuppetLoginListener = (payload: EventLoginPayload) => void | Promise<void>
30+
export type PuppetLogoutListener = (payload: EventLogoutPayload) => void | Promise<void>
31+
export type PuppetMessageListener = (payload: EventMessagePayload) => void | Promise<void>
32+
export type PuppetPostListener = (payload: EventPostPayload) => void | Promise<void>
33+
export type PuppetReadyListener = (payload: EventReadyPayload) => void | Promise<void>
34+
export type PuppetResetListener = (payload: EventResetPayload) => void | Promise<void>
35+
export type PuppetRoomInviteListener = (payload: EventRoomInvitePayload) => void | Promise<void>
36+
export type PuppetRoomJoinListener = (payload: EventRoomJoinPayload) => void | Promise<void>
37+
export type PuppetRoomLeaveListener = (payload: EventRoomLeavePayload) => void | Promise<void>
38+
export type PuppetRoomTopicListener = (payload: EventRoomTopicPayload) => void | Promise<void>
39+
export type PuppetRoomAnnounceListener = (payload: EventRoomAnnouncePayload)=> void | Promise<void>
40+
export type PuppetScanListener = (payload: EventScanPayload) => void | Promise<void>
3941

40-
export type PuppetStartListener = () => void | Promise<void>
41-
export type PuppetStopListener = () => void | Promise<void>
42+
export type PuppetStartListener = () => void | Promise<void>
43+
export type PuppetStopListener = () => void | Promise<void>
4244

4345
interface PuppetEventListener {
44-
dirty : PuppetDirtyListener
45-
dong : PuppetDongListener
46-
error : PuppetErrorListener
47-
friendship : PuppetFriendshipListener
48-
heartbeat : PuppetHeartbeatListener
49-
login : PuppetLoginListener
50-
logout : PuppetLogoutListener
51-
message : PuppetMessageListener
52-
post : PuppetPostListener
53-
ready : PuppetReadyListener
54-
reset : PuppetResetListener
55-
'room-invite' : PuppetRoomInviteListener
56-
'room-join' : PuppetRoomJoinListener
57-
'room-leave' : PuppetRoomLeaveListener
58-
'room-topic' : PuppetRoomTopicListener
59-
scan : PuppetScanListener
60-
start : PuppetStartListener,
61-
stop : PuppetStopListener,
46+
dirty : PuppetDirtyListener
47+
dong : PuppetDongListener
48+
error : PuppetErrorListener
49+
friendship : PuppetFriendshipListener
50+
heartbeat : PuppetHeartbeatListener
51+
login : PuppetLoginListener
52+
logout : PuppetLogoutListener
53+
message : PuppetMessageListener
54+
post : PuppetPostListener
55+
ready : PuppetReadyListener
56+
reset : PuppetResetListener
57+
'room-invite' : PuppetRoomInviteListener
58+
'room-join' : PuppetRoomJoinListener
59+
'room-leave' : PuppetRoomLeaveListener
60+
'room-topic' : PuppetRoomTopicListener
61+
'room-announce': PuppetRoomAnnounceListener
62+
scan : PuppetScanListener
63+
start : PuppetStartListener,
64+
stop : PuppetStopListener,
6265
}
6366

6467
const PuppetEventEmitter = EventEmitter as unknown as new () =>

‎src/schemas/event.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,14 @@ export interface EventRoomTopicPayload {
5959
timestamp : number,
6060
}
6161

62+
export interface EventRoomAnnouncePayload {
63+
changerId: string,
64+
newAnnounce: string,
65+
oldAnnounce?: string,
66+
roomId: string,
67+
timestamp: number
68+
}
69+
6270
export interface EventScanPayload {
6371
status: ScanStatus,
6472

‎src/schemas/mod.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ import type {
6565
EventRoomJoinPayload,
6666
EventRoomLeavePayload,
6767
EventRoomTopicPayload,
68+
EventRoomAnnouncePayload,
6869
EventScanPayload,
6970
} from './event.js'
7071
import type {
@@ -145,6 +146,7 @@ export {
145146
type EventRoomJoinPayload,
146147
type EventRoomLeavePayload,
147148
type EventRoomTopicPayload,
149+
type EventRoomAnnouncePayload,
148150
type EventScanPayload,
149151
type FriendshipAddOptions,
150152
type FriendshipPayload,

0 commit comments

Comments
 (0)