Fix typo in editing reactions and fix some style issues

mautrix_instagram/db/portal.py

@@ -41,14 +41,9 @@ class Portal:
     avatar_set: bool
     relay_user_id: UserID | None
 
-    async def insert(self) -> None:
-        q = (
-            "INSERT INTO portal (thread_id, receiver, other_user_pk, mxid, name, avatar_url, "
-            "                    encrypted, name_set, avatar_set, relay_user_id) "
-            "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)"
-        )
-        await self.db.execute(
-            q,
+    @property
+    def _values(self):
+        return (
             self.thread_id,
             self.receiver,
             self.other_user_pk,
@@ -61,25 +56,21 @@ class Portal:
             self.relay_user_id,
         )
 
+    async def insert(self) -> None:
+        q = (
+            "INSERT INTO portal (thread_id, receiver, other_user_pk, mxid, name, avatar_url, "
+            "                    encrypted, name_set, avatar_set, relay_user_id) "
+            "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)"
+        )
+        await self.db.execute(q, *self._values)
+
     async def update(self) -> None:
         q = (
             "UPDATE portal SET other_user_pk=$3, mxid=$4, name=$5, avatar_url=$6, encrypted=$7,"
             "                  name_set=$8, avatar_set=$9, relay_user_id=$10 "
             "WHERE thread_id=$1 AND receiver=$2"
         )
-        await self.db.execute(
-            q,
-            self.thread_id,
-            self.receiver,
-            self.other_user_pk,
-            self.mxid,
-            self.name,
-            self.avatar_url,
-            self.encrypted,
-            self.name_set,
-            self.avatar_set,
-            self.relay_user_id,
-        )
+        await self.db.execute(q, *self._values)
 
     @classmethod
     def _from_row(cls, row: asyncpg.Record) -> Portal:

mautrix_instagram/db/puppet.py

@@ -47,11 +47,7 @@ class Puppet:
     base_url: URL | None
 
     @property
-    def _base_url_str(self) -> str | None:
-        return str(self.base_url) if self.base_url else None
-
-    @property
-    def _fields(self):
+    def _values(self):
         return (
             self.pk,
             self.name,
@@ -64,7 +60,7 @@ class Puppet:
             self.custom_mxid,
             self.access_token,
             self.next_batch,
-            self._base_url_str,
+            str(self.base_url) if self.base_url else None,
         )
 
     async def insert(self) -> None:
@@ -73,7 +69,7 @@ class Puppet:
             "                    is_registered, custom_mxid, access_token, next_batch, base_url) "
             "VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)"
         )
-        await self.db.execute(q, *self._fields)
+        await self.db.execute(q, *self._values)
 
     async def update(self) -> None:
         q = (
@@ -82,7 +78,7 @@ class Puppet:
             "                  next_batch=$11, base_url=$12 "
             "WHERE pk=$1"
         )
-        await self.db.execute(q, *self._fields)
+        await self.db.execute(q, *self._values)
 
     @classmethod
     def _from_row(cls, row: asyncpg.Record) -> Puppet:

mautrix_instagram/db/reaction.py

@@ -57,7 +57,7 @@ class Reaction:
             "WHERE ig_item_id=$4 AND ig_receiver=$5 AND ig_sender=$6"
         )
         await self.db.execute(
-            mxid, mx_room, reaction, self.ig_item_id, self.ig_receiver, self.ig_sender
+            q, mxid, mx_room, reaction, self.ig_item_id, self.ig_receiver, self.ig_sender
         )
 
     async def delete(self) -> None:
@@ -77,10 +77,7 @@ class Reaction:
 
     @classmethod
     async def get_by_item_id(
-        cls,
-        ig_item_id: str,
-        ig_receiver: int,
-        ig_sender: int,
+        cls, ig_item_id: str, ig_receiver: int, ig_sender: int
     ) -> Reaction | None:
         q = (
             "SELECT mxid, mx_room, ig_item_id, ig_receiver, ig_sender, reaction "