summaryrefslogtreecommitdiff
path: root/ATRI/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'ATRI/plugins')
-rw-r--r--ATRI/plugins/plugin_anime/__init__.py30
-rw-r--r--ATRI/plugins/plugin_anime/data_source.py1
-rw-r--r--ATRI/plugins/plugin_anime/sepi_list.json1
-rw-r--r--ATRI/plugins/plugin_chat/__init__.py27
-rw-r--r--ATRI/plugins/plugin_chat/drifting_bottle.json2
5 files changed, 34 insertions, 27 deletions
diff --git a/ATRI/plugins/plugin_anime/__init__.py b/ATRI/plugins/plugin_anime/__init__.py
index c51e73f..9bed2b7 100644
--- a/ATRI/plugins/plugin_anime/__init__.py
+++ b/ATRI/plugins/plugin_anime/__init__.py
@@ -18,6 +18,7 @@ from random import randint
from datetime import datetime, timedelta
from apscheduler.triggers.date import DateTrigger
+from nonebot.rule import Rule
from nonebot.log import logger
from nonebot.sched import scheduler
from nonebot.typing import Bot, Event
@@ -199,19 +200,20 @@ async def _(bot: Bot, event: Event, state: dict) -> None:
plugin_name_2 = "anime-setu"
key_LoliconAPI = config['api']['LoliconAPI']
-setu_type = 1 # setu-type: 1(local), 2(url: https://api.lolicon.app/#/setu) default: 1(local)
+setu_type = 2 # setu-type: 1(local), 2(url: https://api.lolicon.app/#/setu)
SP_temp_list = []
SP_list = []
-SEPI_PATH = Path('.') / 'ATRI' / 'plugins' / 'plugin_anime' / 'sepi_list.json'
-async def check_sepi(bot: Bot, event: Event, state: dict) -> bool:
+def check_sepi() -> Rule:
"""检查目标是否是涩批"""
- if event.user_id in SP_list:
- await bot.send(event, "你可少冲点吧！涩批！哼唧")
- return False
- else:
- return True
+ async def _check_sepi(bot: Bot, event: Event, state: dict) -> bool:
+ if event.user_id in SP_list:
+ await bot.send(event, "你可少冲点吧！涩批！哼唧")
+ return False
+ else:
+ return True
+ return Rule(_check_sepi)
def add_sepi(user: int) -> None:
"""将目标移入涩批名单"""
@@ -226,7 +228,7 @@ def del_sepi(user: int) -> None:
setu = on_regex(
r"来[点丶张份副个幅][涩色瑟][图圖]|[涩色瑟][图圖]来|[涩色瑟][图圖][gkd|GKD|搞快点]|[gkd|GKD|搞快点][涩色瑟][图圖]",
- rule=check_banlist() & check_switch(plugin_name_2, False) & check_sepi)
+ rule=check_banlist() & check_switch(plugin_name_2, False) & check_sepi())
@setu.handle()
@@ -235,6 +237,7 @@ async def _(bot: Bot, event: Event, state: dict) -> None:
user = event.user_id
group = event.group_id
res = randint(1, 5)
+ print(1)
if countX(SP_temp_list, user) == 5:
add_sepi(user) # type: ignore
@@ -249,9 +252,12 @@ async def _(bot: Bot, event: Event, state: dict) -> None:
if setu_type == 1:
- con = sqlite3.connect(
- Path('.') / 'ATRI' / 'data' / 'data_Sqlite' / 'setu' /
- 'nearR18.db')
+ DATA_PATH = Path('.') / 'ATRI' / 'data' / 'data_Sqlite' / 'setu' / 'nearR18.db'
+
+ if not DATA_PATH.is_file():
+ await setu.finish("数据库...她是空的！！！")
+
+ con = sqlite3.connect(DATA_PATH)
cur = con.cursor()
msg = cur.execute('SELECT * FROM nearR18 ORDER BY RANDOM() limit 1;')
diff --git a/ATRI/plugins/plugin_anime/data_source.py b/ATRI/plugins/plugin_anime/data_source.py
index 21f7d74..a479a0e 100644
--- a/ATRI/plugins/plugin_anime/data_source.py
+++ b/ATRI/plugins/plugin_anime/data_source.py
@@ -47,6 +47,7 @@ def resultRepo(user: str, key: str, img_url: str):
try:
task = SauceNAO(key)
data = task.search(img_url)
+ print(data)
except Exception:
return errorRepo('请求数据失败')
diff --git a/ATRI/plugins/plugin_anime/sepi_list.json b/ATRI/plugins/plugin_anime/sepi_list.json
index 9e26dfe..e69de29 100644
--- a/ATRI/plugins/plugin_anime/sepi_list.json
+++ b/ATRI/plugins/plugin_anime/sepi_list.json
@@ -1 +0,0 @@
-{} \ No newline at end of file
diff --git a/ATRI/plugins/plugin_chat/__init__.py b/ATRI/plugins/plugin_chat/__init__.py
index edd7dc7..83afc62 100644
--- a/ATRI/plugins/plugin_chat/__init__.py
+++ b/ATRI/plugins/plugin_chat/__init__.py
@@ -82,7 +82,7 @@ async def _poke(bot: Bot, event: Event, state: dict) -> None:
msg = choice([
"你再戳！", "？再戳试试？", "别戳了别戳了再戳就坏了555", "我爪巴爪巴，球球别再戳了", "你戳你🐎呢？！",
"那...那里...那里不能戳...绝对...", "(。´・ω・)ん?", "有事恁叫我，别天天一个劲戳戳戳！", "欸很烦欸！你戳🔨呢",
- "?"
+ "?", "差不多得了😅", "欺负咱这好吗？这不好", "我希望你耗子尾汁"
])
await pokehah.finish(msg)
@@ -273,21 +273,21 @@ async def _(bot: Bot, event: Event, state: dict) -> None:
await hitokoto.finish(info["hitokoto"])
-# laughFunny = on_command('来句笑话', rule=check_banlist())
+laughFunny = on_command('来句笑话', rule=check_banlist())
-# @laughFunny.handle() #type: ignore
-# async def _(bot: Bot, event: Event, state: dict) -> None:
-# name = event.sender['nickname']
-# result = []
[email protected]() #type: ignore
+async def _(bot: Bot, event: Event, state: dict) -> None:
+ name = event.sender['nickname']
+ result = []
-# LAUGH_FILE = Path('.') / 'ATRI' / 'plugins' / 'plugin_chat' / 'laugh.txt'
+ LAUGH_FILE = Path('.') / 'ATRI' / 'plugins' / 'plugin_chat' / 'laugh.txt'
-# with open(LAUGH_FILE, 'r', encoding='utf-8') as f:
-# for line in f:
-# result.append(line.strip('\n'))
+ with open(LAUGH_FILE, 'r', encoding='utf-8') as f:
+ for line in f:
+ result.append(line.strip('\n'))
-# resu = choice(result)
-# print(resu%name)
+ resu = choice(result)
+ await laughFunny.finish(resu.replace("%name", name))
# 扔漂流瓶
plugin_name = 'drifting-bottle'
@@ -405,7 +405,7 @@ async def _(bot: Bot, event: Event, state: dict) -> None:
# 舆情监听
-publicOpinion = on_message(rule=check_banlist(True))
+publicOpinion = on_message(rule=check_banlist())
ban_temp_list = []
@@ -420,6 +420,7 @@ async def _(bot: Bot, event: Event, state: dict) -> None:
user) == Textcheck().get_times(str(Textcheck().check(msg))):
ban_temp_list = list(set(ban_temp_list))
ban(user)
+ await publicOpinion.finish(Textcheck().check(msg))
if Textcheck().check(msg) == "False":
return
diff --git a/ATRI/plugins/plugin_chat/drifting_bottle.json b/ATRI/plugins/plugin_chat/drifting_bottle.json
index 9e26dfe..8a57a22 100644
--- a/ATRI/plugins/plugin_chat/drifting_bottle.json
+++ b/ATRI/plugins/plugin_chat/drifting_bottle.json
@@ -1 +1 @@
-{} \ No newline at end of file
+{"1": [1172294279, 516729280, "\u6ca1\u5565\uff0c\u9001\u4e00\u5f20\u6da9\u56fe8[CQ:image,file=542e3acdfba13430d61b084fb07a2812.image,url=http://gchat.qpic.cn/gchatpic_new/1172294279/516729280-3085694275-542E3ACDFBA13430D61B084FB07A2812/0?term=2]"]} \ No newline at end of file
Powered by cgit, Theme cgit-dark created by Ted Yin, updated by Mole Shang.