Merge pull request #92 from HenryXiaoYang/dev

v2.2.0
HenryXiaoYang · Dec 7, 2024 · c4e993a · c4e993a
2 parents 8399fb7 + 639e386
commit c4e993a
Show file tree

Hide file tree

Showing 22 changed files with 428 additions and 66 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -1,7 +1,7 @@
 # XYBot 微信机器人
 
 <p align="center">
-    <img alt="XYBot微信机器人logo" width="240" src="https://github.com/HenryXiaoYang/HXY_Readme_Images/blob/main/XYBot/v0.0.7/logo/xybot_logo.png?raw=true">
+    <img alt="XYBot微信机器人logo" width="240" src="https://github.com/HenryXiaoYang/HXY_Readme_Images/blob/main/XYBot/logo/xybot_logo.png?raw=true">
 </p>
 
 XYBot是一个可运行于Linux和Windows的基于Hook的微信机器人。😊 具有高度可自定义性，支持自我编写插件。🚀
@@ -21,7 +21,7 @@ XYBot详细的部署教程可以在项目的Wiki中找到。📚 同时，XYBot
 
 <p align="center">
     <a href="https://opensource.org/licenses/"><img src="https://img.shields.io/badge/License-GPL%20v3-red.svg" alt="GPLv3 License"></a>
-    <a href="https://github.com/HenryXiaoYang/XYBot"><img src="https://img.shields.io/badge/Version-2.0.0-orange.svg" alt="Version"></a>
+    <a href="https://github.com/HenryXiaoYang/XYBot"><img src="https://img.shields.io/badge/Version-2.2.0-orange.svg" alt="Version"></a>
     <a href="https://yangres.com"><img src="https://img.shields.io/badge/Blog-@HenryXiaoYang-yellow.svg" alt="Blog"></a>
 </p>
 
@@ -151,7 +151,7 @@ python start.py
 
 #### 用的什么微信版本?🤔️
 
-3.9.10.27😄
+3.9.11.25😄
 
 #### 最长能运行多久？🤔️
 

diff --git a/docs/xybot_logo_32x32.png b/docs/xybot_logo_32x32.png
diff --git a/docs/zh-cn/XYBot功能介绍.md b/docs/zh-cn/XYBot功能介绍.md
@@ -1,3 +1,5 @@
+# 本文档已过期
+
 # XYBot功能介绍
 
 这一页介绍了所有官方XYBot微信机器人用户可使用的功能、命令。

diff --git a/docs/zh-cn/XYBot插件编写.md b/docs/zh-cn/XYBot插件编写.md
@@ -1,3 +1,5 @@
+# 本文档已过期
+
 # XYBot插件编写
 
 这一页讲述了如何编写一个XYBot插件

diff --git a/docs/zh-cn/XYBot的设置.md b/docs/zh-cn/XYBot的设置.md
@@ -2,15 +2,15 @@
 
 这一页写了如何设置XYBot。
 
-本篇适用于`XYBot v2.0.0`。
+本篇适用于`XYBot v2.2.0`。
 
 ## 配置主设置
 
