neuro_llc/neuro-reply-bot-reworked
2
0
Fork 0
mirror of https://github.com/MrSedan/neuro-reply-bot-reworked.git synced 2026-01-14 21:49:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Async problems...

Browse Source
This commit is contained in:
Sergey Elpashev
2024-02-13 16:04:47 +03:00
parent 7a960054bc
commit 02bd67e34a
6 changed files with 37 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
handlers/filters/new_post.py
View File

@@ -8,14 +8,15 @@ class NewPostFilter(Filter):
async def __call__(self, message: types.Message) -> bool:
if message.media_group_id is None or message.content_type != 'photo':
return False
try:
await neuroapi.post.get_by_media_group_id(message.media_group_id)
except:
if not (message.caption.startswith('/newpost ') if message.caption else False):
return False
await neuroapi.post.new(message.caption.replace(
'/newpost ', ''), str(message.from_user.id), str(message.media_group_id), message.caption_entities)
await message.answer('Пост успешно добавлен!')
# if (message.caption and message.caption.startswith('/newpost '))
# try:
# await neuroapi.post.get_by_media_group_id(message.media_group_id)
# except:
# if not (message.caption.startswith('/newpost ') if message.caption else False):
# return False
# await neuroapi.post.new(message.caption.replace(
# '/newpost ', ''), str(message.from_user.id), str(message.media_group_id), message.caption_entities)
# await message.answer('Пост успешно добавлен!')
return True

8
handlers/message_handlers/newpost_command.py
View File

@@ -10,12 +10,12 @@ from .handler import MessageHandlerABC
class NewPostCommand(MessageHandlerABC):
filter = NewPostFilter()
async def _command(self, message: types.Message):
post: neuroTypes.Post = await neuroapi.post.get_by_media_group_id(message.media_group_id)
await neuroapi.image.add(str(post.uuid), message.photo[-1].file_id, message.has_media_spoiler, message.message_id)
created = await neuroapi.image.add(str(message.from_user.id), message.photo[-1].file_id, message.has_media_spoiler, message.message_id, message.caption if message.caption else '', message.media_group_id, message.caption_entities, message)
if created: await message.answer('Пост успешно добавлен!')
class NewPostSoloCommand(MessageHandlerABC):
filter = NewSoloPostFilter()
async def _command(self, message: types.Message):
post: neuroTypes.Post = await neuroapi.post.new(message.caption.replace('/newpost ', ''), message.from_user.id, message_entities=message.caption_entities)
await neuroapi.image.add(str(post.uuid), message.photo[-1].file_id, message.has_media_spoiler, message.message_id)
#FIXME: Починить добавление постов с одной картинкой, выводит ошибку на /info
await neuroapi.image.add(str(message.from_user.id), message.photo[-1].file_id, message.has_media_spoiler, message.message_id, message.caption, None, message.caption_entities)
await message.answer('Пост успешно добавлен!')

1
handlers/message_handlers/post_command.py
View File

@@ -14,6 +14,7 @@ class PostCommand(MessageHandlerABC):
settings = neuroTypes.BotSettings.get_instance()
try:
post = await neuroapi.post.get_post_to_post()
print(post)
if (post):
images = MediaGroupBuilder(
caption=post.text + '\n\nПредложка: @neur0w0men_reply_bot', caption_entities=post.message_entities)