Merge pull request #3 from MrSedan/dev

Added spoiled content

alembic/versions/c9872bd4d4b5_added_spoiler_to_photo.py

@@ -0,0 +1,30 @@
+"""Added spoiler to photo
+
+Revision ID: c9872bd4d4b5
+Revises: f0ed48a3ded3
+Create Date: 2023-11-15 23:38:03.886970
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'c9872bd4d4b5'
+down_revision: Union[str, None] = 'f0ed48a3ded3'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('photo', sa.Column('has_spoiler', sa.Boolean(), nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('photo', 'has_spoiler')
+    # ### end Alembic commands ###

handlers/admin_commands.py

@@ -46,7 +46,7 @@ class Admin_commands:
                     Post.media_group_id == message.media_group_id).first()
                 if post:
                     photo = Image(message_id=message.message_id,
-                                  post=post, file_id=message.photo[-1].file_id)
+                                  post=post, file_id=message.photo[-1].file_id, has_spoiler=message.has_media_spoiler)
                     session.add(photo)
                     session.commit()
                 else:
@@ -202,7 +202,8 @@ class Admin_commands:
                 if post:
                     images = MediaGroupBuilder(caption=post.text)
                     for image in post.images:
-                        images.add_photo(image.file_id)
+                        images.add_photo(
+                            image.file_id, has_spoiler=image.has_spoiler)
                     await message.answer_media_group(images.build())
                     post.posted = True
                     session.commit()
@@ -217,7 +218,7 @@ class Admin_commands:
                 post_user = session.get(Admin, message.from_user.id)
                 post.user = post_user
                 photo = Image(message_id=message.message_id,
-                              post=post, file_id=message.photo[-1].file_id)
+                              post=post, file_id=message.photo[-1].file_id, has_spoiler=message.has_media_spoiler)
                 session.add(photo)
                 session.add(post)
                 session.commit()