From 771c7c25c14b7164491d304600738cae67528d9f Mon Sep 17 00:00:00 2001
From: Ben Arc <ben@arc.wales>
Date: Wed, 13 Oct 2021 08:35:25 +0100
Subject: [PATCH] Not making db entry

---
 lnbits/extensions/copilot/crud.py                   | 13 ++++++-------
 .../copilot/templates/copilot/compose.html          |  1 -
 .../extensions/copilot/templates/copilot/index.html |  6 ++++++
 .../extensions/copilot/templates/copilot/panel.html |  1 -
 lnbits/extensions/copilot/views_api.py              |  7 +++++--
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/lnbits/extensions/copilot/crud.py b/lnbits/extensions/copilot/crud.py
index ce4a2804..de5e69c8 100644
--- a/lnbits/extensions/copilot/crud.py
+++ b/lnbits/extensions/copilot/crud.py
@@ -16,7 +16,7 @@ async def create_copilot(
         """
         INSERT INTO copilot.copilots (
             id,
-            "user",
+            user,
             lnurl_toggle,
             wallet,
             title,
@@ -70,21 +70,20 @@ async def update_copilot(copilot_id: str, **kwargs) -> Optional[Copilots]:
     row = await db.fetchone(
         "SELECT * FROM copilot.copilots WHERE id = ?", (copilot_id,)
     )
-    return Copilots.from_row(row) if row else None
+    return Copilots(**row) if row else None
 
 
 async def get_copilot(copilot_id: str) -> Copilots:
     row = await db.fetchone(
         "SELECT * FROM copilot.copilots WHERE id = ?", (copilot_id,)
     )
-    return Copilots.from_row(row) if row else None
+    return Copilots(**row) if row else None
 
 
 async def get_copilots(user: str) -> List[Copilots]:
-    rows = await db.fetchall(
-        """SELECT * FROM copilot.copilots WHERE "user" = ?""", (user,)
-    )
-    return [Copilots.from_row(row) for row in rows]
+    rows = await db.fetchall("SELECT * FROM copilot.copilots WHERE user = ?", (user,))
+    print(user)
+    return [Copilots(**row) for row in rows]
 
 
 async def delete_copilot(copilot_id: str) -> None:
diff --git a/lnbits/extensions/copilot/templates/copilot/compose.html b/lnbits/extensions/copilot/templates/copilot/compose.html
index 33bffda3..44664b1a 100644
--- a/lnbits/extensions/copilot/templates/copilot/compose.html
+++ b/lnbits/extensions/copilot/templates/copilot/compose.html
@@ -61,7 +61,6 @@
   </p>
 </q-page>
 {% endblock %} {% block scripts %}
-<script src="{{ url_for('static', filename='vendor/vue-qrcode@1.0.2/vue-qrcode.min.js') }}"></script>
 <style>
   body.body--dark .q-drawer,
   body.body--dark .q-footer,
diff --git a/lnbits/extensions/copilot/templates/copilot/index.html b/lnbits/extensions/copilot/templates/copilot/index.html
index c5f96fe2..73b23596 100644
--- a/lnbits/extensions/copilot/templates/copilot/index.html
+++ b/lnbits/extensions/copilot/templates/copilot/index.html
@@ -390,6 +390,7 @@
 
   var mapCopilot = obj => {
     obj._data = _.clone(obj)
+
     obj.theTime = obj.time * 60 - (Date.now() / 1000 - obj.timestamp)
     obj.time = obj.time + 'mins'
 
@@ -488,6 +489,8 @@
             self.formDialogCopilot.data
           )
         } else {
+          console.log(self.g.user.wallets[0].adminkey)
+          console.log(self.formDialogCopilot.data)
           this.createCopilot(
             self.g.user.wallets[0].adminkey,
             self.formDialogCopilot.data
@@ -512,6 +515,9 @@
             updatedData[property] = parseInt(data[property])
           }
         }
+        console.log('updatedData')
+        console.log(updatedData)
+        console.log('updatedData')
         LNbits.api
           .request('POST', '/copilot/api/v1/copilot', wallet, updatedData)
           .then(function (response) {
diff --git a/lnbits/extensions/copilot/templates/copilot/panel.html b/lnbits/extensions/copilot/templates/copilot/panel.html
index 904ab104..f17bf34c 100644
--- a/lnbits/extensions/copilot/templates/copilot/panel.html
+++ b/lnbits/extensions/copilot/templates/copilot/panel.html
@@ -97,7 +97,6 @@
 </div>
 
 {% endblock %} {% block scripts %}
-<script src="{{ url_for('static', filename='vendor/vue-qrcode@1.0.2/vue-qrcode.min.js') }}"></script>
 <script>
   Vue.component(VueQrcode.name, VueQrcode)
 
diff --git a/lnbits/extensions/copilot/views_api.py b/lnbits/extensions/copilot/views_api.py
index b256b102..4e326f42 100644
--- a/lnbits/extensions/copilot/views_api.py
+++ b/lnbits/extensions/copilot/views_api.py
@@ -42,8 +42,10 @@ async def api_copilot_create_or_update(
     copilot_id: str = Query(None),
     wallet: WalletTypeInfo = Depends(get_key_type),
 ):
+    print(data)
     if not copilot_id:
-        copilot = await create_copilot(data, user=wallet.wallet.user)
+        copilot = await create_copilot(data, inkey=wallet.wallet.inkey)
+
         return copilot, HTTPStatus.CREATED
     else:
         copilot = await update_copilot(data, copilot_id=copilot_id)
@@ -53,7 +55,8 @@ async def api_copilot_create_or_update(
 @copilot_ext.get("/api/v1/copilot", response_class=HTMLResponse)
 async def api_copilots_retrieve(wallet: WalletTypeInfo = Depends(get_key_type)):
     try:
-        return [{copilot} for copilot in await get_copilots(wallet.wallet.user)]
+        print(wallet.wallet.user)
+        return [copilot.dict() for copilot in await get_copilots(wallet.wallet.user)]
     except:
         return ""