From 729af26e98a3707b657861d1afd8a8ca4a5729ba Mon Sep 17 00:00:00 2001
From: hackrobot <xiaoshuang.eric@gmail.com>
Date: Wed, 10 Apr 2024 19:30:46 +0800
Subject: [PATCH] =?UTF-8?q?H5=E9=82=80=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py | 44 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/main.py b/main.py
index 248f10b..190145e 100644
--- a/main.py
+++ b/main.py
@@ -108,6 +108,37 @@ def read_users(wxid, db: Session = Depends(get_db)):
     return {"code": 200, "success": "ok", "message": "群聊邀请已发送"}
 
 
+# 加入微信群
+@app.get("/h5group")
+# 群-异度星球 49187487591@chatroom  chatroom
+def h5group(nickname, db: Session = Depends(get_db)):
+    # debug
+    # chatroomId = '49187487591@chatroom'
+    # 判断是否在群中
+    inGroup = False
+    groupList = WXBotService.get_group_members_list(
+        robot_wxid=config.account_wxid, from_wxid=config.chatroomId)
+    print('groupList', groupList)
+    for groupItem in groupList['data']:
+        if groupItem['nickname'] == nickname:
+            inGroup = True
+    if inGroup:
+        return {"code": 200, "success": "fail", "message": "已经在群聊中"}
+    else:
+        new_wxid = None
+        allFriend = WXBotService.get_address_list(config.account_wxid)
+        for friendItem in allFriend['data']["contactList"]:
+            if friendItem['nickname'] == nickname:
+                new_wxid = friendItem['wxid']
+
+        WXBotService.add_group_members_40_more(
+            robot_wxid=config.account_wxid,
+            from_wxid=config.chatroomId,  #异度星球群
+            new_wxid=new_wxid)
+    print('new_wxid--', new_wxid)
+    return {"code": 200, "success": "ok", "message": "群聊邀请已发送"}
+
+
 # 创建用户
 @app.post("/users")
 # schemas.UserCreate决定了swagger文档
@@ -277,10 +308,17 @@ def kp(event_data):
                 #                            new_wxid='wxid_4413224132412')
 
                 # 发送小程序
-                utils.sendminiProgram(data, account_wxid, wxid, planetXml)
+                # utils.sendminiProgram(data, account_wxid, wxid, planetXml)
                 # H5链接
-                WXBotService.send_link_message(account_wxid, wxid, title="欢迎加入微信群", desc="请查看规则", url="https://link.hackrobot.cn/", pic= "https://www.hackrobot.cn/wp-content/uploads/2023/05/cropped-cropped-Screenshot-2023-05-22-at-17.26.38.png")
-                
+                WXBotService.send_link_message(
+                    account_wxid,
+                    wxid,
+                    title="欢迎加入微信群",
+                    desc="请查看规则",
+                    url=f'https://link.hackrobot.cn?wxid={wxid}',
+                    pic=
+                    "https://www.hackrobot.cn/wp-content/uploads/2023/05/cropped-cropped-Screenshot-2023-05-22-at-17.26.38.png"
+                )
 
             # if msg in ['腾讯云']:
             #     # 发送小程序