From c30b430a2a2503024d41dca2839c53ec0026098c Mon Sep 17 00:00:00 2001 From: Aevann Date: Sun, 7 Apr 2024 02:45:48 +0200 Subject: [PATCH] handle ownerless chats --- files/routes/chats.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/routes/chats.py b/files/routes/chats.py index dbb5e381d..1bbc05e41 100644 --- a/files/routes/chats.py +++ b/files/routes/chats.py @@ -82,7 +82,7 @@ def chat(v, chat_id): g.db.add(membership) g.db.commit() #to clear notif count query = g.db.query(ChatMembership).filter_by(chat_id=chat.id) - sorted_memberships = [query.filter_by(user_id=chat.owner_id).one()] + query.filter(ChatMembership.user_id != chat.owner_id).join(ChatMembership.user).order_by(func.lower(User.username)).all() + sorted_memberships = [query.filter_by(user_id=chat.owner_id).one_or_none()] + query.filter(ChatMembership.user_id != chat.owner_id).join(ChatMembership.user).order_by(func.lower(User.username)).all() return render_template("chat.html", v=v, messages=displayed_messages, chat=chat, sorted_memberships=sorted_memberships)