Merge branch 'master' into merge-conflict

.github/workflows/update-poetry-dependencies.yml

@@ -33,6 +33,11 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.12'
+
       - name: Install Poetry
         run: |
           curl -sSL "https://install.python-poetry.org" | python3 -

.github/workflows/weekly-release.yml

@@ -16,7 +16,7 @@ jobs:
         with:
           ref: master
 
-      - uses: rui-costa/action-automatic-semver-releases@v1
+      - uses: rui-costa/action-automatic-semver-releases@1.1.1
         with:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SEMVER: PATCH

README.md

@@ -1,3 +1,8 @@
+# 说明
+本项目为Teahouse/akari-bot的分支项目，对比原始项目存在对TOS、模块i18n等部分的自定义，并包括了一个研究中的原神模块。
+
+原项目说明见下
+
 <div align="center">
   <img width="256" src="./assets/character_marked.png" alt="logo">
 

bots/aiogram/bot.py

@@ -20,13 +20,13 @@
 
 @dp.message()
 async def msg_handler(message: types.Message):
-    target_id = f'Telegram|{message.chat.type.title()}|{message.chat.id}'
+    target_id = f'Telegram|{message.chat.type}|{message.chat.id}'
     reply_id = None
     if message.reply_to_message:
         reply_id = message.reply_to_message.message_id
     msg = MessageSession(MsgInfo(target_id=target_id,
                                  sender_id=f'Telegram|User|{message.from_user.id}',
-                                 target_from=f'Telegram|{message.chat.type.title()}',
+                                 target_from=f'Telegram|{message.chat.type}',
                                  sender_from='Telegram|User', sender_name=message.from_user.username,
                                  client_name=client_name,
                                  message_id=message.message_id,

bots/aiogram/message.py

@@ -93,12 +93,12 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal
 
     async def check_native_permission(self):
         if not self.session.message:
-            chat = await bot.get_chat(self.session.target)
+            chat = await dp.bot.get_chat(self.session.target)
         else:
             chat = self.session.message.chat
         if chat.type == 'private':
             return True
-        admins = [member.user.id for member in await bot.get_chat_administrators(chat.id)]
+        admins = [member.user.id for member in await dp.bot.get_chat_administrators(chat.id)]
         if self.session.sender in admins:
             return True
         return False

bots/kook/bot.py

@@ -22,9 +22,11 @@
 @bot.on_message((MessageTypes.TEXT, MessageTypes.IMG))
 async def msg_handler(message: Message):
     if message.channel_type.name == "GROUP":
+
         target_id = f'KOOK|Group|{message.target_id}'
     else:
         target_id = f'KOOK|{message.channel_type.name.title()}|{message.author_id}'
+
     reply_id = None
     if 'quote' in message.extra:
         reply_id = message.extra['quote']['rong_id']

bots/kook/message.py

@@ -104,7 +104,7 @@ async def send_message(self, message_chain, quote=True, disable_secret_check=Fal
             msg_ids.append(x['msg_id'])
             if callback:
                 MessageTaskManager.add_callback(x['msg_id'], callback)
-        return FinishedSession(self, msg_ids, {self.session.message.channel_type.name.title(): send})
+        return FinishedSession(self, msg_ids, {self.session.message.channel_type.name: send})
 
     async def check_native_permission(self):
         self.session.message: Message