From 3c45acc4d5131c79cc0d25a7461da827f1f26c8a Mon Sep 17 00:00:00 2001
From: Tiago Vasconcelos <talvasconcelos@gmail.com>
Date: Mon, 17 Jul 2023 10:49:03 +0100
Subject: [PATCH] copy changes more copy clean debugging... prints! lol clean
 console logs fix get users

Only get users that explicitly have been allowed or blocked
UI
UI-2
prevent getting all accounts (false, false is default)
remove client side filtering


remove prints
---
 crud.py                                            | 7 +++++--
 static/components/relay-details/relay-details.html | 1 -
 static/components/relay-details/relay-details.js   | 1 -
 views_api.py                                       | 7 ++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/crud.py b/crud.py
index 824c0bb..b4445dd 100644
--- a/crud.py
+++ b/crud.py
@@ -391,9 +391,12 @@ async def get_accounts(
     allowed=True,
     blocked=False,
 ) -> List[NostrAccount]:
+
+    if not allowed and not blocked:
+        return []
+        
     rows = await db.fetchall(
-        "SELECT * FROM nostrrelay.accounts WHERE relay_id = ? AND allowed = ? AND blocked = ?",
+        "SELECT * FROM nostrrelay.accounts WHERE relay_id = ? AND allowed = ? OR blocked = ?",
         (relay_id, allowed, blocked),
     )
-
     return [NostrAccount.from_row(row) for row in rows]
diff --git a/static/components/relay-details/relay-details.html b/static/components/relay-details/relay-details.html
index 8896a0d..d8c7685 100644
--- a/static/components/relay-details/relay-details.html
+++ b/static/components/relay-details/relay-details.html
@@ -609,7 +609,6 @@
               row-key="pubkey"
               :columns="accountsTable.columns"
               :pagination.sync="accountsTable.pagination"
-              :filter="accountsFilter"
             >
               <template v-slot:body="props">
                 <q-tr :props="props">
diff --git a/static/components/relay-details/relay-details.js b/static/components/relay-details/relay-details.js
index 2037172..f3bf6de 100644
--- a/static/components/relay-details/relay-details.js
+++ b/static/components/relay-details/relay-details.js
@@ -18,7 +18,6 @@ async function relayDetails(path) {
             description: ''
           }
         },
-        accountsFilter: '',
         showBlockedAccounts: true,
         showAllowedAccounts: false,
         accountsTable: {
diff --git a/views_api.py b/views_api.py
index 9c65943..ca7fe5f 100644
--- a/views_api.py
+++ b/views_api.py
@@ -195,6 +195,7 @@ async def api_create_or_update_account(
 
     try:
         data.pubkey = normalize_public_key(data.pubkey)
+        
         account = await get_account(data.relay_id, data.pubkey)
         if not account:
             account = NostrAccount(
@@ -208,7 +209,7 @@ async def api_create_or_update_account(
             account.blocked = data.blocked
         if data.allowed is not None:
             account.allowed = data.allowed
-
+        
         return await update_account(data.relay_id, account)
 
     except ValueError as ex:
@@ -256,8 +257,8 @@ async def api_delete_account(
 @nostrrelay_ext.get("/api/v1/account")
 async def api_get_accounts(
     relay_id: str,
-    allowed=False,
-    blocked=True,
+    allowed: bool = False,
+    blocked: bool = True,
     wallet: WalletTypeInfo = Depends(require_invoice_key),
 ) -> List[NostrAccount]:
     try: