🛠 0.3 Better management

Author: sqlmerr

src/__init__.py

@@ -1 +1 @@
-version = (0, 2)
+version = (0, 3)

src/db/__init__.py

@@ -1,2 +1,2 @@
 from .models import User, Room
-from .requests import get_user
+from .requests import get_user, get_room

src/db/requests.py

@@ -1,5 +1,10 @@
-from .models import User
+from beanie import PydanticObjectId
+from .models import User, Room
 
 
 async def get_user(user_id: int):
     return await User.find_one(User.user_id == user_id, fetch_links=True)
+
+
+async def get_room(room_id: PydanticObjectId):
+    return await Room.get(room_id, fetch_links=True)

src/dialogs/manage.py

@@ -6,23 +6,24 @@
 
 
 from aiogram_dialog import Dialog, DialogManager, Window
-from aiogram_dialog.widgets.kbd import Button, Next, Cancel, Back, SwitchTo, Counter
+from aiogram_dialog.widgets.kbd import Button, Next, Cancel, Back, SwitchTo, Counter, Row
 from aiogram_dialog.widgets.text import Const, Format
 from aiogram_dialog.widgets.input import TextInput, MessageInput
 from aiogram_dialog.api.exceptions import UnknownIntent
 
-from src.db import Room, User
+from src.db import Room, User, get_room
 
 
 class ManageDialog(StatesGroup):
     greeting = State()
     change_name = State()
     change_limit = State()
+    delete = State()
 
 
 async def getter(dialog_manager: DialogManager, **kwargs) -> dict:
-    with suppress(Exception):
-        room: Room = await Room.get(kwargs["user"].current_room)
+    with suppress(TypeError):
+        room: Room = await get_room(dialog_manager.start_data["room_id"])
 
         return {
             "visibility": "🌏 public" if room.visibility else "❌  private",
@@ -34,8 +35,7 @@ async def getter(dialog_manager: DialogManager, **kwargs) -> dict:
 
 async def change_visibility(c: CallbackQuery, _: Button, manager: DialogManager, **kwargs):
     with suppress(TypeError):
-        user: User = kwargs["user"]
-        room: Room = await Room.get(user.current_room)
+        room: Room = await get_room(manager.start_data["room_id"])
         if c.from_user.id != room.owner.user_id:
             return
 
@@ -44,10 +44,9 @@ async def change_visibility(c: CallbackQuery, _: Button, manager: DialogManager,
         await c.answer()
 
 
-async def change_name(m: Message, _, manager: DialogManager, **kwargs):
+async def change_name(m: Message, _, manager: DialogManager, *args, **kwargs):
     with suppress(TypeError):
-        user: User = kwargs["user"]
-        room: Room = await Room.get(user.current_room)
+        room: Room = await get_room(manager.start_data["room_id"])
         if m.from_user.id != room.owner.user_id:
             return
 
@@ -62,8 +61,7 @@ async def change_name(m: Message, _, manager: DialogManager, **kwargs):
 
 async def change_limit(c: CallbackQuery, _, manager: DialogManager, **kwargs):
     with suppress(TypeError):
-        user: User = kwargs["user"]
-        room: Room = await Room.get(user.current_room)
+        room: Room = await get_room(manager.start_data["room_id"])
         if c.from_user.id != room.owner.user_id:
             return
         counter: Counter = manager.find("change_limit_counter")
@@ -75,6 +73,22 @@ async def change_limit(c: CallbackQuery, _, manager: DialogManager, **kwargs):
         await manager.switch_to(ManageDialog.greeting)
 
 
+async def delete_room(c: CallbackQuery, _, manager: DialogManager, **kwargs):
+    with suppress(TypeError):
+        room: Room = await get_room(manager.start_data["room_id"])
+        if c.from_user.id != room.owner.user_id:
+            return
+
+        await room.send("This room has been deleted by owner", c.bot, not_to_user_id=c.from_user.id)
+        for user in room.users:
+            user.current_room = None
+            await user.save()
+        await room.delete()
+
+        await c.answer("Room successfully deleted!", True)
+        await manager.done()
+
+
 dialog = Dialog(
     Window(
         Format("<b>📎 Managing group {name}</b>\n<i>Total {users} users</i>\n<i>Limit: {limit}</i>"),
@@ -92,6 +106,11 @@ async def change_limit(c: CallbackQuery, _, manager: DialogManager, **kwargs):
             id="change_limit",
             state=ManageDialog.change_limit
         ),
+        SwitchTo(
+            Const("⚠️ Delete"),
+            id="delete",
+            state=ManageDialog.delete
+        ),
         Cancel(),
         state=ManageDialog.greeting,
         getter=getter
@@ -124,6 +143,22 @@ async def change_limit(c: CallbackQuery, _, manager: DialogManager, **kwargs):
             state=ManageDialog.greeting
         ),
         state=ManageDialog.change_limit
+    ),
+    Window(
+        Const("⚠️ <b>Are you sure you want to delete this room?</b>"),
+        Row(
+            Button(
+                Const("yes"),
+                id="delete_yes",
+                on_click=delete_room
+            ),
+            SwitchTo(
+                Const("no"),
+                id="delete_no",
+                state=ManageDialog.greeting,
+            )
+        ),
+        state=ManageDialog.delete
     )
 )
 

src/handlers/manage.py

@@ -27,7 +27,7 @@ async def manage_cmd(message: Message, dialog_manager: DialogManager, user: User
         await message.answer("<b><i>You aren't owner of this room!</i></b>")
         return
 
-    await dialog_manager.start(ManageDialog.greeting, data={"user_id": user.user_id})
+    await dialog_manager.start(ManageDialog.greeting, data={"user_id": user.user_id, "room_id": room.id}, mode=StartMode.RESET_STACK)
 
 
 @router.errors(ExceptionTypeFilter(UnknownState))