From 98ef0dfcb1ca4e2aa9eb9b663013bb32c32c849f Mon Sep 17 00:00:00 2001 From: Tiago vasconcelos Date: Fri, 30 Sep 2022 17:29:35 +0100 Subject: [PATCH] format --- lnbits/extensions/diagonalley/crud.py | 10 +++++++--- lnbits/extensions/diagonalley/migrations.py | 9 +++++++-- lnbits/extensions/diagonalley/models.py | 1 + lnbits/extensions/diagonalley/views.py | 2 +- lnbits/extensions/diagonalley/views_api.py | 3 ++- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/lnbits/extensions/diagonalley/crud.py b/lnbits/extensions/diagonalley/crud.py index 6bde37fa..18207888 100644 --- a/lnbits/extensions/diagonalley/crud.py +++ b/lnbits/extensions/diagonalley/crud.py @@ -408,6 +408,7 @@ async def create_diagonalley_market_stalls( async def update_diagonalley_market(market_id): pass + async def create_chat_message(data: CreateChatMessage): print("DATA", data) await db.execute( @@ -422,17 +423,20 @@ async def create_chat_message(data: CreateChatMessage): ), ) + async def get_diagonalley_latest_chat_messages(room_name: str): rows = await db.fetchall( - "SELECT * FROM diagonalley.messages WHERE id_conversation = ? ORDER BY timestamp DESC LIMIT 20", (room_name,) + "SELECT * FROM diagonalley.messages WHERE id_conversation = ? ORDER BY timestamp DESC LIMIT 20", + (room_name,), ) return [ChatMessage(**row) for row in rows] + async def get_diagonalley_chat_messages(room_name: str): rows = await db.fetchall( - "SELECT * FROM diagonalley.messages WHERE id_conversation = ? ORDER BY timestamp DESC", (room_name,) + "SELECT * FROM diagonalley.messages WHERE id_conversation = ? ORDER BY timestamp DESC", + (room_name,), ) return [ChatMessage(**row) for row in rows] - diff --git a/lnbits/extensions/diagonalley/migrations.py b/lnbits/extensions/diagonalley/migrations.py index 3bcddcb0..74abcba7 100644 --- a/lnbits/extensions/diagonalley/migrations.py +++ b/lnbits/extensions/diagonalley/migrations.py @@ -114,6 +114,7 @@ async def m001_initial(db): """ ) + async def m002_add_chat_messages(db): """ Initial chat messages table. @@ -135,5 +136,9 @@ async def m002_add_chat_messages(db): """ Create indexes for message fetching """ - await db.execute("CREATE INDEX idx_messages_timestamp ON diagonalley.messages (timestamp DESC)") - await db.execute("CREATE INDEX idx_messages_conversations ON diagonalley.messages (id_conversation)") + await db.execute( + "CREATE INDEX idx_messages_timestamp ON diagonalley.messages (timestamp DESC)" + ) + await db.execute( + "CREATE INDEX idx_messages_conversations ON diagonalley.messages (id_conversation)" + ) diff --git a/lnbits/extensions/diagonalley/models.py b/lnbits/extensions/diagonalley/models.py index f9fa1bca..b1bfdc9c 100644 --- a/lnbits/extensions/diagonalley/models.py +++ b/lnbits/extensions/diagonalley/models.py @@ -116,6 +116,7 @@ class ChatMessage(BaseModel): id_conversation: str timestamp: int + class CreateChatMessage(BaseModel): msg: str = Query(..., min_length=1) pubkey: str = Query(...) diff --git a/lnbits/extensions/diagonalley/views.py b/lnbits/extensions/diagonalley/views.py index 65ba3b5d..1addb8a7 100644 --- a/lnbits/extensions/diagonalley/views.py +++ b/lnbits/extensions/diagonalley/views.py @@ -138,7 +138,7 @@ async def websocket_endpoint( if websocket not in room_members: print("Sender not in room member: Reconnecting...") await notifier.connect(websocket, room_name) - + await notifier._notify(data, room_name) except WebSocketDisconnect: diff --git a/lnbits/extensions/diagonalley/views_api.py b/lnbits/extensions/diagonalley/views_api.py index 2dcd16aa..f84ea8e9 100644 --- a/lnbits/extensions/diagonalley/views_api.py +++ b/lnbits/extensions/diagonalley/views_api.py @@ -487,9 +487,10 @@ async def api_diagonalley_generate_keys(): ## MESSAGES/CHAT + @diagonalley_ext.get("/api/v1/chat/messages/{room_name}") async def api_get_latest_chat_msg(room_name: str, all_messages: bool = Query(False)): - if(all_messages): + if all_messages: messages = await get_diagonalley_chat_messages(room_name) else: messages = await get_diagonalley_latest_chat_messages(room_name)