-这是`XYBot v2.0.0`的主设置：
+这是`XYBot v2.2.0`的主设置：
 
 ```yaml
-#Version v2.0.0
-bot_version: "v2.0.0"
+#Version v2.2.0
+bot_version: "v2.2.0"
 
 # XYBot主设置
 

diff --git a/docs/zh-cn/_coverpage.md b/docs/zh-cn/_coverpage.md
@@ -1,4 +1,4 @@
-![logo](https://github.com/HenryXiaoYang/HXY_Readme_Images/blob/main/XYBot/v0.0.7/logo/xybot_logo_small.png?raw=true)
+![logo](https://github.com/HenryXiaoYang/HXY_Readme_Images/blob/main/XYBot/logo/xybot_logo_medium.png?raw=true)
 
 # XYBot <small>v2.0.0</small>
 

diff --git a/main_config.yml b/main_config.yml
@@ -1,5 +1,5 @@
-#Version v2.0.0
-bot_version: "v2.0.0"
+#Version v2.2.0
+bot_version: "v2.2.0"
 
 # XYBot主设置
 

diff --git a/plugins/command/bot_status.py b/plugins/command/bot_status.py
@@ -98,3 +98,4 @@ async def run(self, bot: client.Wcf, recv: XYBotWxMsg):
         out_message = f"-----XYBot-----\n{self.status_message}\nBot version: {self.bot_version}\n{base64.b64decode(a).decode('utf-8')}"
         logger.info(f'[发送信息]{out_message}| [发送到] {recv.roomid}')
         bot.send_text(out_message, recv.roomid)  # 发送
+        bot.send_pat_msg(recv.roomid, recv.sender)  # 发送拍一拍消息
diff --git a/plugins/command/dalle3.py b/plugins/command/dalle3.py
@@ -83,6 +83,7 @@ async def run(self, bot: client.Wcf, recv: XYBotWxMsg):
         if user_wxid not in self.admins and self.db.get_whitelist(user_wxid) == 0:  # 如果用户不是管理员或者白名单，扣积分
             self.db.add_points(user_wxid, -self.price)
             await self.send_friend_or_group(bot, recv, f"-----XYBot-----\n🎉图片生成完毕，已扣除 {self.price} 点积分！🙏")
+            bot.send_pat_msg(recv.roomid, user_wxid) # 拍一拍
 
         bot.send_image(image_path, recv.roomid)
         logger.info(f'[发送图片]{image_path}| [发送到] {recv.roomid}')

diff --git a/plugins/command/lucky_draw.py b/plugins/command/lucky_draw.py
@@ -140,6 +140,7 @@ async def run(self, bot: client.Wcf, recv: XYBotWxMsg):
             )  # 组建信息
 
             await self.send_friend_or_group(bot, recv, message)  # 发送
+            bot.send_pat_msg(recv.roomid, target_wxid)  # 发送拍一拍消息
 
         else:
             await self.send_friend_or_group(bot, recv, error)  # 发送错误

diff --git a/plugins/command/points_trade.py b/plugins/command/points_trade.py
@@ -45,6 +45,7 @@ async def run(self, bot: client.Wcf, recv: XYBotWxMsg):
                 self.db.safe_trade_points(trader_wxid, target_wxid, points_num)
                 # 记录日志和发送成功信息
                 await self.log_and_send_success_message(bot, roomid, trader_wxid, target_wxid, points_num)
+                bot.send_pat_msg(roomid, target_wxid)
             else:
                 await self.log_and_send_error_message(bot, roomid, trader_wxid, error_message)  # 记录日志和发送错误信息
         else:

diff --git a/plugins/command/random_picture.py b/plugins/command/random_picture.py
@@ -43,6 +43,7 @@ async def run(self, bot: client.Wcf, recv: XYBotWxMsg):
 
             logger.info(f'[发送信息](随机图图图片) {cache_path}| [发送到] {recv.roomid}')
             bot.send_image(os.path.abspath(cache_path), recv.roomid)  # 发送图片
+            bot.send_pat_msg(recv.roomid, recv.sender)  # 发送拍一拍消息
 
         except Exception as error:
             out_message = f"-----XYBot-----\n出现错误❌！{error}"

diff --git a/plugins/command/random_picture_link.py b/plugins/command/random_picture_link.py
diff --git a/plugins/command/random_picture_link.yml b/plugins/command/random_picture_link.yml
diff --git a/plugins/command/red_packet.py b/plugins/command/red_packet.py
@@ -135,7 +135,7 @@ async def grab_red_packet(self, bot: client.Wcf, recv: XYBotWxMsg):
             error = "-----XYBot-----\n❌红包只能在群里抢！"
         elif red_packet_grabber in self.red_packets[req_captcha]["grabbed"]:
             error = "-----XYBot-----\n⚠️你已经抢过这个红包了！"
-        elif self.red_packets[req_captcha].sender == red_packet_grabber:
+        elif self.red_packets[req_captcha]["sender"] == red_packet_grabber:
             error = "-----XYBot-----\n❌不能抢自己的红包！"
 
         if not error:
@@ -156,6 +156,7 @@ async def grab_red_packet(self, bot: client.Wcf, recv: XYBotWxMsg):
                 # 组建信息
                 out_message = f"-----XYBot-----\n🧧恭喜 {red_packet_grabber_nick} 抢到了 {grabbed_points} 点积分！"
                 await self.send_friend_or_group(bot, recv, out_message)
+                bot.send_pat_msg(recv.roomid, red_packet_grabber)  # 发送拍一拍消息
 
                 # 判断是否抢完
                 if not self.red_packets[req_captcha]["list"]:

diff --git a/plugins/command/sign_in.py b/plugins/command/sign_in.py
@@ -68,6 +68,9 @@ async def run(self, bot: client.Wcf, recv: XYBotWxMsg):
             logger.info(f"[发送@信息]{out_message}| [发送到] {recv.roomid}")
             bot.send_text(out_message, recv.roomid, sign_wxid)
 
+        bot.send_pat_msg(recv.roomid, sign_wxid)
+        logger.info(f"[发送拍一拍] 拍了拍: {sign_wxid} | 发送到: {recv.roomid}")
+
     def signstat_check(self, signstat):  # 检查签到状态
         signstat = "20000101" if signstat in ["0", "1"] else signstat
         last_sign_date = datetime.strptime(signstat, "%Y%m%d").date()

diff --git a/plugins/join_group/join_notification.py b/plugins/join_group/join_notification.py
@@ -0,0 +1,34 @@
+#  Copyright (c) 2024. Henry Yang
+#
+#  This program is licensed under the GNU General Public License v3.0.
+import os
+import re
+
+from loguru import logger
+from wcferry import client
+
+from utils.plugin_interface import PluginInterface
+from wcferry_helper import XYBotWxMsg
+
+
+class join_notification(PluginInterface):
+    def __init__(self):
+        self.logo_path = os.path.abspath("resources/XYBotLogo.png")
+
+    async def run(self, bot: client.Wcf, recv: XYBotWxMsg):
+        join_group_msg = recv.content
+
+        # 邀请进来的
+        if "邀请" in join_group_msg:
+            # 通过正则表达式提取邀请者的名字
+            invite_pattern = r'"([^"]+)"邀请"([^"]+)"加入了群聊'
+            match = re.search(invite_pattern, join_group_msg)
+
+            if match:
+                joiner = match.group(2)
+                await self.send_welcome(bot, recv.roomid, joiner)
+
+    async def send_welcome(self, bot: client.Wcf, roomid: str, joiner: str):
+        out_message = f"-------- XYBot ---------\n👏欢迎新成员 {joiner} 加入本群！⭐️\n⚙️输入 菜单 获取玩法哦😄"
+        logger.info(f'[发送信息]{out_message}| [发送到] {roomid}')
+        bot.send_text(out_message, roomid)