From 9867a5a0279c0a885a8c0001915c3d12995c934e Mon Sep 17 00:00:00 2001 From: HibiKier <45528451+HibiKier@users.noreply.github.com> Date: Thu, 20 May 2021 17:42:03 +0800 Subject: [PATCH] Delete configs directory --- configs/__pycache__/config.cpython-39.pyc | Bin 3883 -> 0 bytes .../__pycache__/path_config.cpython-39.pyc | Bin 1377 -> 0 bytes configs/config.py | 147 ------------------ configs/path_config.py | 66 -------- configs/utils/__pycache__/util.cpython-39.pyc | Bin 1095 -> 0 bytes configs/utils/util.py | 35 ----- 6 files changed, 248 deletions(-) delete mode 100644 configs/__pycache__/config.cpython-39.pyc delete mode 100644 configs/__pycache__/path_config.cpython-39.pyc delete mode 100644 configs/config.py delete mode 100644 configs/path_config.py delete mode 100644 configs/utils/__pycache__/util.cpython-39.pyc delete mode 100644 configs/utils/util.py diff --git a/configs/__pycache__/config.cpython-39.pyc b/configs/__pycache__/config.cpython-39.pyc deleted file mode 100644 index 7ad57980f2015036802a140a4538f686fc5b5cbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3883 zcmZuz>vt2!6<9g!D8W#bs#IU<*b73 zJxt=+ylpR+<%H+abHYxvUD$lWlhuVk(0RrDJ4uV*c&pUv-K^DdZoBM;1YVTMOOKm&mM&<3FenCuWpy}{64ru7>b zzX`K%L3^XIshv~(HLW6z{b%yFz;O1C3x@- zyd7`F+wgOU!+mJtN{isdP4iameQY_w2|VT*=CAn{xe)jJmxKZA$2=a`%;DW9tS~oV zj;;+Zaun_5=B7LP%9d|F27%IMfX3;wE6ZnBe!5(F zbZO=Bwen{R#*cHx>{5TN1!hU-Snzj|*hpNQ2uH?}wI<5-49AnPgg73a5JSO(^%;78 zh@&CBFHu`hiQWb=J`s60mQ+|`jN3wF&ch193^YU;_t2+*Jxa%BRL+82Sas{wtc~v32Sg{Ino**uFp8el3~VYi{VurNL;k^li*N~HgV#IY3-|`T11`7E?dJnN50WGgX^+OEk>Pku zJPF> zBT2r2K-wMfq*A=kFZ2y$__QnFaUoA8!v_XDDPKB;2HpIigfo7>J0A05#+UN>-5HPHe{63-)r(mT>xXj?)s&o)r{$po;rApZ>-M_b9`D;G z=Q`r*Pb)({-s`DLrPLzZUX?pf%5(Re_EHCA9d=ah!&%sFmD8s*`j9lbi8Q*qoOX>q zT&83Ec#CdHDo|OtN?{v7VkE=`HSD&6TS7;DyRGvL$9yHV4@9(TU zxX1LW4Ay2pFMs^EXDyePXIB%Z1oQR$$@0Ss^)T*1MCGq9*5ftvZmNBLcIEMvRm95E zyT%s}RuMGYOV=xx?^cgD@>RZZ%eeQ2sn2Ft5hgU1>dRHW{Kh!(F%vhTIlD@~EKC7D=*v_$|%O6#cF+=6lCG*w%^ZCp81{_IR?>;I*V6W`S?+=aihg#}P~ z`l!0JU_Spd_hIxid*;3w;f0&4SmVM?#@4RhTE)W1w6JuNW`mtL7HsX&N9A)TO$`&$ zxs^wsfSth`xA({p= zqi}$Xhx7HP{%g8CccHrYwR0C~(dDcn$_i=Kv4TW7pCxS!>9|-T?MJ8NBKD+mQhHkJ z1JlHDxTF@PqO2-9X?|ZW!mEh%Fa;zl*{rH$#UrYm#>Al(up*`<9qXhiSNfm?OJt;J zEavqrv875gq$NKiX4M=btpEy|TF_zXDYYO@;aq`iR8$4SYfLQUN?92!sc8guHR320 z;FF6**py_0jwLNUC8kQ5jHpk8SV5zUw;aV%aSDW+XXL}+7jYb&l8U0F$azdU>PqIQ zT?e1R)-={U+D-^j+ePEF7u0D?+K?t4g&;Jf(Yh0YQm~lOWJnchD{7LW=fD-R9%JEsrmf=;7D8spL8+LcnM&#EJ@5 z(~xz+&{!lUhQcF3uqXzTiT$hu5+@_0F>y2=4UtWeSR@e%M#af+A}Nkf#PL zCq)`Q6NQp$HD{V!{|h<1KRkSZiE6zx1siC$iFULK)aV;a+Xfw3n;Z|(N^LYg{Eo=# zGuXQ`dJ*U8art0|IM}{7ac3z0UW`>-G#i2=8XvA_hIB#l;$koq5=SN?;aEtc#T>Ee zMNQj5QF9_n>nCDQ(QVlZ)rP1@a8T?e`XO&ENV4e6dZ72 zt$9Xu4^CQx;M}E z^qaJR*Z&UP8jID^0oNM4-QH@mTPZd#yOmuQ=q+$r?KXC|HRj=N10@UaRMHM(Ybzc9 ra>1y%eo@xM^xlx6h_b&Pn_OM@pUu0i;N{QPf12CPnGQ?0WxefxuCPy< diff --git a/configs/__pycache__/path_config.cpython-39.pyc b/configs/__pycache__/path_config.cpython-39.pyc deleted file mode 100644 index 9943608c606c308e316872b2f3b31bf8409084df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1377 zcma)*%Wl&^6ozMf9ba;(kSItj*r9Cd9TFEIqBbp&dWmSbD2im9jN6#RaWtOLHYyv6 z*ugWj5-iy80A2AM-mqZRSLli}la$&U#Ejh8)>oL(J=~Ds-NJ%05w2OP!p7Z5>N}&0<}SH zPzTfjbwORw5-rj4N7N~YMp7+U0^s&4QG}8ko)~)ycg~J zG~mGnV8OLkzz5>@7rPCAb!U6Mx#6!jHyg7u3)5uE`eEut@xC{!Ui)`R)DOM<6a0{S zGi{W>bGiRVWmI7am3C! zK0)u%F*;Q!KEv!TSC664w-J;>lT-nEUs6R ziKGV5FOnLPT9TSTze;LKYD-Fho=Zw3b-4D{r4~&4vw{)V3(hDwv*1X2{hND z>sBU5nH7yA?hCjKd!=g-kfLD&+t~f*D&xXbsyIK{E!Za`z8?qC*!Q<T<2x`&pQ2m+c=0r-_P_3i^g15Cl|yAX5?|4(CH|AB6>N! T1Hpw4bycDirb_M^D#3pMTDV4y diff --git a/configs/config.py b/configs/config.py deleted file mode 100644 index 67ae715e..00000000 --- a/configs/config.py +++ /dev/null @@ -1,147 +0,0 @@ -from .utils.util import get_config_data -try: - import ujson as json -except ModuleNotFoundError: - import json - - -# 是否使用配置文件 -USE_CONFIG_FILE = False - - -# 公开图库列表 -IMAGE_DIR_LIST = ["色图", "美图", "萝莉", "壁纸"] - -# 对被ban用户发送的消息 -BAN_RESULT = "才不会给你发消息." - -MAXINFO_REIMU: int = 7 # 上车功能查找目的地的最大数 -COUNT_PER_DAY_REIMU: int = 5 # 每日上车次数限制 -MAXINFO_BT: int = 10 # bt功能单次查找最大数 -MAXINFO_PRIVATE_ANIME: int = 20 # 私聊单词搜索动漫最大数 -MAXINFO_GROUP_ANIME: int = 5 # 群单词搜索动漫最大数 -MAX_FIND_IMG_COUNT = 3 # 识图最大返回数 - -ADMIN_DEFAULT_AUTH = 5 # 默认群管理员权限 - -MAX_SIGN_GOLD = 200 # 好感度加成额外获得的最大金币数 - -INITIAL_SETU_PROBABILITY = 0.7 # 色图概率 -FUDU_PROBABILITY = 0.7 # 复读概率 - -INITIAL_OPEN_CASE_COUNT = 20 # 初始开箱次数 -MUTE_DEFAULT_COUNT = 10 # 刷屏禁言默认检测次数 -MUTE_DEFAULT_TIME = 7 # 刷屏检测默认规定时间 - -MUTE_DEFAULT_DURATION = 10 # 刷屏检测默禁言时长（分钟） - -# 注：即在 MALICIOUS_BAN_COUNT 时间内触发相同命令 MALICIOUS_CHECK_TIME 将被ban MALICIOUS_BAN_TIME 分钟 -MALICIOUS_BAN_TIME = 30 # 恶意命令触发检测触发后ban的时长（分钟） -MALICIOUS_BAN_COUNT = 4 # 恶意命令触发检测规定时间内（秒） -MALICIOUS_CHECK_TIME = 5 # 恶意命令触发检测最大触发次数 - -# LEVEL -DELETE_IMG_LEVEL: int = 7 -MOVE_IMG_LEVEL: int = 7 -UPLOAD_LEVEL: int = 6 -BAN_LEVEL: int = 5 -OC_LEVEL: int = 2 -MUTE_LEVEL: int = 5 - -# 需要更新gocq吗？ -UPDATE_GOCQ_GROUP = [] - - -# 代理 -system_proxy = 'http://127.0.0.1:7890' -buff_proxy = '' - -# 是否存储色图 -DOWNLOAD_SETU = True -# 是否使用本地色图 -LOCAL_SETU = True -# 是否自动同意好友添加 -AUTO_ADD_FRIEND = True - - -# API KEY -LOLICON_KEY: str = "336595836015174952daa2" # lolicon -RSSHUBAPP: str = "https://docs.rsshub.app/" # rsshub -# 图灵 -TL_KEY = ["4474710fabbf4540bfaa569c192bb457", "6f4c0920d2ff4962b5cbd8148aef771b", - "f5595738894042fb9fad88ecdc4acf41", "c24400595fed48f9a5c5bc3ff03a3267", "efab135b75d84b02a59115f5b571f277"] - -# 数据库 -bind = 'postgresql://hibiki:KEWang130123@hibiki0v0.cn:5432/hibikibot' -sql_name = '' -user = '' -password = '' -address = '' -port = '' -database = '' - - -plugins2name_dict = { - 'sign_in': ['签到'], - 'send_img': ['发送图片', '萝莉', '美图', '壁纸'], - 'send_setu': ['色图', '涩图', '瑟图', '查色图'], - 'white2black': ['黑白图', '黑白草图'], - 'coser': ['coser', 'cos'], - 'quotations': ['语录'], - 'jitang': ['鸡汤'], - 'send_dinggong_voice': ['骂我', '骂老子', '骂劳资'], - 'open_cases': ['开箱', '我的开箱', '群开箱统计', '我的金色'], - 'luxun': ['鲁迅说过', '鲁迅说'], - 'fake_msg': ['假消息'], - 'buy': ['购买', '购买道具'], - 'my_gold': ['我的金币'], - 'my_props': ['我的道具'], - 'shop_help': ['商店'], - 'nonebot_plugin_cocdicer': ['骰子娘'], - 'update_pic': ['图片', '操作图片', '修改图片'], - 'search_buff_skin_price': ['查询皮肤'], - 'weather': ['天气', '查询天气', '天气查询'], - 'yiqing': ['疫情', '疫情查询', '查询疫情'], - 'what_anime': ['识番'], - 'search_anime': ['搜番'], - 'songpicker2': ['点歌'], - 'epic': ['epic'], - 'pixiv': ['pixiv', 'p站排行', '搜图'], - 'poke': ['戳一戳'], - 'draw_card': ['游戏抽卡', '原神一井', '原神来一井', '方舟一井', '方舟来一井'], - 'ai': ['ai', 'Ai', 'AI', 'aI'], - 'one_friend': ['我有一个朋友', '我有一个朋友想问问'], - 'translate': ['翻译', '英翻', '翻英', '日翻', '翻日', '韩翻', '翻韩'], - 'nonebot_plugin_picsearcher': ['识图'], - 'almanac': ['原神黄历', '黄历'], - 'material_remind': ['今日素材', '天赋材料'], - 'qiu_qiu_translation': ['丘丘翻译', '丘丘一下', '丘丘语翻译'], - 'query_resource_points': ['原神资源查询', '原神资源列表'], -} - - -admin_plugins_auth = { - 'admin_bot_manage': OC_LEVEL, - 'ban': BAN_LEVEL, - 'delete_img': DELETE_IMG_LEVEL, - 'move_img': MOVE_IMG_LEVEL, - 'upload_img': UPLOAD_LEVEL, - 'admin_help': 1, - 'mute': MUTE_LEVEL, -} - - -if USE_CONFIG_FILE: - config = get_config_data() - if config: - for key in config.keys(): - if isinstance(config[key], str): - config[key] = config[key].strip() - # if not configs[key] and key.find("PATH") == -1: - # configs[key] = None - globals().update(config) - - - - - diff --git a/configs/path_config.py b/configs/path_config.py deleted file mode 100644 index 2456ea6a..00000000 --- a/configs/path_config.py +++ /dev/null @@ -1,66 +0,0 @@ -from .utils.util import get_config_data -from pathlib import Path -from configs.config import USE_CONFIG_FILE - -# 图片路径 -IMAGE_PATH = Path("resources/img/") -# 音频路径 -VOICE_PATH = Path("resources/voice/") -# 文本路径 -TXT_PATH = Path("resources/txt/") -# 日志路径 -LOG_PATH = Path("log/") -# 字体路径 -TTF_PATH = Path("resources/ttf/") -# 数据路径 -DATA_PATH = Path("data/") -# 抽卡数据路径 -DRAW_PATH = Path("data/draw_card/") -# 临时图片路径 -TEMP_PATH = Path("resources/img/temp/") - - -def init_path(): - global IMAGE_PATH, VOICE_PATH, TXT_PATH, LOG_PATH, TTF_PATH, DATA_PATH, DRAW_PATH, TEMP_PATH - if USE_CONFIG_FILE: - data = get_config_data() - if data.get('IMAGE_PATH'): - IMAGE_PATH = Path(data['IMAGE_PATH']) - if data.get('VOICE_PATH'): - VOICE_PATH = Path(data['VOICE_PATH']) - if data.get('TXT_PATH'): - TXT_PATH = Path(data['TXT_PATH']) - if data.get('LOG_PATH'): - LOG_PATH = Path(data['LOG_PATH']) - if data.get('TTF_PATH'): - TTF_PATH = Path(data['TTF_PATH']) - if data.get('DATA_PATH'): - DATA_PATH = Path(data['DATA_PATH']) - if data.get('DRAW_PATH'): - DRAW_PATH = Path(data['DRAW_PATH']) - if data.get('TEMP_PATH'): - TEMP_PATH = Path(data['TEMP_PATH']) - IMAGE_PATH.mkdir(parents=True, exist_ok=True) - VOICE_PATH.mkdir(parents=True, exist_ok=True) - TXT_PATH.mkdir(parents=True, exist_ok=True) - LOG_PATH.mkdir(parents=True, exist_ok=True) - TTF_PATH.mkdir(parents=True, exist_ok=True) - DATA_PATH.mkdir(parents=True, exist_ok=True) - DRAW_PATH.mkdir(parents=True, exist_ok=True) - TEMP_PATH.mkdir(parents=True, exist_ok=True) - - IMAGE_PATH = str(IMAGE_PATH.absolute()) + '/' - VOICE_PATH = str(VOICE_PATH.absolute()) + '/' - TXT_PATH = str(TXT_PATH.absolute()) + '/' - LOG_PATH = str(LOG_PATH.absolute()) + '/' - TTF_PATH = str(TTF_PATH.absolute()) + '/' - DATA_PATH = str(DATA_PATH.absolute()) + '/' - DRAW_PATH = str(DRAW_PATH.absolute()) + '/' - TEMP_PATH = str(TEMP_PATH.absolute()) + '/' - - -init_path() - - -if __name__ == '__main__': - print(IMAGE_PATH) diff --git a/configs/utils/__pycache__/util.cpython-39.pyc b/configs/utils/__pycache__/util.cpython-39.pyc deleted file mode 100644 index 3ec6590c37b2862e445e8613b90ccff800699f5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1095 zcmZXT&ubGw6vt=wM}9Z`VNtB$!CNjtJQXQYuof?tf~dGe;wH0A)^2v14f1bS!Ajl?eIxnF{y52!xk(yGYarRik_uJ)pJs?6JeGQ z6g4ZS>gKU*f%sUx&&q?8qFJqTyfSmetmwhz5KL! zcd7kprB#2{iAh3hHQqb5SI**U^YNQzweEa;w7q%H`MS`0antuKJ#-eU&DS+&so~t; z$WR7fS^IkyYA>(08VxsLB4W6I*cQCf1dYnX7HCn?4bF4VDkaknSVcG&iaj`~YRVL4 zlho45DZ`+K!MjnB^Ri|so+BYh(Tr>=ex1_L|2U*rHwl}EC0-(9022Kjn>e1DF0nk- z{a5-rHD*(JHKWd|P>VlG`LI(KQ#I4G$zsXw&nY`6Iqja~7^F0hfI*yqIXr?7!xO^; zejmm$E&$^g7stjBL?xnjun4z8Q!`%m(y*x**VL?HCc7?)SF$8pE-=Hr8TP(2lvurB zI#h|8Wp;l$E$cdEGE=E;rqkYHUcp^v(9IMYD|o3+V3?V4Fmc!*=WY_m`56BXRVYho diff --git a/configs/utils/util.py b/configs/utils/util.py deleted file mode 100644 index bad502da..00000000 --- a/configs/utils/util.py +++ /dev/null @@ -1,35 +0,0 @@ -from pathlib import Path -from services.init_config import init_config -try: - import ujson as json -except ModuleNotFoundError: - import json - - -data: dict = {} - - -def get_config_data(): - global data - if not data: - try: - base_config = json.load(open(Path() / "config.json", 'r', encoding='utf8')) - plugins2cmd_config = json.load(open(Path() / 'configs' / 'plugins2cmd_config.json', 'r', encoding='utf8')) - other_config = json.load(open(Path() / 'configs' / 'other_config.json', 'r', encoding='utf8')) - for key in base_config.keys(): - data.update(base_config[key]) - for key in plugins2cmd_config.keys(): - data.update(plugins2cmd_config[key]) - for key in other_config.keys(): - data.update(other_config[key]) - except FileNotFoundError: - # logger.warning('配置文件不存在，生成默认配置....请填写数据库等必要数据后再次启动bot...') - init_config() - raise FileNotFoundError('配置文件不存在，生成默认配置....请填写数据库等必要数据后再次启动bot...') - except ValueError: - # logger.error('配置文件错误....') - raise ValueError('配置文件错误....') - return data - - -