From 6949c923d6a0abe73426da0be728526f8e83eaa1 Mon Sep 17 00:00:00 2001
From: yzhh <2596322644@qq.com>
Date: Sun, 22 Aug 2021 22:55:25 +0800
Subject: [PATCH] bugfix

---
 core/bots/aiogram/bot.py             |   4 +--
 core/bots/discord/bot.py             |   3 +-
 core/bots/discord/message.py         |   4 +--
 core/utils/bot.py                    |   2 +-
 database/old.db                      | Bin 0 -> 110592 bytes
 database/update_v3_to_v4.py          |  18 ++++++++++++
 modules/core/__init__.py             |   8 +++---
 modules_o/minecraft_news/__init__.py |  15 ++--------
 modules_o/minecraft_news/database.py |  40 ---------------------------
 9 files changed, 30 insertions(+), 64 deletions(-)
 create mode 100644 database/old.db
 create mode 100644 database/update_v3_to_v4.py
 delete mode 100644 modules_o/minecraft_news/database.py

diff --git a/core/bots/aiogram/bot.py b/core/bots/aiogram/bot.py
index d6f2f50a..b507b7c4 100644
--- a/core/bots/aiogram/bot.py
+++ b/core/bots/aiogram/bot.py
@@ -26,8 +26,8 @@ async def msg_handler(message: types.Message):
         all_tsk[user_id].set()
         MessageTaskManager.del_task(user_id)
     msg = MessageSession(MsgInfo(targetId=f'Telegram|{message.chat.type}|{message.chat.id}',
-                                 senderId=f'Telegram|User|{message.from_user.id}', targetFrom='Telegram',
-                                 senderFrom='Telegram', senderName=message.from_user.username),
+                                 senderId=f'Telegram|User|{message.from_user.id}', targetFrom=f'Telegram|{message.chat.type}',
+                                 senderFrom='Telegram|User', senderName=message.from_user.username),
                          Session(message=message, target=message.chat.id, sender=message.from_user.id))
     await parser(msg)
 
diff --git a/core/bots/discord/bot.py b/core/bots/discord/bot.py
index 82ad01ca..bf891bea 100644
--- a/core/bots/discord/bot.py
+++ b/core/bots/discord/bot.py
@@ -1,6 +1,7 @@
 import asyncio
 import logging
 import os
+import re
 
 import discord
 
@@ -17,7 +18,6 @@ from core.utils import PrivateAssets, init, load_prompt
 PrivateAssets.set(os.path.abspath(os.path.dirname(__file__) + '/assets'))
 init()
 
-
 @client.event
 async def on_ready():
     Logger.info('Logged on as ' + str(client.user))
@@ -28,7 +28,6 @@ async def on_ready():
     await asyncio.gather(*gather_list)
     Scheduler.start()
     logging.getLogger('apscheduler.executors.default').setLevel(logging.WARNING)
-    await asyncio.sleep(5)
     await load_prompt(FetchTarget)
 
 
diff --git a/core/bots/discord/message.py b/core/bots/discord/message.py
index 05c38577..0eb6fd23 100644
--- a/core/bots/discord/message.py
+++ b/core/bots/discord/message.py
@@ -84,9 +84,9 @@ class MessageSession(MS):
 class FetchTarget(FT):
     @staticmethod
     async def fetch_target(targetId):
-        matchChannel = re.match(r'^(DC\|(?:DM\||)Channel)\|(.*)', targetId)
+        matchChannel = re.match(r'^(Discord\|(?:DM\||)Channel)\|(.*)', targetId)
         if matchChannel:
-            getChannel = client.get_channel(int(matchChannel.group(2)))
+            getChannel = await client.fetch_channel(int(matchChannel.group(2)))
             return MessageSession(MsgInfo(targetId=targetId, senderId=targetId, senderName='',
                                           targetFrom=matchChannel.group(1), senderFrom=matchChannel.group(1)),
                                   Session(message=False, target=getChannel, sender=getChannel))
diff --git a/core/utils/bot.py b/core/utils/bot.py
index 990afc2b..c39ee779 100644
--- a/core/utils/bot.py
+++ b/core/utils/bot.py
@@ -70,7 +70,7 @@ async def slk_converter(filepath):
 
 async def load_prompt(bot: FetchTarget):
     print(111)
-    author_cache = os.path.abspath('.cache_restart_author')
+    author_cache = os.path.abspath(PrivateAssets.path + '/cache_restart_author')
     loader_cache = os.path.abspath('.cache_loader')
     if os.path.exists(author_cache):
         open_author_cache = open(author_cache, 'r')
diff --git a/database/old.db b/database/old.db
new file mode 100644
index 0000000000000000000000000000000000000000..3f54b2f8c5031930dd179082bc10a13480703577
GIT binary patch
literal 110592
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
E58(jjFaQ7m

literal 0
HcmV?d00001

diff --git a/database/update_v3_to_v4.py b/database/update_v3_to_v4.py
new file mode 100644
index 00000000..94e4fd21
--- /dev/null
+++ b/database/update_v3_to_v4.py
@@ -0,0 +1,18 @@
+import os
+import sqlite3
+
+from database import BotDBUtil
+
+
+old_db_link = os.path.abspath('./database/old.db')
+conn = sqlite3.connect(old_db_link)
+c = conn.cursor()
+friends = c.execute(f"SELECT * FROM friend_permission").fetchall()
+for friend in friends:
+    BotDBUtil.Module(f'QQ|{friend[0]}').enable('|'.split(friend[1]))
+groups = c.execute(f"SELECT * FROM group_permission").fetchall()
+for group in groups:
+    BotDBUtil.Module(f'QQ|Group|{group[0]}').enable('|'.split(group[1]))
+group_admins = c.execute(f"SELECT * FROM group_adminuser").fetchall()
+for x in group_admins:
+    BotDBUtil.SenderInfo(f'QQ|{x[1]}').add_TargetAdmin(f'QQ|Group|{x[2]}')
\ No newline at end of file
diff --git a/modules/core/__init__.py b/modules/core/__init__.py
index 3c02d98d..cdb59646 100644
--- a/modules/core/__init__.py
+++ b/modules/core/__init__.py
@@ -176,12 +176,12 @@ async def ping(msg: MessageSession):
 @command('admin',
          is_base_function=True,
          need_admin=True,
-         help_doc=('~admin add <user>', '~admin del <user>')
+         help_doc=('~admin add <UserID> {设置成员为机器人管理员}', '~admin del <UserID> {取消成员的机器人管理员}')
          )
 async def config_gu(msg: MessageSession):
     if msg.parsed_msg['add']:
         user = msg.parsed_msg['<user>']
-        if user:
+        if user and not BotDBUtil.SenderInfo(f"{msg.target.senderFrom}|{user}").check_TargetAdmin(msg.target.targetId):
             if BotDBUtil.SenderInfo(f"{msg.target.senderFrom}|{user}").add_TargetAdmin(msg.target.targetId):
                 await msg.sendMessage("成功")
     if msg.parsed_msg['del']:
@@ -220,7 +220,7 @@ async def restart_bot(msg: MessageSession):
     await msg.sendMessage('你确定吗？')
     confirm = await msg.waitConfirm()
     if confirm:
-        update = os.path.abspath('.cache_restart_author')
+        update = os.path.abspath(PrivateAssets.path + '/cache_restart_author')
         write_version = open(update, 'w')
         write_version.write(json.dumps({'From': msg.target.targetFrom, 'ID': msg.target.targetId}))
         write_version.close()
@@ -243,7 +243,7 @@ async def update_and_restart_bot(msg: MessageSession):
     await msg.sendMessage('你确定吗？')
     confirm = await msg.waitConfirm()
     if confirm:
-        update = os.path.abspath('.cache_restart_author')
+        update = os.path.abspath(PrivateAssets.path + '/cache_restart_author')
         write_version = open(update, 'w')
         write_version.write(json.dumps({'From': msg.target.targetFrom, 'ID': msg.target.targetId}))
         write_version.close()
diff --git a/modules_o/minecraft_news/__init__.py b/modules_o/minecraft_news/__init__.py
index 5afa3bbc..9a74c01f 100644
--- a/modules_o/minecraft_news/__init__.py
+++ b/modules_o/minecraft_news/__init__.py
@@ -1,21 +1,10 @@
 import asyncio
 import json
 import traceback
+import difflib
 
 import aiohttp
-from core.broadcast import bcc
-from core.template import logger_info
-from database_old import BotDB
-from graia.application import MessageChain
-from graia.application.message.elements.internal import Plain, Image
-from graia.scheduler import GraiaScheduler
-from graia.scheduler.timers import every_minute
-
-from .database import MD as db
-
-database = db()
-check_enable_modules_all = BotDB.check_enable_modules_all
-scheduler = GraiaScheduler(bcc.loop, bcc)
+from
 
 
 async def start_check_news(app):
diff --git a/modules_o/minecraft_news/database.py b/modules_o/minecraft_news/database.py
deleted file mode 100644
index c22d8fd5..00000000
--- a/modules_o/minecraft_news/database.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import os
-import sqlite3
-
-dbpath = os.path.abspath('./modules/minecraft_news/save.db')
-
-
-class MD:
-    def __init__(self):
-        if not os.path.exists(dbpath):
-            self.initialize()
-
-        self.conn = sqlite3.connect(dbpath)
-        self.c = self.conn.cursor()
-
-    def initialize(self):
-        a = open(dbpath, 'w')
-        a.close()
-        self.conn = sqlite3.connect(dbpath)
-        self.c = self.conn.cursor()
-        self.c.execute('''CREATE TABLE mc_news
-               (TITLE TEXT PRIMARY KEY     NOT NULL,
-               LINK TEXT,
-               PDESC TEXT,
-               IMAGE TEXT,
-               PDATE TEXT);''')
-
-        self.c.close()
-
-    def add_news(self, title, link, desc, image, date):
-        self.c.execute(f"INSERT INTO mc_news (TITLE, LINK, PDESC, IMAGE, PDATE) VALUES (?, ?, ?, ?, ?)",
-                       (title, link, desc, image, date))
-        self.conn.commit()
-        return
-
-    def check_exist(self, title):
-        a = self.c.execute(f"SELECT * FROM mc_news WHERE TITLE=?", (title,)).fetchone()
-        if a:
-            return True
-        else:
-            return False