7 files changed, 79 insertions, 5 deletions
diff --git a/AyaBot/plugins/__pycache__/awsl.cpython-37.pyc b/AyaBot/plugins/__pycache__/awsl.cpython-37.pyc
index c06634f..6c47288 100644
--- a/AyaBot/plugins/__pycache__/awsl.cpython-37.pyc
+++ b/AyaBot/plugins/__pycache__/awsl.cpython-37.pyc
diff --git a/AyaBot/plugins/__pycache__/bilibili.cpython-37.pyc b/AyaBot/plugins/__pycache__/bilibili.cpython-37.pyc
new file mode 100644
index 0000000..59bdbf0
--- /dev/null
+++ b/AyaBot/plugins/__pycache__/bilibili.cpython-37.pyc
diff --git a/AyaBot/plugins/awsl.py b/AyaBot/plugins/awsl.py
index 2916d8c..d2f976a 100644
--- a/AyaBot/plugins/awsl.py
+++ b/AyaBot/plugins/awsl.py
@@ -1,5 +1,25 @@
+import os
 import random
-from nonebot import on_command, CommandSession
+from nonebot import on_command, CommandSession, permission as perm, on_request
+from datetime import datetime
+from typing import Optional
+
+import pytz
+from pandas import Timestamp
+
+
+CST_TIMEZONE = 'Asia/Shanghai'
+
+
+def beijing_now(freq: Optional[str] = None) -> datetime:
+    now = datetime.now(pytz.timezone(CST_TIMEZONE))
+    if freq is not None:
+        now = Timestamp(now).round(freq)
+    return now
+
+
+def beijing_from_timestamp(timestamp: int) -> datetime:
+    return datetime.fromtimestamp(timestamp, pytz.timezone(CST_TIMEZONE))
 
 
 @on_command('阿这', only_to_me=False)
@@ -16,4 +36,28 @@ async def _(session: CommandSession):
 
 @on_command('抽签', only_to_me=False)
 async def _(session: CommandSession):
-    await session.send(str(random.choice(['大凶', '小凶', '凶', '吉', '小吉', '中吉', '大吉'])))
-\ No newline at end of file
+    await session.send(str(random.choice(['大凶', '小凶', '凶', '吉', '小吉', '中吉', '大吉'])))
+
+@on_command('掷骰子', aliases=['投骰子'], only_to_me=False)
+async def _(session: CommandSession):
+    await session.send(str(random.randint(1,6)))
+
+@on_command('?', aliases=['？', '❓'], only_to_me=False)
+async def _(session: CommandSession):
+    await session.send('?')
+
+@on_command('seach_this_group_p', aliases=['本群总人数', '总人数', '群人数'], only_to_me=False, permission=perm.GROUP)
+async def _(session: CommandSession):
+    try:
+        seach_group_member = await session.bot.get_group_member_list(
+            group_id=session.ctx['group_id']
+        )
+    except:
+        await session.send('获取数据时出问题，请重试')
+        return
+    
+    await session.send(f'本群目前共有{len(seach_group_member)}人')
+    
+
+
+    
+\ No newline at end of file
diff --git a/AyaBot/plugins/bilibili.py b/AyaBot/plugins/bilibili.py
new file mode 100644
index 0000000..fa4554b
--- /dev/null
+++ b/AyaBot/plugins/bilibili.py
@@ -0,0 +1,33 @@
+import requests
+import nonebot
+import re
+from nonebot import on_command, CommandSession, CQHttpError
+
+
+@on_command('fan', aliases=['搜番', '查番', '番剧搜索', '搜索番剧'], only_to_me=False)
+async def seach_fan(session: CommandSession):
+    year = session.get('year', prompt='你想查找哪一年的番呢?(示范:2020)')
+    month = session.get('month', prompt='你想查找哪个月的番呢(示范:4)?')
+    await session.send('查询的情况如下:')
+    await session.send('日期:' + year + month)
+    # await session.send('标题:' + title)
+    # await session.send('链接:' + link)
+
+
+@seach_fan.args_parser
+async def _(session: CommandSession):
+    # if session.is_first_run:
+    #     return
+    if session.current_key == 'year':
+        if not re.fullmatch(r'\d{4}', session.current_arg_text):
+            session.pause('日期格式有误，请重新输入(示范:2020)')
+    
+    if session.current_key == 'month':
+        if not re.fullmatch(r'\d{2}', session.current_arg_text):
+            session.pause('日期格式有误，请重新输入(示范:4)')
+
+
+    # try:
+    # except CQHttpError:
+    #     await session.send('请求未响应或出错，请重试')
+
diff --git a/AyaBot/plugins/bilibili/__init__.py b/AyaBot/plugins/bilibili/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/AyaBot/plugins/bilibili/__init__.py
+++ /dev/null
diff --git a/AyaBot/plugins/bilibili/__pycache__/__init__.cpython-37.pyc b/AyaBot/plugins/bilibili/__pycache__/__init__.cpython-37.pyc
deleted file mode 100644
index a197886..0000000
--- a/AyaBot/plugins/bilibili/__pycache__/__init__.cpython-37.pyc
+++ /dev/null
diff --git a/AyaBot/plugins/bilibili/index.py b/AyaBot/plugins/bilibili/index.py
deleted file mode 100644
index c887183..0000000
--- a/AyaBot/plugins/bilibili/index.py
+++ /dev/null
@@ -1,3 +0,0 @@
-import requests
-import nonebot
-import json