aboutsummaryrefslogtreecommitdiffstats
path: root/packages/meshbay-hub/src/meshbay_hub/api/groups.py
diff options
context:
space:
mode:
Diffstat (limited to 'packages/meshbay-hub/src/meshbay_hub/api/groups.py')
-rw-r--r--packages/meshbay-hub/src/meshbay_hub/api/groups.py13
1 files changed, 3 insertions, 10 deletions
diff --git a/packages/meshbay-hub/src/meshbay_hub/api/groups.py b/packages/meshbay-hub/src/meshbay_hub/api/groups.py
index 07d3ec0..88125c0 100644
--- a/packages/meshbay-hub/src/meshbay_hub/api/groups.py
+++ b/packages/meshbay-hub/src/meshbay_hub/api/groups.py
@@ -13,8 +13,7 @@ from meshbay_hub.api.deps import get_current_user, require_user_scope
from meshbay_hub.api.netutil import client_ip
from meshbay_hub.db.engine import get_db
from meshbay_hub.db.models import (
- ContentReport, FederatedGroup, Group, GroupMember,
- IPLog, Notification, SwarmSource, User,
+ FederatedGroup, Group, GroupMember, IPLog, SwarmSource, User,
)
router = APIRouter(prefix="/v1/groups", tags=["groups"])
@@ -665,16 +664,10 @@ async def delete_group(
if group.admin_id != current_user.id:
raise HTTPException(status_code=403, detail="Only the group creator can delete")
- from sqlalchemy import delete as sa_delete
- await db.execute(sa_delete(Notification).where(Notification.group_id == group_id))
- await db.execute(sa_delete(GroupMember).where(GroupMember.group_id == group_id))
- await db.execute(
- update(ContentReport)
- .where(ContentReport.group_id == group_id)
- .values(group_id=None))
+ from meshbay_hub.db.purge import purge_groups
db.add(IPLog(user_id=current_user.id, event="group_delete",
ip_address=client_ip(request), detail=group.name))
- await db.delete(group)
+ await purge_groups(db, [group_id])
await db.commit()
return {"status": "deleted", "group_id": group_id}