minor refactor
This commit is contained in:
+4
-4
@@ -5,10 +5,10 @@ from urllib import parse
|
||||
|
||||
from . import stan
|
||||
from . import reminder
|
||||
from . import reloads
|
||||
from . import reloader
|
||||
from . import report
|
||||
from .me import get_me
|
||||
from .check import *
|
||||
from .filters import *
|
||||
from .config import *
|
||||
|
||||
# https://core.telegram.org/bots/api Telegram Bot API
|
||||
@@ -216,7 +216,7 @@ def tease_nongrata(message: types.Message):
|
||||
@bot.message_handler(func=is_admin, commands=['reload'])
|
||||
def send_stats(message):
|
||||
logging.warning('Reloading...')
|
||||
reloads.reload_modules()
|
||||
reloader.reload_modules()
|
||||
bot.send_message(message.chat.id, 'Reloaded successfully')
|
||||
|
||||
|
||||
@@ -283,7 +283,7 @@ def handle_msg(message: types.Message):
|
||||
else:
|
||||
s['Messages'][message.from_user.id]['Count'] += 1
|
||||
|
||||
quote = stan.speak(20)
|
||||
quote = stan.speak(30)
|
||||
if quote:
|
||||
bot.send_message(message.chat.id, quote)
|
||||
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ ADMIN_ID = 280887861 # Rykov7
|
||||
PYTHONCHATRU = -1001338616632 # pythonchatru
|
||||
|
||||
URL_RX = re.compile(r'\w+\.\w+/\w+')
|
||||
ALLOWED_WORDS = ['paste', 'github', 'google', 'nometa', 'python', 'django', 'flask', 'fastapi',
|
||||
ALLOWED_WORDS = ['paste', 'github', 'google', 'nometa', 'python', 'django', 'flask', 'fastapi', 'wiki'
|
||||
'stackoverflow', 'habr', 'medium', 'youtu', 'stepik', 'telegraph', '#rtfm', 'support']
|
||||
|
||||
WHITEUN = set(os.environ.get('whitelist', '<<<ERR_USRS').split(','))
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from importlib import reload
|
||||
|
||||
from . import bot as bot_mod
|
||||
from . import check
|
||||
from . import bot
|
||||
from . import filters
|
||||
from . import config
|
||||
from . import me
|
||||
from . import report
|
||||
@@ -9,8 +9,8 @@ from . import stan
|
||||
|
||||
|
||||
def reload_modules():
|
||||
reload(bot_mod)
|
||||
reload(check)
|
||||
reload(bot)
|
||||
reload(filters)
|
||||
reload(config)
|
||||
reload(me)
|
||||
reload(report)
|
||||
+3
-1
@@ -2,13 +2,15 @@ import shelve
|
||||
import os
|
||||
from .config import DATA
|
||||
|
||||
|
||||
def create_report_text(chat_id):
|
||||
top_users = ''
|
||||
flooders = []
|
||||
if os.path.exists(f'{DATA}{chat_id}.db'):
|
||||
with shelve.open(f'{DATA}{chat_id}') as s:
|
||||
for n in range(min(3, len(s['Messages']))):
|
||||
top_user = s['Messages'][sorted(s['Messages'], key=lambda a: s['Messages'][a]['Count'], reverse=True)[n]]
|
||||
top_user = s['Messages'][
|
||||
sorted(s['Messages'], key=lambda a: s['Messages'][a]['Count'], reverse=True)[n]]
|
||||
if top_user['Count'] >= 10:
|
||||
flooders.append(top_user)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user