wx2tg-puppet 1.1.3 → 1.1.4

package/dist/core/Contact.js

@@ -112,17 +112,14 @@ class Contact {
      * Get the name from a contact
      */
     name() {
-        var _a;
-        // TODO: Implement name retrieval
-        return ((_a = this.contact) === null || _a === void 0 ? void 0 : _a.nickName) || '';
+        return this._nickName;
     }
     /**
      * Get the alias for a contact
      */
     alias() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            return ((_a = this.contact) === null || _a === void 0 ? void 0 : _a.remark) || '';
+            return this._alias || '';
         });
     }
     /**
@@ -187,7 +184,7 @@ class Contact {
             }
             const contact = {
                 userName: (_e = (_d = detailDataSave.UserName) === null || _d === void 0 ? void 0 : _d.string) !== null && _e !== void 0 ? _e : '',
-                nickName: (_g = (_f = detailDataSave.NickName) === null || _f === void 0 ? void 0 : _f.string) !== null && _g !== void 0 ? _g : '',
+                nickName: (_g = (_f = detailDataSave.NickName) === null || _f === void 0 ? void 0 : _f.string) !== null && _g !== void 0 ? _g : 'no name',
                 pyInitial: (_j = (_h = detailDataSave.Pyinitial) === null || _h === void 0 ? void 0 : _h.string) !== null && _j !== void 0 ? _j : '',
                 quanPin: (_l = (_k = detailDataSave.QuanPin) === null || _k === void 0 ? void 0 : _k.string) !== null && _l !== void 0 ? _l : '',
                 sex: (_m = detailDataSave.Sex) !== null && _m !== void 0 ? _m : null,

package/dist/core/Message.js

@@ -60,6 +60,8 @@ const path_1 = __importDefault(require("path"));
 const common_2 = require("../action/common");
 const fs = __importStar(require("fs"));
 const FileChunkHelper_1 = require("../utils/FileChunkHelper");
+const GroupApi_1 = require("../api/GroupApi");
+const contact_service_1 = require("../services/contact.service");
 const MAX_RETRIES = 3;
 const RETRY_DELAY = 1000; // 1 second
 // @ts-ignore - Ignore type errors for the entire function since we're dealing with a mix of old and new axios types
@@ -129,6 +131,41 @@ class Message {
      */
     from() {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+            if (this.msg.RoomId) {
+                const contact = yield contact_service_1.contactService.getByUserName(this.msg.FromUserName);
+                if (contact) {
+                    return new Contact_1.Contact(contact);
+                }
+                const config = yield config_service_1.configService.get();
+                const groupMember = yield GroupApi_1.groupApi.GetChatRoomMemberDetail({
+                    "QID": this.msg.RoomId,
+                    "Wxid": config === null || config === void 0 ? void 0 : config.wxid
+                });
+                const member = groupMember.data.Data.NewChatroomData.ChatRoomMember.find((i) => i.UserName === this.msg.FromUserName);
+                return new Contact_1.Contact({
+                    userName: (_a = member.UserName) !== null && _a !== void 0 ? _a : '',
+                    nickName: (_b = member.NickName) !== null && _b !== void 0 ? _b : '',
+                    pyInitial: (_c = member.Pyinitial) !== null && _c !== void 0 ? _c : '',
+                    quanPin: (_d = member.QuanPin) !== null && _d !== void 0 ? _d : '',
+                    sex: (_e = member.Sex) !== null && _e !== void 0 ? _e : null,
+                    remark: (_f = member.Remark) !== null && _f !== void 0 ? _f : '',
+                    remarkPyInitial: (_g = member.RemarkPyinitial) !== null && _g !== void 0 ? _g : '',
+                    remarkQuanPin: (_h = member.RemarkQuanPin) !== null && _h !== void 0 ? _h : '',
+                    signature: (_j = member.Signature) !== null && _j !== void 0 ? _j : '',
+                    alias: (_k = member.Alias) !== null && _k !== void 0 ? _k : '',
+                    snsBgImg: (_m = (_l = member.SnsUserInfo) === null || _l === void 0 ? void 0 : _l.SnsBgimgId) !== null && _m !== void 0 ? _m : '',
+                    country: (_o = member.Country) !== null && _o !== void 0 ? _o : '',
+                    bigHeadImgUrl: (_p = member.BigHeadImgUrl) !== null && _p !== void 0 ? _p : '',
+                    smallHeadImgUrl: (_q = member.SmallHeadImgUrl) !== null && _q !== void 0 ? _q : '',
+                    description: '', // 详情数据中没有明确字段
+                    cardImgUrl: '', // 详情数据中没有明确字段
+                    labelList: '', // 详情数据中没有明确字段
+                    province: (_r = member.Province) !== null && _r !== void 0 ? _r : '',
+                    city: (_s = member.City) !== null && _s !== void 0 ? _s : '',
+                    phoneNumList: '', // 详情数据中没有明确字段
+                });
+            }
             return Contact_1.Contact.find({
                 id: this.msg.FromUserName
             });

package/dist/core/Room.js

@@ -23,7 +23,7 @@ class Room {
         this.id = room.chatroomId;
         this.room = room;
         this.chatroomId = room.chatroomId;
-        this.name = room.nickName;
+        this.name = room.nickName || '未命名群聊';
         this.remark = room.remark;
     }
     /**
@@ -68,7 +68,7 @@ class Room {
                 return null;
             const roomEntity = {
                 chatroomId: ((_a = respData.UserName) === null || _a === void 0 ? void 0 : _a.string) || '',
-                nickName: ((_b = respData.NickName) === null || _b === void 0 ? void 0 : _b.string) || '',
+                nickName: ((_b = respData.NickName) === null || _b === void 0 ? void 0 : _b.string) || '未命名群聊',
                 pyInitial: ((_c = respData.Pyinitial) === null || _c === void 0 ? void 0 : _c.string) || '',
                 quanPin: ((_d = respData.QuanPin) === null || _d === void 0 ? void 0 : _d.string) || '',
                 sex: (_e = respData.Sex) !== null && _e !== void 0 ? _e : 0,

package/dist/index.js

@@ -24,6 +24,7 @@ const config_service_1 = require("./services/config.service");
 const events_1 = require("events");
 const Message_1 = require("./core/Message");
 Object.defineProperty(exports, "Message", { enumerable: true, get: function () { return Message_1.Message; } });
+const contact_service_1 = require("./services/contact.service");
 const Contact_1 = require("./core/Contact");
 Object.defineProperty(exports, "Contact", { enumerable: true, get: function () { return Contact_1.Contact; } });
 const Room_1 = require("./core/Room");
@@ -39,6 +40,7 @@ Object.defineProperty(exports, "UrlLink", { enumerable: true, get: function () {
 const MessageType_1 = require("./type/MessageType");
 const Friendship_1 = require("./core/Friendship");
 const UserApi_1 = require("./api/UserApi");
+const ContactEntity_1 = require("./entities/ContactEntity");
 class WxBot extends events_1.EventEmitter {
     constructor({ baseUrl, databasePath }) {
         super();
@@ -171,6 +173,7 @@ class WxBot extends events_1.EventEmitter {
     }
     loginSuccess(userName) {
         return __awaiter(this, void 0, void 0, function* () {
+            contact_service_1.contactService.clearRoom();
             this.clearAllIntervals(); // 确保清理所有定时器
             // 保存联系人信息
             const res = yield FriendApi_1.friendApi.GetContractList({
@@ -195,7 +198,12 @@ class WxBot extends events_1.EventEmitter {
             // 获取详情
             const data = res.data;
             data.Data.ContactUsernameList.forEach((contact) => {
-                Contact_1.Contact.fetchAndUpsertContactDetail(userName, contact);
+                if (!contact.endsWith('@chatroom')) {
+                    Contact_1.Contact.fetchAndUpsertContactDetail(userName, contact);
+                }
+                else {
+                    Room_1.Room.find({ id: contact });
+                }
             });
             // 设置心跳包
             this.setupHeartbeat(userName);
@@ -206,6 +214,7 @@ class WxBot extends events_1.EventEmitter {
             }
             // 监听消息，每秒掉一次
             this.msgInterval = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                var _a;
                 const resp = yield MsgApi_1.msgApi.Sync({
                     "wxid": userName,
                     "Scene": 0,
@@ -250,6 +259,18 @@ class WxBot extends events_1.EventEmitter {
                             IsSelf: msg.FromUserName.string === userName,
                             xml: msg.Content.string
                         });
+                        // 处理企业微信
+                        if ((_a = message.fromId) === null || _a === void 0 ? void 0 : _a.includes('@openim')) {
+                            let contactE = yield contact_service_1.contactService.getByUserName(message.fromId);
+                            if (!contactE) {
+                                contactE = new ContactEntity_1.ContactEntity();
+                            }
+                            contactE.nickName = message._pushContent.split(':')[0].slice(0, -1);
+                            contactE.userName = message.fromId;
+                            contactE.smallHeadImgUrl = 'https://raw.githubusercontent.com/finalpi/wechat2tg/wx2tg-pad/qywx.jpg';
+                            contactE.bigHeadImgUrl = 'https://raw.githubusercontent.com/finalpi/wechat2tg/wx2tg-pad/qywx.jpg';
+                            contact_service_1.contactService.upsertByUsername(contactE.userName, contactE);
+                        }
                         if (message.type() === MessageType_1.MessageType.AddFriend) { // 好友请求
                             const obj = Message_1.Message.getXmlToJson(message.text());
                             console.log(obj);

package/dist/services/contact.service.d.ts

@@ -5,6 +5,7 @@ declare class ContactService {
     getAll(): Promise<ContactEntity[]>;
     save(contact: Partial<ContactEntity>): Promise<ContactEntity>;
     update(userName: string, update: Partial<ContactEntity>): Promise<ContactEntity | null>;
+    clearRoom(): Promise<void>;
     upsertByUsername(userName: string, data: Partial<ContactEntity>): Promise<ContactEntity>;
     delete(userName: string): Promise<boolean>;
     searchByNickNameOrRemark(keyword: string): Promise<ContactEntity[]>;

package/dist/services/contact.service.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.contactService = void 0;
+const typeorm_1 = require("typeorm");
 const data_source_1 = require("../database/data-source");
 const ContactEntity_1 = require("../entities/ContactEntity");
 class ContactService {
@@ -41,6 +42,13 @@ class ContactService {
             return this.repo.save(entity);
         });
     }
+    clearRoom() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.repo.delete({
+                userName: (0, typeorm_1.Like)('%@chatroom')
+            });
+        });
+    }
     upsertByUsername(userName, data) {
         return __awaiter(this, void 0, void 0, function* () {
             let contact = yield this.getByUserName(userName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wx2tg-puppet",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [