Merge pull request #32 from lbryio/return-claimid

All comment returning methods now include `claim_id`

src/database/queries.py

@@ -12,14 +12,8 @@ from src.database.schema import CREATE_TABLES_QUERY
 logger = logging.getLogger(__name__)
 
 SELECT_COMMENTS_ON_CLAIMS = """
-    SELECT comment, comment_id, channel_name, channel_id, channel_url,
+    SELECT comment, comment_id, claim_id, timestamp, is_hidden, parent_id,
-        timestamp, signature, signing_ts, parent_id, is_hidden
+        channel_name, channel_id, channel_url, signature, signing_ts 
-    FROM COMMENTS_ON_CLAIMS 
-"""
-
-SELECT_COMMENTS_ON_CLAIMS_CLAIMID = """
-    SELECT comment, comment_id, claim_id, channel_name, channel_id, channel_url,
-        timestamp, signature, signing_ts, parent_id, is_hidden
     FROM COMMENTS_ON_CLAIMS 
 """
 
@@ -164,7 +158,7 @@ def insert_reply(conn: sqlite3.Connection, comment: str, parent_id: str,
 
 def get_comment_or_none(conn: sqlite3.Connection, comment_id: str) -> dict:
     with conn:
-        curry = conn.execute(SELECT_COMMENTS_ON_CLAIMS_CLAIMID + "WHERE comment_id = ?", (comment_id,))
+        curry = conn.execute(SELECT_COMMENTS_ON_CLAIMS + "WHERE comment_id = ?", (comment_id,))
         thing = curry.fetchone()
         return clean(dict(thing)) if thing else None
 
@@ -199,7 +193,7 @@ def get_comments_by_id(conn, comment_ids: typing.Union[list, tuple]) -> typing.U
     placeholders = ', '.join('?' for _ in comment_ids)
     with conn:
         return [clean(dict(row)) for row in conn.execute(
-            SELECT_COMMENTS_ON_CLAIMS_CLAIMID + f'WHERE comment_id IN ({placeholders})',
+            SELECT_COMMENTS_ON_CLAIMS + f'WHERE comment_id IN ({placeholders})',
             tuple(comment_ids)
         )]
 

src/database/writes.py

@@ -88,7 +88,10 @@ async def hide_comments(app, pieces: list) -> list:
     for p in pieces:
         claim_id = comment_cids[p['comment_id']]
         if claim_id not in claims:
-            claims[claim_id] = await get_claim_from_id(app, claim_id, no_totals=True)
+            claim = await get_claim_from_id(app, claim_id)
+            if claim:
+                claims[claim_id] = claim
+
         channel = claims[claim_id].get('signing_channel')
         if validate_signature_from_claim(channel, p['signature'], p['signing_ts'], p['comment_id']):
             comments_to_hide.append(p)
@@ -100,7 +103,6 @@ async def hide_comments(app, pieces: list) -> list:
             app, 'UPDATE', db.get_comments_by_id(app['reader'], comment_ids)
         )
     )
-
     await job.wait()
     return comment_ids
 

src/server/misc.py

@@ -8,7 +8,10 @@ ID_LIST = {'claim_id', 'parent_id', 'comment_id', 'channel_id'}
 
 
 async def get_claim_from_id(app, claim_id, **kwargs):
+    try:
         return (await request_lbrynet(app, 'claim_search', claim_id=claim_id, **kwargs))['items'][0]
+    except IndexError:
+        return
 
 
 def clean_input_params(kwargs: dict):