v2.16.5

增加连续签到奖励功能
解决部分会导致群发限制的问题
丢漂流瓶增加跳过审核参数
修复权限控制的漏洞

Author: djkcyl

.gitignore

@@ -5,6 +5,7 @@ temp/
 voice_file
 config.json
 *.db*
+m.py
 !saya/EnglishTest/database/WordData.db
 test.py
 config.yaml

database/db.py

@@ -19,6 +19,8 @@ class Meta:
 class User(BaseModel):
     qq = CharField()
     is_sign = IntegerField(default=0)
+    is_chat = IntegerField(default=0)
+    continue_sign = IntegerField(default=0)
     sign_num = IntegerField(default=0)
     english_answer = IntegerField(default=0)
     gold = IntegerField(default=0)
@@ -34,7 +36,7 @@ class Meta:
 def init_user(qq):
     user = User.select().where(User.qq == qq)
     if not user.exists():
-        p = User(qq=str(qq), gold=60)
+        p = User(qq=str(qq))
         p.save()
         logger.info(f"已初始化{qq}")
 
@@ -44,15 +46,24 @@ async def sign(qq):
     user = User.get(qq=str(qq))
     if user.is_sign:
         return False
-    p = User.update(is_sign=1, sign_num=User.sign_num + 1).where(User.qq == qq)
+    p = User.update(
+        is_sign=1, sign_num=User.sign_num + 1, continue_sign=User.continue_sign + 1
+    ).where(User.qq == qq)
     p.execute()
     return True
 
 
 async def get_info(qq):
     init_user(qq)
     user = User.get(qq=str(qq))
-    return [user.id, user.is_sign, user.sign_num, user.gold, user.talk_num]
+    return [
+        user.id,
+        user.is_sign,
+        user.sign_num,
+        user.gold,
+        user.talk_num,
+        user.continue_sign,
+    ]
 
 
 async def add_gold(qq, num: int):
@@ -88,19 +99,21 @@ async def trans_all_gold(from_qq, to_qq) -> int:
 
 async def add_talk(qq):
     init_user(qq)
-    User.update(talk_num=User.talk_num + 1).where(User.qq == str(qq)).execute()
+    User.update(talk_num=User.talk_num + 1, is_chat=1).where(User.qq == str(qq)).execute()
     return
 
 
 async def reset_sign():
+    User.update(continue_sign=0).where(User.is_sign == 0).execute()
     User.update(is_sign=0).where(User.is_sign == 1).execute()
     return
 
 
-async def all_sign_num():
+async def activity_count():
     all_num = User.select().count()
     sign_num = User.select().where(User.is_sign == 1).count()
-    return [sign_num, all_num]
+    chat_num = User.select().where(User.is_chat == 1).count()
+    return [all_num, sign_num, chat_num]
 
 
 async def give_all_gold(num: int):

database/migrator.py

@@ -0,0 +1,9 @@
+from playhouse.migrate import SqliteDatabase, SqliteMigrator, migrate, IntegerField
+
+db = SqliteDatabase("./database/userData.db")
+migrator = SqliteMigrator(db)
+
+migrate(
+    migrator.add_column("user_info", "is_chat", IntegerField(default=0)),
+    migrator.add_column("user_info", "continue_sign", IntegerField(default=0)),
+)

pyproject.toml

@@ -2,7 +2,7 @@
 authors = ["djkcyl <[email protected]>"]
 description = ""
 name = "abot-mahv2"
-version = "2.16.4"
+version = "2.16.5"
 
 [tool.poetry.dependencies]
 python = ">=3.9,<3.10"

saya/ArkNews/__init__.py

@@ -138,7 +138,7 @@ async def get_weibo_news(app: Ariadne):
             yaml_data["Basic"]["Permission"]["Master"], MessageChain.create(msg)
         )
         for group in group_list:
-            await app.sendMessage(group, MessageChain.create(msg))
+            await app.sendMessage(group, MessageChain.create([f"{group.id}\n"] + msg))
             await asyncio.sleep(random.uniform(2, 4))
 
         await app.sendFriendMessage(
@@ -192,7 +192,6 @@ async def get_game_news(app: Ariadne):
         return
 
     pushed_list["game"] = latest_list
-    save_pushed_list()
 
     group_list = (
         [await app.getGroup(yaml_data["Basic"]["Permission"]["DebugGroup"])]
@@ -214,7 +213,7 @@ async def get_game_news(app: Ariadne):
             yaml_data["Basic"]["Permission"]["Master"], MessageChain.create(msg)
         )
         for group in group_list:
-            await app.sendMessage(group, MessageChain.create(msg))
+            await app.sendMessage(group, MessageChain.create([f"{group.id}\n"] + msg))
             await asyncio.sleep(random.uniform(2, 4))
 
         await app.sendFriendMessage(
@@ -223,5 +222,6 @@ async def get_game_news(app: Ariadne):
         )
 
         await asyncio.sleep(3)
+    save_pushed_list()
 
     GAME_LOCK = False