Merge branch 'dev' into stable

storycraft · Dec 3, 2020 · 0572fac · 0572fac
2 parents b62ee68 + cbabd6b
commit 0572fac
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-kakao",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "Loco protocol compatible library",
   "main": "dist/index.js",
   "scripts": {

diff --git a/src/api/service-client.ts b/src/api/service-client.ts
@@ -103,6 +103,10 @@ export class ServiceClient extends SessionApiClient {
 
     // profile
 
+    async requestMusicList(id: Long): Promise<WebApiStruct> {
+        return this.request('GET', ServiceClient.getProfileApiPath(this.Agent, 'music/list.json'), { id: id.toString() });
+    }
+
     async requestMyProfile(): Promise<ProfileReqStruct> {
         return this.request('GET', ServiceClient.getProfile3ApiPath(this.Agent, 'me.json'));
     }
@@ -125,6 +129,10 @@ export class ServiceClient extends SessionApiClient {
         return `${agent}/friends/${api}`;
     }
 
+    static getProfileApiPath(agent: string, api: string) {
+        return `${agent}/profile/${api}`;
+    }
+
     static getProfile3ApiPath(agent: string, api: string) {
         return `${agent}/profile3/${api}`;
     }

diff --git a/src/packet/packet-chat-on-room.ts b/src/packet/packet-chat-on-room.ts
@@ -44,7 +44,8 @@ export class PacketChatOnRoomRes extends LocoBsonResponsePacket {
     constructor(
         status: number,
         public ChannelId: Long = Long.ZERO,
-        public MemberList: (MemberStruct | OpenMemberStruct)[] = [],
+        public MemberList?: (MemberStruct | OpenMemberStruct)[],
+        public MemberIdList?: Long[],
         public Type: ChannelType = ChannelType.UNKNOWN,
         public WatermarkList: Long[] = [],
         public OpenChatToken: number = 0,
@@ -73,6 +74,10 @@ export class PacketChatOnRoomRes extends LocoBsonResponsePacket {
             }
         }
 
+        if (rawData['mi']) {
+            this.MemberIdList = rawData['mi'];
+        }
+
         if (rawData['olu']) this.ClientOpenProfile = Serializer.deserialize<OpenLinkMemberStruct>(rawData['olu'], OpenLinkMemberStruct.MAPPER);
     }
 

diff --git a/src/packet/packet-rewrite.ts b/src/packet/packet-rewrite.ts
@@ -17,8 +17,8 @@ export class PacketRewriteReq extends LocoBsonRequestPacket {
         public LogId: Long = Long.ZERO,
         public Type: ChatType = ChatType.Text,
         public RewriteFeedType: FeedType = FeedType.OPENLINK_REWRITE_FEED,
-        public Unknown1: string = '', //Chat Reporting?
-        public Unknown2: string = '',
+        public ReportChannelLink: string = '', // Report channel 
+        public Category: string = '', // Report Category
     ) {
         super();
     }
@@ -35,12 +35,12 @@ export class PacketRewriteReq extends LocoBsonRequestPacket {
             't': this.Type
         };
 
-        if (this.Unknown1 !== '') {
-            obj['rcli'] = this.Unknown1;
+        if (this.ReportChannelLink !== '') {
+            obj['rcli'] = this.ReportChannelLink;
         }
 
-        if (this.Unknown2 !== '') {
-            obj['cat'] = this.Unknown2;
+        if (this.Category !== '') {
+            obj['cat'] = this.Category;
         }
 
         if (this.RewriteFeedType === FeedType.RICH_CONTENT) {

diff --git a/src/talk/channel/channel-manager.ts b/src/talk/channel/channel-manager.ts
@@ -38,6 +38,8 @@ import { PacketAddMemberReq, PacketAddMemberRes } from "../../packet/packet-add-
 import { PacketKickLeaveReq, PacketKickLeaveRes } from "../../packet/packet-kick-leave";
 import { JsonUtil } from "../../util/json-util";
 import { PacketCheckJoinReq, PacketCheckJoinRes } from "../../packet/packet-check-join";
+import { PacketGetMemberReq, PacketGetMemberRes } from "../../packet/packet-get-member";
+import { PacketMemberReq, PacketMemberRes } from "../../packet/packet-member";
 
 export class ChannelManager extends IdStore<ChatChannel> {
 
@@ -91,7 +93,14 @@ export class ChannelManager extends IdStore<ChatChannel> {
 
         }
 
+        let memberList = await this.requestMemberList(channel.Id);
+
+        if (memberList) {
+            this.updateUserInfoList(channel, memberList);
+        }
+
         await this.sendChatOn(channel);
+
         this.set(id, channel);
 
         return channel;
@@ -122,7 +131,7 @@ export class ChannelManager extends IdStore<ChatChannel> {
         if (channelInfo.displayMemberList) channel.updateDisplayUserInfoList(channelInfo.displayMemberList.map(this.getDisplayUserInfoFromStruct.bind(this)));
     }
 
-    protected initUserInfoList(channel: ManagedChatChannel, memberList: (MemberStruct | OpenMemberStruct)[], openProfile?: OpenMemberStruct) {
+    protected updateUserInfoList(channel: ManagedChatChannel, memberList: (MemberStruct | OpenMemberStruct)[], openProfile?: OpenMemberStruct) {
         if (!channel.isOpenChat()) {
             let normal = channel as ManagedChatChannel;
 
@@ -217,15 +226,45 @@ export class ChannelManager extends IdStore<ChatChannel> {
         }
     }
 
+    protected async requestMemberList(channelId: Long): Promise<(MemberStruct | OpenMemberStruct)[] | null> {
+        let res = await this.client.NetworkManager.requestPacketRes<PacketGetMemberRes>(new PacketGetMemberReq(channelId));
+
+        if (res.StatusCode === StatusCode.SUCCESS) {
+            return res.MemberList!;
+        } else {
+            return null;
+        }
+    }
+
+    protected async requestDetailedMemberList(channelId: Long, memberIdList?: Long[]): Promise<(MemberStruct | OpenMemberStruct)[] | null> {
+        if (!memberIdList) {
+            let simplfiedList = await this.requestMemberList(channelId);
+
+            if (!simplfiedList) return null;
+
+            memberIdList = simplfiedList.map(member => member.userId);
+
+        }
+        let res = await this.client.NetworkManager.requestPacketRes<PacketMemberRes>(new PacketMemberReq(channelId, memberIdList));
+
+        if (res.StatusCode === StatusCode.SUCCESS) {
+            return res.MemberList!;
+        } else {
+            return null;
+        }
+    }
+
     async sendChatOn(channel: ChatChannel): Promise<RequestResult<boolean>> {
         let token = channel.LastChat ? channel.LastChat.LogId : Long.ZERO;
         let openToken;
         if (channel.isOpenChat()) openToken = (channel as OpenChatChannel).OpenToken;
 
         let res = await this.client.NetworkManager.requestPacketRes<PacketChatOnRoomRes>(new PacketChatOnRoomReq(channel.Id, token, openToken));
 
-        this.initUserInfoList(channel as ManagedChatChannel, res.MemberList, res.ClientOpenProfile);
-
+        if (res.MemberList) {
+            this.updateUserInfoList(channel as ManagedChatChannel, res.MemberList, res.ClientOpenProfile);
+        }
+
         return { status: res.StatusCode, result: res.StatusCode === StatusCode.SUCCESS };
     }