Merge branch '0.1.0-dev' of https://git.vdk2ch.ru/Pavel_Durov/python_bot into 0.1.0-dev

This reverts commit 92db050945.

.drone.yml

@@ -20,6 +20,12 @@ steps:
   - cd /usr/share/$DRONE_REPO_NAME
   - git pull
   - chown -R jack:jack .
+  when:
+    branch:
+    - main
 - name: restart systemd unit
   commands:
   - systemctl restart jack_bot
+  when:
+    branch:
+    - main

.gitignore

@@ -2,3 +2,6 @@ __pycache__
 testDB.py
 TIME.py
 .vscode
+tests
+qeqeqe
+env

alembic.ini

@@ -0,0 +1,110 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts
+script_location = alembic
+
+# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
+# Uncomment the line below if you want the files to be prepended with date and time
+# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
+# for all available tokens
+# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
+
+# sys.path path, will be prepended to sys.path if present.
+# defaults to the current working directory.
+prepend_sys_path = .
+
+# timezone to use when rendering the date within the migration file
+# as well as the filename.
+# If specified, requires the python-dateutil library that can be
+# installed by adding `alembic[tz]` to the pip requirements
+# string value is passed to dateutil.tz.gettz()
+# leave blank for localtime
+# timezone =
+
+# max length of characters to apply to the
+# "slug" field
+# truncate_slug_length = 40
+
+# set to 'true' to run the environment during
+# the 'revision' command, regardless of autogenerate
+# revision_environment = false
+
+# set to 'true' to allow .pyc and .pyo files without
+# a source .py file to be detected as revisions in the
+# versions/ directory
+# sourceless = false
+
+# version location specification; This defaults
+# to alembic/versions.  When using multiple version
+# directories, initial revisions must be specified with --version-path.
+# The path separator used here should be the separator specified by "version_path_separator" below.
+# version_locations = %(here)s/bar:%(here)s/bat:alembic/versions
+
+# version path separator; As mentioned above, this is the character used to split
+# version_locations. The default within new alembic.ini files is "os", which uses os.pathsep.
+# If this key is omitted entirely, it falls back to the legacy behavior of splitting on spaces and/or commas.
+# Valid values for version_path_separator are:
+#
+# version_path_separator = :
+# version_path_separator = ;
+# version_path_separator = space
+version_path_separator = os  # Use os.pathsep. Default configuration used for new projects.
+
+# set to 'true' to search source files recursively
+# in each "version_locations" directory
+# new in Alembic version 1.10
+# recursive_version_locations = false
+
+# the output encoding used when revision files
+# are written from script.py.mako
+# output_encoding = utf-8
+
+sqlalchemy.url = postgresql+psycopg2://postgres:postgres@postgres.vdk2ch.ru:5432/jack_bot
+
+
+[post_write_hooks]
+# post_write_hooks defines scripts or Python functions that are run
+# on newly generated revision scripts.  See the documentation for further
+# detail and examples
+
+# format using "black" - use the console_scripts runner, against the "black" entrypoint
+# hooks = black
+# black.type = console_scripts
+# black.entrypoint = black
+# black.options = -l 79 REVISION_SCRIPT_FILENAME
+
+# Logging configuration
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARN
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARN
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

alembic/README

@@ -0,0 +1 @@
+Generic single-database configuration.

alembic/env.py

@@ -0,0 +1,78 @@
+from logging.config import fileConfig
+
+from sqlalchemy import engine_from_config
+from sqlalchemy import pool
+from sqdb import Base
+from alembic import context
+
+# this is the Alembic Config object, which provides
+# access to the values within the .ini file in use.
+config = context.config
+
+# Interpret the config file for Python logging.
+# This line sets up loggers basically.
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+# add your model's MetaData object here
+# for 'autogenerate' support
+# from myapp import mymodel
+# target_metadata = mymodel.Base.metadata
+target_metadata = Base.metadata
+
+# other values from the config, defined by the needs of env.py,
+# can be acquired:
+# my_important_option = config.get_main_option("my_important_option")
+# ... etc.
+
+
+def run_migrations_offline() -> None:
+    """Run migrations in 'offline' mode.
+
+    This configures the context with just a URL
+    and not an Engine, though an Engine is acceptable
+    here as well.  By skipping the Engine creation
+    we don't even need a DBAPI to be available.
+
+    Calls to context.execute() here emit the given string to the
+    script output.
+
+    """
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+def run_migrations_online() -> None:
+    """Run migrations in 'online' mode.
+
+    In this scenario we need to create an Engine
+    and associate a connection with the context.
+
+    """
+    connectable = engine_from_config(
+        config.get_section(config.config_ini_section, {}),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    with connectable.connect() as connection:
+        context.configure(
+            connection=connection, target_metadata=target_metadata
+        )
+
+        with context.begin_transaction():
+            context.run_migrations()
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

alembic/script.py.mako

@@ -0,0 +1,24 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision = ${repr(up_revision)}
+down_revision = ${repr(down_revision)}
+branch_labels = ${repr(branch_labels)}
+depends_on = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    ${downgrades if downgrades else "pass"}

alembic/versions/7521d874503f_.py

@@ -0,0 +1,47 @@
+"""empty message
+
+Revision ID: 7521d874503f
+Revises: 
+Create Date: 2023-06-22 15:21:26.835612
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '7521d874503f'
+down_revision = None
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('dick_requests',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('size_change', sa.Integer(), nullable=True),
+    sa.Column('user_id', sa.Integer(), nullable=True),
+    sa.Column('date_changed', sa.DateTime(), nullable=True),
+    sa.ForeignKeyConstraint(['user_id'], ['users.user_id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_foreign_key(None, 'user_dicks', 'users', ['user_id'], ['user_id'])
+    op.add_column('users', sa.Column('date_created', sa.DateTime(), nullable=True))
+    op.add_column('users', sa.Column('date_updated', sa.DateTime(), nullable=True))
+    op.drop_column('users', 'chat_id')
+    op.drop_column('users', 'datetimes')
+    op.drop_column('users', 'dick_size')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('dick_size', sa.INTEGER(), autoincrement=False, nullable=True))
+    op.add_column('users', sa.Column('datetimes', postgresql.TIMESTAMP(), autoincrement=False, nullable=True))
+    op.add_column('users', sa.Column('chat_id', sa.BIGINT(), autoincrement=False, nullable=True))
+    op.drop_column('users', 'date_updated')
+    op.drop_column('users', 'date_created')
+    op.drop_constraint(None, 'user_dicks', type_='foreignkey')
+    op.drop_table('dick_requests')
+    # ### end Alembic commands ###

bot.py

@@ -4,39 +4,22 @@ import graypy
 from aiogram import executor
 
 from create_bot import dp
-from handlers import pipisa, time_new_year, start_help
-from othersq import sendnot
+
+import handlers
 
 
-
-class TagFilter(logging.Filter):
-    def __init__(self):
-        self.tag = 'jack_bot'
-
-    def filter(self, record):
-        record.tag = self.tag
-        return True
+logging.basicConfig(level=logging.DEBUG)
 
 
 logging.basicConfig(
-    level    = logging.DEBUG,
-    handlers = [ graypy.GELFUDPHandler('localhost', 12201) ]
+    level=logging.DEBUG,
+    handlers=[graypy.GELFUDPHandler('localhost', 12201)]
 )
-( logging.getLogger( ) ).addFilter(TagFilter())
-#logging.LoggerAdapter(logging.getLogger( ), {'tag': 'jack_bot'})
-#root_logger = logging.getLogger( )
-
-#handler = graypy.GELFUDPHandler('localhost', 12201)
-#root_logger.addHandler(handler)
-#root_logger.addFilter(TagFilter())
-
-
-
-pipisa.register_handlers_pipisa(dp)
-time_new_year.register_handlers_time(dp)
-start_help.register_handlers_StartHelp(dp)
-sendnot.register_handlers_sendnotal(dp)
 
+# pipisa.register_handlers_pipisa(dp)
+# time_new_year.register_handlers_time(dp)
+# sendalarm.register_handlers_test(dp)
+# start_help.register_handlers_StartHelp(dp)
 
 
 if __name__ == '__main__':

dicktxt/ForReadDict.py

@@ -0,0 +1,16 @@
+
+import random
+
+def RandomDick():
+# Забирает рандомный синоним к слову хуй из dick_sinonims.txt
+# у линуха и винды не забывай про разные \/
+# когда указываешь путь
+    with open('dicktxt/dick_sinonims.txt', 'r', encoding='utf-8') as file:
+        words = file.readlines()
+
+    random_line = random.choice(words).strip()
+    return random_line
+
+
+
+    

dicktxt/__init__.py

@@ -0,0 +1 @@
+from . import ForReadDict

dicktxt/dick_sinonims.txt

@@ -0,0 +1,95 @@
+Кожаный бабах
+пистон
+дуршлаг
+елдак
+шлямбур
+шмайсер
+хохотунчик
+головастик
+пистон
+мундштук
+мухомор
+головач
+красненький
+чупа-чупс
+щекотунчик
+питательный
+тюбик
+джойстик
+хоббит
+крючок
+ласкун
+красавец
+хозяин
+хрящ
+чудильник
+царь пижамы
+целколом
+щуп
+эклер
+долбильник
+народник
+духопер
+ежик малиновый
+жрец любви
+жизненный конус
+злой одноглазый пиратик
+главтрах
+веселый парнишка
+вставень висюлек
+волосатый чикатило
+агрессор
+анакондаз
+антихрист
+Анютин глазок
+бензонасос
+блудень
+бог плодородия
+божий леденец
+волосатый змiй
+витамин "Х"
+вспотевший объектив
+гендерный габитус
+двадцать первый палец
+калдыбобер
+боброчес
+кукурузик
+красноголовый воин
+красный богатырь
+любовный мускул
+леденец
+обелиск
+окурок
+органайзер
+отбойный
+молоток
+посох королей
+пламенный алмаз мудрости
+монофалический потенциометр
+розовый кадилак
+сексофон
+трахальник
+торчильник
+факало
+кочанчик
+писюн
+губашлеп
+потенциальный кредитор
+кок
+чилим
+пажилой кабан
+малой
+начальник унитаза
+бесперебойник
+корнишон
+банановый смузи
+кизляк
+проныра
+пенис детров
+бенис
+кокошник
+членикс
+маленький жиголо
+венерический суккуб
+боец невидимого фронта
+сморчок

handlers/__init__.py

@@ -1,3 +1,7 @@
+
 from handlers import pipisa
+from handlers import davinci
 from handlers import time_new_year
+from handlers import sendalarm
 from handlers import start_help
+

handlers/davinci.py

@@ -0,0 +1,26 @@
+import openai
+from aiogram import types
+from create_bot import dp
+
+token = '5947963644:AAF_GKgMmU5ovqMpc1KXIpcf4aN0JMyKPqc'
+openai.api_key = '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'
+
+
+@dp.message_handler()
+async def send(message: types.Message):
+    if 'тупица' in message.text.lower():
+
+        response = openai.Completion.create(
+            model="text-davinci-003",
+            prompt=message.text[7:],
+            temperature=0.7,
+            max_tokens=1000,
+            top_p=1.0,
+            frequency_penalty=0.0,
+            presence_penalty=0.6,
+            stop=["сброс"]
+        )
+        await message.reply(response['choices'][0]['text'])
+
+
+

handlers/pipisa.py

@@ -1,173 +1,201 @@
-from aiogram import types, Dispatcher
+from aiogram import types
 from sqlalchemy.orm.session import close_all_sessions
 from create_bot import bot, dp
-from sqdb import user, session
+from sqdb import User, session, DickRequest, UserDick
+import random
+import traceback
 from random import randint
 import datetime
+from dicktxt import ForReadDict
 
+size_change = None
+dick_plus = None
+dick_minus = None
+
+
+def get_dick(user_id, chat_id):
+    dick = session.query(UserDick).filter(UserDick.user_id == user_id, UserDick.chat_id == chat_id).first()
+    return dick
+
+def top_dick_message(delimiter, top_list):
+    message = f'🏆Топ 10 бубылд чата🏆\n\n'
+    f'🚀 {delimiter.join(map(str, top_list[0]))}\n'
+    f'💫 {delimiter.join(map(str, top_list[1]))}\n'
+    f'🍆 {delimiter.join(map(str, top_list[2]))}\n'
+    f'🍌 {delimiter.join(map(str, top_list[3]))}\n'
+    f'🐍 {delimiter.join(map(str, top_list[4]))}\n'
+    f'🐎 {delimiter.join(map(str, top_list[5]))}\n'
+    f'🌭 {delimiter.join(map(str, top_list[6]))}\n'
+    f'🌶 {delimiter.join(map(str, top_list[7]))}\n'
+    f'👌 {delimiter.join(map(str, top_list[8]))}\n'
+    f'💩 {delimiter.join(map(str, top_list[9]))}\n'
+    return message
+
+
+@dp.message_handler(commands=["maintenance"])
+async def stop_for_maintenance(message: types.Message):  # остановить бота
+    if message.from_user.id == 226765676:
+        bot.send_message(message.from_user.id, "Блять. Как же больно. Мне холодно. Наверное это конец...")
+        close_all_sessions()
+        dp.stop_polling()
 
 
 @dp.message_handler(commands=["dick"])
-async def up_dick(message: types.Message):
-# рандомайзер
-    numb = randint(-6,10)
+async def up_dick(message: types.Message):  # рандомайзер
+
+    numb = randint(-6, 10)
     global size_change, dick_plus, dick_minus
-    dick_plus = f'<b>вырос</b> 🚀 на <b>{numb}</b> см!'
-    dick_minus = f'<b>уменьшился</b> ✂ на <b>{abs(numb)}</b> см!'
+    dick_plus = ('<b>вырос</b>', '<b>подрос</b>', '<b>привстал</b>')
+    dick_minus = ('<b>уменьшился</b>', '<b>откусила злая гадюка</b>', '<b>продали евреи, он стал дешевле</b>')
     if numb > 0:
-         size_change = dick_plus
-    else: size_change = dick_minus
+        size_change = random.choice(dick_plus) + '🚀'
+    # if numb = 0 size_change = random.choice(const)  TODO
+    else:
+        size_change = random.choice(dick_minus) + '✂'
 
 
 # работа с таблицей
     try:
-        b = session.query(user).filter(user.user_id == message.from_user.id).first()
+        dick_request = DickRequest(size_change=numb, date_changed=datetime.datetime.now())
+        b = session.query(User).filter(User.user_id == message.from_user.id).first()
         if b:
-            last_time = b.datetimes
+            last_time = b.date_updated
             now_time = datetime.datetime.now()
             diff = now_time.day - last_time.day
             
             if abs(diff) <= 0:
                 try:
                     current_dick = b.dick_size
-                    await bot.send_message(message.chat.id, f'@{message.from_user.username},🚫 вы уже крутили пипису, ее размер <b>{current_dick}</b> см! ')
-                except:
-                    print('ошибка в if diff <=0')
+                    await bot.send_message(message.chat.id, f'@{message.from_user.username},'
+                                                            f'🚫 вы уже крутили пипису, '
+                                                            f'ее размер <b>{current_dick}</b> см! ')
+                except Exception as e:
+                    print('ошибка в if diff <=0 ' + "\n".join(traceback.format_tb(e.__traceback__)))
                     session.rollback()   
                 finally: 
                     session.close_all()
-                    print('пользвоатель уже крутил')
+                    print('пользователь уже крутил')
                     
             else:
                 try:
-                    a = session.query(user).filter(user.user_id == message.from_user.id).first() # запрос на поиск в таблице
-                    updetedDick = a.dick_size = (a.dick_size + numb)
-                    a.datetimes = datetime.datetime.now()
+                    usr = session.query(User)
+                    a = usr.filter(User.user_id == message.from_user.id).first()  # запрос на поиск в таблице
+                    dick = get_dick(User.user_id, message.chat.id)
+                    updated_dick = dick.dick_size = (dick.dick_size + numb)
+                    dick_request.user = a
+                    a.date_updated = datetime.datetime.now()
+                    session.add(dick_request)
                     session.flush()
-                    session.commit() #обновляет запись
+                    session.commit()  # обновляет запись
+                    randomword = ForReadDict.RandomDick()
                 
-                
-                    await bot.send_message(message.chat.id, f'@{message.from_user.username}, ваш писюн {size_change}\n\
-Теперь он равен <b>{updetedDick}</b> см! ')
-                except:
+                    await bot.send_message(message.chat.id, f'@{message.from_user.username}, '
+                                                            f'ваш <em>{randomword}</em> {size_change}'
+                                                            f'на <b>{abs(numb)}</b> см!\n'
+                                                            f'Теперь он равен <b>{updated_dick}</b> см! ')
+                except Exception as e:
                     session.rollback()
-                    print('ошибка в обновлении пиписы')
+                    print('ошибка в обновлении пиписы, трейсбек-бек-бек: ' +
+                          "\n".join(traceback.format_tb(e.__traceback__)))
                 finally:
                     session.close_all()
                     print('пиписа обновлена')
 
-                    
-
         else:
             session.close()
             try:
-                int_table = user(user_id = message.from_user.id, user_fullname = message.from_user.full_name, dick_size = numb, datetimes = datetime.datetime.now(),\
-            chat_id = message.chat.id)
+                numb = randint(1, 10)
+                int_table = User(user_id=message.from_user.id,
+                                 user_fullname=message.from_user.full_name,
+                                 date_updated=datetime.datetime.now(),
+                                 date_created=datetime.datetime.now())
+                new_dick = DickRequest(user_id=message.from_user.id,
+                                       chat_id=message.chat.id,
+                                       dick_size=numb)
 
+                dick_request.user = int_table
                 session.add(int_table)
+                session.add(new_dick)
+                session.add(dick_request)
                 session.flush()
                 session.commit()
                 session.close()
-            
-                await bot.send_message(message.chat.id, f'@{message.from_user.username}, ваш писюн {size_change}\n\
-Теперь он равен <b>{numb}</b> см!')
-            except:
-                print('ошибка в добавлении нового пользователя')
+                await bot.send_message(message.chat.id, f'@{message.from_user.username}, '
+                                                        f'ваш писюн показал головку 🚀 \n'
+                                                        f'на <b>{abs(numb)}</b> см!\n'
+                                                        f'Теперь он равен <b>{numb}</b> см!')
+            except Exception as e:
+                print('ошибка в добавлении нового пользователя, трейсбек: ' +
+                      '\n'.join(traceback.format_tb(e.__traceback__)))
                 session.rollback()
             finally:
                 session.close_all()
                 print('Успешно добавлен пользователь')
         
-    except:
+    except Exception as e:
         session.rollback()
-        print('ошибка в основном коде')
+        print('ошибка в основном коде, трейсбек:' + '\n'.join(traceback.format_tb(e.__traceback__)))
     finally:
         session.close_all()
         
     
 @dp.message_handler(commands=["topdick"])
-async def send_topchat(message: types.Message):
+async def send_top_chat(message: types.Message):
     try:
-        changechat_id = session.query(user).filter(user.user_id == message.from_user.id).first()
+        top = []
         chats = message.chat.id
-        if changechat_id.chat_id != chats:
-            changechat_id.chat_id = chats
-            session.commit()
-            session.close()
-        else:
-            session.close()
-            top = session.query(user.user_fullname, user.dick_size).order_by(user.dick_size.desc()).filter(user.chat_id == chats).limit(10).all()
-            delimiter = ': '
+        changechat_id = session.query(DickRequest).filter(DickRequest.user_id == message.from_user.id,
+                                                          DickRequest.chat_id == chats).first()
+        dicks = session.query(DickRequest)\
+            .filter(DickRequest.chat_id == chats)\
+            .limit(10).all()\
+            .order_by(DickRequest.dick_size.desc())
+        for dick in dicks:
+            user = session.query(User.user_fullname).filter(User.user_id == dick.user_id)
+            top.append([user.full_name, dick.dick_size])
+        delimiter = ': '
 
     # проверка на длину списка, если меньше limit, то:
 
-        sizelen = len(top)
-        if sizelen < 10:
-            lenminus = 10 - sizelen
-            top.extend(('-'*lenminus))
-            await bot.send_message(message.chat.id, f'🏆Топ 10 бубылд чата🏆\n\n\
-    🚀 {delimiter.join(map(str, top[0]))}\n\
-    💫 {delimiter.join(map(str, top[1]))}\n\
-    🍆 {delimiter.join(map(str, top[2]))}\n\
-    🍌 {delimiter.join(map(str, top[3]))}\n\
-    🐍 {delimiter.join(map(str, top[4]))}\n\
-    🐎 {delimiter.join(map(str, top[5]))}\n\
-    🌭 {delimiter.join(map(str, top[6]))}\n\
-    🌶 {delimiter.join(map(str, top[7]))}\n\
-    👌 {delimiter.join(map(str, top[8]))}\n\
-    💩 {delimiter.join(map(str, top[9]))}\n')
+        size_len = len(top)
+        if size_len < 10:
+            len_minus = 10 - size_len
+            top.extend([('-'*len_minus),""])
+            await bot.send_message(message.chat.id, top_dick_message(delimiter, top))
             session.close()
         # если все нормально и участников минимум 10
 
         else:
             
-            await bot.send_message(message.chat.id, f'🏆Топ 10 бубылд чата🏆\n\n\
-    🚀 {delimiter.join(map(str, top[0]))}\n\
-    💫 {delimiter.join(map(str, top[1]))}\n\
-    🍆 {delimiter.join(map(str, top[2]))}\n\
-    🍌 {delimiter.join(map(str, top[3]))}\n\
-    🐍 {delimiter.join(map(str, top[4]))}\n\
-    🐎 {delimiter.join(map(str, top[5]))}\n\
-    🌭 {delimiter.join(map(str, top[6]))}\n\
-    🌶 {delimiter.join(map(str, top[7]))}\n\
-    👌 {delimiter.join(map(str, top[8]))}\n\
-    💩 {delimiter.join(map(str, top[9]))}\n')
-    except:
+            await bot.send_message(message.chat.id, top_dick_message(delimiter, top))
+    except Exception as e:
         session.rollback()
-        print('ошибка в /topdick')
+        print('ошибка в /topdick. Трейсбэк:\n' + '\n'.join(traceback.format_tb(e.__traceback__)))
     finally:
         session.close_all()
 
 
-
 @dp.message_handler(commands=["globaldick"])
 async def send_global_top(message: types.Message):
     try:
-        top_chat = session.query(user.user_fullname, user.dick_size).order_by(user.dick_size.desc()).limit(10).all()
-        
+        top = []
+        dicks = session.query(DickRequest) \
+            .limit(10).all() \
+            .order_by(DickRequest.dick_size.desc())
+        for dick in dicks:
+            user = session.query(User.user_fullname).filter(User.user_id == dick.user_id)
+            top.append([user.full_name, dick.dick_size])
         delimiter = ': '
 
-        
-        await bot.send_message(message.chat.id, f'🏆Топ 10 пипис в мире🏆\n\n\
-    1. {delimiter.join(map(str, top_chat[0]))}\n\
-    2. {delimiter.join(map(str, top_chat[1]))}\n\
-    3. {delimiter.join(map(str, top_chat[2]))}\n\
-    4. {delimiter.join(map(str, top_chat[3]))}\n\
-    5. {delimiter.join(map(str, top_chat[4]))}\n\
-    6. {delimiter.join(map(str, top_chat[5]))}\n\
-    7. {delimiter.join(map(str, top_chat[6]))}\n\
-    8. {delimiter.join(map(str, top_chat[7]))}\n\
-    9. {delimiter.join(map(str, top_chat[8]))}\n\
-    10. {delimiter.join(map(str, top_chat[9]))}\n')
-    except:
+        await bot.send_message(message.chat.id, top_dick_message(delimiter, top))
+    except Exception as e:
         session.rollback()
-        print('ошибка в /glovaldick')
+        print('ошибка в /globaldick, трейсбэк:\n' + '\n'.join(traceback.format_tb(e.__traceback__)))
     finally:
         session.close_all()
 
 
-def register_handlers_pipisa(dp: Dispatcher):
-    dp.register_message_handler(up_dick)
-    dp.register_message_handler(send_topchat)
-    dp.register_message_handler(send_global_top)
-
+# def register_handlers_pipisa(dp: Dispatcher):
+#     dp.register_message_handler(up_dick)
+#     dp.register_message_handler(send_topchat)
+#     dp.register_message_handler(send_global_top)

handlers/sendalarm.py

@@ -0,0 +1,32 @@
+import traceback
+
+from create_bot import dp, bot
+from aiogram import types, Dispatcher
+from sqdb import User, session
+
+
+@dp.message_handler(commands=['sendall'])
+async def sendall(message: types.Message):
+    print('команда прошла')
+    if message.chat.type == 'private':
+        if message.from_user.id == 226765676:
+            text = message.text[9:]
+            try:
+                chats_id = session.query(User.chat_id).distinct()
+                for row in chats_id:
+                    try:
+                        await bot.send_message(row[0], text)
+                    except Exception as e:
+                        print('вероятно бота нет в чате, на всякий случай трейсбек:\n' +
+                              "\n".join(traceback.format_tb(e.__traceback__)))
+                await bot.send_message(message.from_user.id, 'Сообщение успешно отправлено во все чаты')
+            except Exception as e:
+                session.rollback()
+                print('error sendall, traceback:\n' +
+                      "\n".join(traceback.format_tb(e.__traceback__)))
+            finally:
+                session.close_all()
+
+
+# def register_handlers_test(dp: Dispatcher):
+#     dp.register_message_handler(send_welcome)

handlers/start_help.py

@@ -1,22 +1,28 @@
-from aiogram import types, Dispatcher
+from aiogram import types
 from create_bot import dp, bot
 
+
 @dp.message_handler(commands=['start'])
 async def start_func(message: types.Message):
     await message.reply('похуй')
 
+
 @dp.message_handler(commands=['photo'])
 async def send_image(message: types.Message):
-    await bot.send_photo(message.chat.id, photo='https://memepedia.ru/wp-content/uploads/2018/08/ya-pidoras.jpg', reply_to_message_id=message.message_id)
+    await bot.send_photo(message.chat.id,
+                         photo='https://memepedia.ru/wp-content/uploads/2018/08/ya-pidoras.jpg',
+                         reply_to_message_id=message.message_id)
+
 
 @dp.message_handler(content_types=types.ContentTypes.TEXT)
 async def send_faggot(message: types.Message):
     print(message.text) 
     if message.text == 'хто я':
-     await bot.send_photo(message.chat.id, photo='https://www.meme-arsenal.com/memes/ecebd2339c7eab40e09874bd86a38a09.jpg')
+        await bot.send_photo(message.chat.id,
+                             photo='https://www.meme-arsenal.com/memes/ecebd2339c7eab40e09874bd86a38a09.jpg')
 
 
-def register_handlers_StartHelp(dp: Dispatcher):
-    dp.register_message_handler(start_func)
-    dp.register_message_handler(send_faggot)
-    dp.register_message_handler(send_image)
+# def register_handlers_StartHelp(dp: Dispatcher):
+#     dp.register_message_handler(start_func)
+#     dp.register_message_handler(send_faggot)
+#     dp.register_message_handler(send_image)

handlers/time_new_year.py

@@ -1,27 +1,28 @@
-from aiogram import types, Dispatcher
-from create_bot import dp, bot
+from aiogram import types
+from create_bot import dp
 import datetime
 
+
 @dp.message_handler(commands=["time"])
 async def send_time(message: types.Message):
-    new_year = datetime.datetime(2022, 12, 31) #дата нового года
-    ct = datetime.datetime.now() #датавремя
-    cd = datetime.datetime.now().strftime("%d/%m/%Y") #дата (д,м,г)
-    ct1 = ct+datetime.timedelta(hours=15) # +14 часов от сервера
-    ct2 = ct1.strftime('%H:%M') # форматирует датувремя просто во время(ч,м)
-    raznitsa = (new_year - ct).days #отнимает от нг текущее время и получаем разницу в днях
+    new_year = datetime.datetime(2024, 12, 31)  # дата нового года
+    ct = datetime.datetime.now()  # дата/время
+    cd = datetime.datetime.now().strftime("%d/%m/%Y")  # дата (д,м,г)
+    ct1 = ct+datetime.timedelta(hours=15)  # +14 часов от сервера
+    ct2 = ct1.strftime('%H:%M')  # форматирует дату/время просто во время(ч, м)
+    date_difference = (new_year - ct).days  # отнимает от нг текущее время и получаем разницу в днях
 
     days = ['день', 'дня', 'дней']
-    if raznitsa % 10 == 1 and raznitsa % 100 != 11:
+    if date_difference % 10 == 1 and date_difference % 100 != 11:
         p = 0
-    elif 2 <= raznitsa % 10 <= 4 and (raznitsa % 100 < 10 or raznitsa % 100 >= 20):
+    elif 2 <= date_difference % 10 <= 4 and (date_difference % 100 < 10 or date_difference % 100 >= 20):
         p = 1
     else:
         p = 2
-    num=(str(raznitsa) + ' ' + days[p])
+    num = (str(date_difference) + ' ' + days[p])
 
     await message.reply(f'Сегодня {cd} \nВремя: {ct2} \nДо Нового Года осталось {num}')
 
 
-def register_handlers_time(dp: Dispatcher):
-    dp.register_message_handler(send_time)
+# def register_handlers_time(dp: Dispatcher):
+#    dp.register_message_handler(send_time)

othersq/__init__.py

@@ -1 +0,0 @@
-from othersq import sendnot

othersq/sendnot.py

@@ -1,28 +0,0 @@
-
-
-from aiogram import types, Dispatcher
-
-from sqdb import session, user
-from create_bot import bot, dp
-
-@dp.message_handler(commands=['sendall'])
-async def sendall(message: types.Message):
-    print('начал работать')
-    if message.chat.type == 'private':
-        if message.from_user.id == 226765676:
-            text = message.text[9:]
-            try:
-                chats_id = session.query(user.chat_id).distinct()
-                for row in chats_id:
-                    try:
-                        await bot.send_message(row[0], text)
-                    except:
-                        print('вероятно бота нет в чате')
-                await bot.send_message(message.from_user.id, 'Сообщение успешно отправлено во все чаты')
-            except: 
-                session.rollback()
-                print('eror sendall')
-            finally: session.close_all()
-
-def register_handlers_sendnotal(dp: Dispatcher):
-    dp.register_message_handler(sendall)

requirements.txt

@@ -2,3 +2,5 @@ aiogram
 sqdb
 sqlalchemy
 graypy
+openai
+psycopg2

sqdb.py

@@ -1,36 +1,51 @@
 from sqlalchemy import create_engine, MetaData, Table, Integer, String, BIGINT,  \
     Column, DateTime, ForeignKey, Numeric
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import sessionmaker, relationship
 from sqlalchemy import select, update
-
 engine = create_engine('postgresql+psycopg2://postgres:postgres@postgres.vdk2ch.ru:5432/jack_bot', echo=True)
 Session = sessionmaker(bind=engine)
 session = Session()
 
-
-
 Base = declarative_base()
 
 
-
-class user(Base):
+class User(Base):
     __tablename__ = 'users'
 
     id = Column(Integer, primary_key=True)
     user_id = Column(Integer)
+    date_created = (Column(DateTime))
     user_fullname = Column(String)
+    date_updated = (Column(DateTime))
+    dick_requests = relationship("DickRequest", back_populates="user")
+    user_dicks = relationship("UserDick", back_populates="user")
+
+
+class UserDick(Base):
+    __tablename__ = 'user_dicks'
+
+    id = Column(Integer, primary_key=True)
+    user_id = Column(Integer, ForeignKey("users.user_id"))
     dick_size = (Column(Integer))
-    datetimes = (Column(DateTime))
     chat_id = Column(BIGINT)
+    user = relationship("User", back_populates="user_dicks")
 
 
-
-
+class DickRequest(Base):
+    __tablename__ = 'dick_requests'
+    id = Column(Integer, primary_key=True)
+    size_change = Column(Integer)
+    user_id = Column(Integer, ForeignKey("users.user_id"))
+    user = relationship("User", back_populates="dick_requests")
+    date_changed = (Column(DateTime))
 
 session.close()
 engine.dispose()
-# top = session.query(user.user_fullname, user.dick_size).order_by(user.dick_size.desc()).filter(user.chat_id == user.chat_id).limit(10).all()
+
+# top = session.query(user.user_fullname, user.dick_size)
+# .order_by(user.dick_size.desc())
+# .filter(user.chat_id == user.chat_id).limit(10).all()
 # print(top)