move mostly contents to plugins folder

.github/ISSUE_TEMPLATE/91011.md

@@ -5,7 +5,7 @@ labels: enhancement
 assignees: OasisAkari
 
 ---
-**请注意，若您想要提出新的功能建议，则您需要自行给出可利用的接口，否则您提出的建议很可能会被关闭。**
+<!--请注意，若您想要提出新的功能建议，则您需要自行给出可利用的接口，否则您提出的建议很可能会被关闭。-->
 **建议描述：**<!--请描述具体问题。-->
 
 **实现方法：**<!-- 在此处填写你认为可以实现的方法。-->

CommandGen.py

@@ -1,18 +1,17 @@
 import re
-import string
 
-from ab import ab
-from bug import bugtracker
-from checkuser import checkuser
-from help import help
-from mcv import mcv, mcbv, mcdv
-from newbie import new
-from ping import ping
-from rc import rc
-from server import ser
-from user import Username
-from userp import Userp
-from wiki import wiki, im, imt, imarc
+from plugins.ab import ab
+from plugins.bug import bugtracker
+from plugins.checkuser import checkuser
+from plugins.help import help
+from plugins.mcv import mcv, mcbv, mcdv
+from plugins.newbie import new
+from plugins.ping import ping
+from plugins.rc import rc
+from plugins.server import ser
+from plugins.user import Username
+from plugins.userp import Userp
+from plugins.wiki import wiki
 
 
 def findcommand(str1, group=0):

MessageGen.py

@@ -1,12 +1,10 @@
 import re
-from graia.application import GraiaMiraiApplication, Session
-from graia.application.event.messages import TempMessage
 from graia.application.message.chain import MessageChain
-from graia.application.message.elements.internal import Plain, At, Image, UploadMethods, Quote
+from graia.application.message.elements.internal import Plain, Image, UploadMethods
 from os.path import abspath
 
 from CommandGen import command
-from findimage import findimage
+from plugins.findimage import findimage
 
 
 async def gen(app, message, target1, target2='0', msgtype='None'):
@@ -49,7 +47,7 @@ async def gen(app, message, target1, target2='0', msgtype='None'):
             await app.sendTempMessage(group=group, target=member, message=msgchain.asSendable())
 
 
-from wiki import im, imt, imarc
+from plugins.wiki import im, imt, imarc
 
 
 async def findwikitext(app, message, target1, target2='0', msgtype='None'):

mcvbot.py

@@ -1,4 +1,4 @@
-from mirai import Mirai, Group, MessageChain, Member, Plain, At, Source, Image, Friend
+from mirai import Mirai, Plain
 
 qq = 2052142661  # 字段 qq 的值
 authKey = '1145141919810'  # 字段 authKey 的值
@@ -9,7 +9,7 @@ app = Mirai(f"mirai://{mirai_api_http_locate}?authKey={authKey}&qq={qq}", websoc
 
 @app.subroutine
 async def ver(app: Mirai):
-    from mcvrss import mcvrss
+    from plugins.mcvrss import mcvrss
     for qqgroup in mcvrss():
         try:
             await app.sendGroupMessage(int(qqgroup), [Plain('已开启检测游戏版本。')])

newbiebot.py

@@ -2,11 +2,10 @@ import json
 import requests
 import time
 import traceback
-from datetime import datetime
-from mirai import Mirai, Group, MessageChain, Member, Plain, At, Source, Image, Friend
+from mirai import Mirai, Plain
 
-from UTC8 import UTC8
-from pbc import pbc1
+from plugins.UTC8 import UTC8
+from plugins.pbc import pbc1
 
 qq = 2052142661  # 字段 qq 的值
 authKey = '1145141919810'  # 字段 authKey 的值

plugins/ab/__init__.py

@@ -1,11 +1,10 @@
 # -*- coding:utf-8 -*-
 import json
-import re
 
 import aiohttp
 
-from UTC8 import UTC8
-from pbc import pbc2
+from plugins.UTC8 import UTC8
+from plugins.pbc import pbc2
 
 
 async def ab():

plugins/mcvrss.py

@@ -3,7 +3,7 @@ import re
 
 
 def mcvrss():
-    w = open('mcvrss.txt', 'r')
+    w = open('../mcvrss.txt', 'r')
     s = w.read().split('\n')
     if '' in s:
         s.remove('')
@@ -16,7 +16,7 @@ def mcvrssa(group):
     if group in q:
         return ('该群已在订阅列表中。')
     else:
-        wr = open('mcvrss.txt', 'a+')
+        wr = open('../mcvrss.txt', 'a+')
         wr.write(re.sub(r'\n$', '', '\n' + group))
         wr.close()
         return ('已订阅。')
@@ -26,8 +26,8 @@ def mcvrssr(group):
     q = mcvrss()
     if group in q:
         q.remove(group)
-        os.remove('mcvrss.txt')
-        wr = open('mcvrss.txt', 'a')
+        os.remove('../mcvrss.txt')
+        wr = open('../mcvrss.txt', 'a')
         y = []
         h = ''
         for x in q:

plugins/newbie/__init__.py

@@ -3,7 +3,7 @@ import aiohttp
 import json
 import re
 
-from pbc import pbc2
+from plugins.pbc import pbc2
 
 
 async def new():

plugins/rc/__init__.py

@@ -1,10 +1,9 @@
 # -*- coding:utf-8 -*-
 import aiohttp
 import json
-import re
 
-from UTC8 import UTC8
-from pbc import pbc2
+from plugins.UTC8 import UTC8
+from plugins.pbc import pbc2
 
 
 async def rc():

plugins/user/__init__.py

@@ -1,7 +1,7 @@
 import re
 
-from help import userhelp
-from interwikilist import iwlink, iwlist
+from plugins.help import userhelp
+from plugins.interwikilist import iwlink, iwlist
 from .ruserlib import rUser1
 from .userlib import User1
 

plugins/user/ruserlib.py

@@ -3,7 +3,7 @@ import re
 import urllib
 from bs4 import BeautifulSoup as bs
 
-from UTC8 import UTC8
+from plugins.UTC8 import UTC8
 from .tool import yhz, gender
 
 

plugins/user/userlib.py

@@ -1,10 +1,8 @@
 import aiohttp
-import json
-import re
 import re
 import urllib
 
-from UTC8 import UTC8
+from plugins.UTC8 import UTC8
 from .tool import yhz, gender
 
 

plugins/userp/__init__.py

@@ -4,8 +4,7 @@ import re
 import traceback
 import urllib
 
-from UTC8 import UTC8
-from wiki import im
+from plugins.UTC8 import UTC8
 from .gender import gender
 from .puserlib import PUser1
 

plugins/wiki/__init__.py

@@ -2,8 +2,8 @@ import asyncio
 import re
 import traceback
 
-from help import wikihelp
-from interwikilist import iwlist, iwlink
+from plugins.help import wikihelp
+from plugins.interwikilist import iwlist, iwlink
 from .wikilib import wiki1, wiki2
 
 

plugins/wiki/wikilib.py

@@ -1,10 +1,9 @@
 import aiohttp
-import json
 import re
 import traceback
 import urllib
 
-from interwikilist import iwlist, iwlink
+from plugins.interwikilist import iwlist, iwlink
 
 
 async def get_data(url: str, fmt: str):