diff --git a/bot.py b/bot.py
index 8bb07db..4c124b2 100644
--- a/bot.py
+++ b/bot.py
@@ -4,18 +4,17 @@ import graypy
from aiogram import executor
from create_bot import dp
-from handlers import pipisa, time_new_year, sendalarm, start_help
+
import handlers
-
-# logging.basicConfig(level=logging.DEBUG)
+logging.basicConfig(level=logging.DEBUG)
-logging.basicConfig(
- level = logging.DEBUG,
- handlers = [ graypy.GELFUDPHandler('localhost', 12201) ]
-)
+# logging.basicConfig(
+# level = logging.DEBUG,
+# handlers = [ graypy.GELFUDPHandler('localhost', 12201) ]
+# )
# pipisa.register_handlers_pipisa(dp)
# time_new_year.register_handlers_time(dp)
diff --git a/dicktxt/ForReadDict.py b/dicktxt/ForReadDict.py
index da1de00..427ff39 100644
--- a/dicktxt/ForReadDict.py
+++ b/dicktxt/ForReadDict.py
@@ -1,13 +1,12 @@
import random
def RandomDick():
- with open('tests\diction.txt', 'r', encoding='utf-8') as file:
+ with open('dicktxt\dick_sinonims.txt', 'r', encoding='utf-8') as file:
words = file.readlines()
random_line = random.choice(words).strip()
return random_line
-random_line = RandomDick()
\ No newline at end of file
diff --git a/dicktxt/__init__.py b/dicktxt/__init__.py
index e69de29..2508ff4 100644
--- a/dicktxt/__init__.py
+++ b/dicktxt/__init__.py
@@ -0,0 +1 @@
+from . import ForReadDict
diff --git a/dicktxt/dick_sinonims.txt b/dicktxt/dick_sinonims.txt
index 2cab1eb..52d02da 100644
--- a/dicktxt/dick_sinonims.txt
+++ b/dicktxt/dick_sinonims.txt
@@ -73,4 +73,4 @@
торчильник
факало
кочанчик
-усатая
\ No newline at end of file
+пипису
\ No newline at end of file
diff --git a/handlers/pipisa.py b/handlers/pipisa.py
index 64eed2f..a3b659b 100644
--- a/handlers/pipisa.py
+++ b/handlers/pipisa.py
@@ -5,7 +5,7 @@ from sqdb import user, session
import random
from random import randint
import datetime
-
+from dicktxt import ForReadDict
@dp.message_handler(commands=["dick"])
@@ -31,6 +31,8 @@ async def up_dick(message: types.Message):
if abs(diff) <= 0:
try:
current_dick = b.dick_size
+
+
await bot.send_message(message.chat.id, f'@{message.from_user.username},🚫 вы уже крутили пипису, ее размер {current_dick} см! ')
except:
print('ошибка в if diff <=0')
@@ -46,9 +48,9 @@ async def up_dick(message: types.Message):
a.datetimes = datetime.datetime.now()
session.flush()
session.commit() #обновляет запись
+ randomword = ForReadDict.RandomDick()
-
- await bot.send_message(message.chat.id, f'@{message.from_user.username}, ваш писюн {size_change}\
+ await bot.send_message(message.chat.id, f'@{message.from_user.username}, ваш {randomword} {size_change}\
на {abs(numb)} см!\n\
Теперь он равен {updetedDick} см! ')
except: