mirror of
https://github.com/MrSedan/neuro-reply-bot-reworked.git
synced 2026-01-14 21:49:42 +03:00
Some info about posts started
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
|
from datetime import datetime
|
||||||
from typing import Any
|
from typing import Any
|
||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
|
||||||
@@ -13,9 +14,18 @@ from handlers.filters.new_post import (ChangePosts, NewPostFilter,
|
|||||||
from handlers.middlewares.user import AdminMiddleware
|
from handlers.middlewares.user import AdminMiddleware
|
||||||
|
|
||||||
|
|
||||||
|
def get_post_info(post: Post) -> str:
|
||||||
|
text = post.text
|
||||||
|
time = post.timestamp
|
||||||
|
from_user = post.from_user_id
|
||||||
|
s = f"""Текст: {text}\nВремя отправки: {time}\nОт: [id{from_user}](tg://user?id={from_user})""".replace('#', '\#').replace("_", "\_").replace('.', '\.').replace(',', '\,').replace('!', '\!').replace('-', '\-').replace(':', '\:')
|
||||||
|
return s
|
||||||
|
|
||||||
|
|
||||||
class Admin_commands:
|
class Admin_commands:
|
||||||
bot: Bot
|
bot: Bot
|
||||||
router: Router
|
router: Router
|
||||||
|
|
||||||
def __init__(self, bot: Bot) -> None:
|
def __init__(self, bot: Bot) -> None:
|
||||||
self.bot = bot
|
self.bot = bot
|
||||||
self.router = Router()
|
self.router = Router()
|
||||||
@@ -33,7 +43,8 @@ class Admin_commands:
|
|||||||
post = session.query(Post).filter(
|
post = session.query(Post).filter(
|
||||||
Post.media_group_id == message.media_group_id).first()
|
Post.media_group_id == message.media_group_id).first()
|
||||||
if post:
|
if post:
|
||||||
photo = Image(message_id=message.message_id, post=post, file_id=message.photo[-1].file_id)
|
photo = Image(message_id=message.message_id,
|
||||||
|
post=post, file_id=message.photo[-1].file_id)
|
||||||
session.add(photo)
|
session.add(photo)
|
||||||
session.commit()
|
session.commit()
|
||||||
else:
|
else:
|
||||||
@@ -45,7 +56,8 @@ class Admin_commands:
|
|||||||
posts = session.query(Post).filter(not Post.posted).all()
|
posts = session.query(Post).filter(not Post.posted).all()
|
||||||
admins = session.query(Admin).all()
|
admins = session.query(Admin).all()
|
||||||
post_c = {}
|
post_c = {}
|
||||||
for admin in admins: post_c[str(admin.user_id)] = 0
|
for admin in admins:
|
||||||
|
post_c[str(admin.user_id)] = 0
|
||||||
for post in posts:
|
for post in posts:
|
||||||
post_c[str(post.from_user_id)] += 1
|
post_c[str(post.from_user_id)] += 1
|
||||||
await message.answer(str(post_c))
|
await message.answer(str(post_c))
|
||||||
@@ -53,16 +65,96 @@ class Admin_commands:
|
|||||||
@self.router.message(ChangePosts())
|
@self.router.message(ChangePosts())
|
||||||
async def change_post(message: types.Message, state: FSMContext):
|
async def change_post(message: types.Message, state: FSMContext):
|
||||||
with Session(engine) as session:
|
with Session(engine) as session:
|
||||||
posts = session.query(Post).filter(Post.posted == False).order_by(Post.timestamp.asc()).all()
|
posts = session.query(Post).filter(
|
||||||
#TODO: Изменение поста
|
Post.posted == False).order_by(Post.timestamp.asc()).all()
|
||||||
# await state.update_data(posts=posts, )
|
if len(posts):
|
||||||
|
await state.update_data(posts=posts, id=0)
|
||||||
|
select_btns = []
|
||||||
|
if len(posts) > 1:
|
||||||
|
select_btns.append(types.InlineKeyboardButton(
|
||||||
|
text='->', callback_data='next_post'))
|
||||||
|
kb = [
|
||||||
|
select_btns,
|
||||||
|
[types.InlineKeyboardButton(
|
||||||
|
text='Отмена', callback_data='cancel')]
|
||||||
|
]
|
||||||
|
keyboard = types.InlineKeyboardMarkup(inline_keyboard=kb)
|
||||||
|
images = MediaGroupBuilder(caption=get_post_info(posts[0]))
|
||||||
|
for image in posts[0].images:
|
||||||
|
images.add_photo(image.file_id, parse_mode='markdownv2')
|
||||||
|
mes = await message.answer_media_group(media=images.build())
|
||||||
|
await state.update_data(edit_msg=mes[0].message_id)
|
||||||
|
await message.answer('Действия', reply_markup=keyboard)
|
||||||
|
# await message.answer(get_post_info(posts[0]), reply_markup=keyboard, parse_mode='markdownv2')
|
||||||
|
else:
|
||||||
|
await message.answer('Нет постов')
|
||||||
|
|
||||||
|
@self.router.callback_query(F.data == 'next_post')
|
||||||
|
async def next_post_changing(callback: types.CallbackQuery, state: FSMContext):
|
||||||
|
data = await state.get_data()
|
||||||
|
if 'posts' not in data:
|
||||||
|
await state.clear()
|
||||||
|
await callback.answer()
|
||||||
|
await callback.message.delete()
|
||||||
|
return
|
||||||
|
posts = data['posts']
|
||||||
|
post_id = data['id']+1
|
||||||
|
select_btns = [types.InlineKeyboardButton(
|
||||||
|
text='<-', callback_data='prev_post')]
|
||||||
|
if post_id < len(posts)-1:
|
||||||
|
select_btns.append(types.InlineKeyboardButton(
|
||||||
|
text='->', callback_data='next_post'))
|
||||||
|
kb = [
|
||||||
|
select_btns,
|
||||||
|
[types.InlineKeyboardButton(
|
||||||
|
text='Отмена', callback_data='cancel')]
|
||||||
|
]
|
||||||
|
keyboard = types.InlineKeyboardMarkup(inline_keyboard=kb)
|
||||||
|
await state.update_data(id=post_id)
|
||||||
|
await bot.edit_message_caption(caption=get_post_info(posts[post_id]), chat_id=callback.message.chat.id, message_id=data['edit_msg'], parse_mode='markdownv2')
|
||||||
|
await callback.message.edit_reply_markup(reply_markup=keyboard)
|
||||||
|
await callback.answer()
|
||||||
|
|
||||||
|
@self.router.callback_query(F.data == 'prev_post')
|
||||||
|
async def prev_post_changing(callback: types.CallbackQuery, state: FSMContext):
|
||||||
|
data = await state.get_data()
|
||||||
|
if 'posts' not in data:
|
||||||
|
await state.clear()
|
||||||
|
await callback.answer()
|
||||||
|
await callback.message.delete()
|
||||||
|
return
|
||||||
|
posts = data['posts']
|
||||||
|
post_id = data['id']-1
|
||||||
|
select_btns = [types.InlineKeyboardButton(
|
||||||
|
text='->', callback_data='next_post')]
|
||||||
|
if post_id > 0:
|
||||||
|
select_btns = [types.InlineKeyboardButton(
|
||||||
|
text='<-', callback_data='prev_post'), *select_btns]
|
||||||
|
kb = [
|
||||||
|
select_btns,
|
||||||
|
[types.InlineKeyboardButton(
|
||||||
|
text='Отмена', callback_data='cancel')]
|
||||||
|
]
|
||||||
|
keyboard = types.InlineKeyboardMarkup(inline_keyboard=kb)
|
||||||
|
await state.update_data(id=post_id)
|
||||||
|
await bot.edit_message_caption(caption=get_post_info(posts[post_id]), chat_id=callback.message.chat.id, message_id=data['edit_msg'], parse_mode='markdownv2')
|
||||||
|
await callback.message.edit_reply_markup(reply_markup=keyboard)
|
||||||
|
await callback.answer()
|
||||||
|
|
||||||
|
@self.router.callback_query(F.data.casefold() == 'cancel')
|
||||||
|
async def cancel_changing(callback: types.CallbackQuery, state: FSMContext):
|
||||||
|
await state.clear()
|
||||||
|
await callback.answer()
|
||||||
|
await callback.message.delete()
|
||||||
|
data = await state.get_data()
|
||||||
|
if 'edit_msg' in data:
|
||||||
|
await bot.delete_message(message_id=data['edit_msg'], chat_id=callback.message.chat.id)
|
||||||
|
|
||||||
@self.router.message(Command('post'))
|
@self.router.message(Command('post'))
|
||||||
async def post(message: types.Message):
|
async def post(message: types.Message):
|
||||||
with Session(engine) as session:
|
with Session(engine) as session:
|
||||||
post = session.query(Post).filter(Post.posted == False).order_by(Post.timestamp.asc()).first()
|
post = session.query(Post).filter(
|
||||||
|
Post.posted == False).order_by(Post.timestamp.asc()).first()
|
||||||
if post:
|
if post:
|
||||||
images = MediaGroupBuilder(caption=post.text)
|
images = MediaGroupBuilder(caption=post.text)
|
||||||
for image in post.images:
|
for image in post.images:
|
||||||
@@ -76,16 +168,17 @@ class Admin_commands:
|
|||||||
@self.router.message(NewSoloPostFilter())
|
@self.router.message(NewSoloPostFilter())
|
||||||
async def post_solo(message: types.Message):
|
async def post_solo(message: types.Message):
|
||||||
with Session(engine) as session:
|
with Session(engine) as session:
|
||||||
post = Post(uuid=uuid4(), text=message.caption.replace('/newpost ', ''), media_group_id='')
|
post = Post(uuid=uuid4(), text=message.caption.replace(
|
||||||
|
'/newpost ', ''), media_group_id='')
|
||||||
post_user = session.get(Admin, message.from_user.id)
|
post_user = session.get(Admin, message.from_user.id)
|
||||||
post.user = post_user
|
post.user = post_user
|
||||||
photo = Image(message_id=message.message_id, post=post, file_id=message.photo[-1].file_id)
|
photo = Image(message_id=message.message_id,
|
||||||
|
post=post, file_id=message.photo[-1].file_id)
|
||||||
session.add(photo)
|
session.add(photo)
|
||||||
session.add(post)
|
session.add(post)
|
||||||
session.commit()
|
session.commit()
|
||||||
await message.answer('Пост успешно добавлен!')
|
await message.answer('Пост успешно добавлен!')
|
||||||
|
|
||||||
|
|
||||||
def __call__(self, *args: Any, **kwds: Any) -> Router:
|
def __call__(self, *args: Any, **kwds: Any) -> Router:
|
||||||
return self.router
|
return self.router
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user