LBRYCommunity/comment-server
1
0
Fork 0
Code Issues 18 Pull requests 1 Projects Releases Packages Wiki Activity

Explicitly lists & excludes claim_id from return

Browse source
This commit is contained in:
Oleg Silkin 2019-06-03 04:17:38 -04:00
parent 2a58c5c173
commit 9e82282f5e
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/database.py
View file

@ -25,7 +25,7 @@ def get_claim_comments(conn: sqlite3.Connection, claim_id: str, parent_id: str =
page: int = 1, page_size: int = 50, top_level=False): page: int = 1, page_size: int = 50, top_level=False):
if top_level: if top_level:
results = [clean(dict(row)) for row in conn.execute( results = [clean(dict(row)) for row in conn.execute(
""" SELECT * """ SELECT comment, comment_id, channel_name, channel_id, channel_url, timestamp, signature, parent_id
FROM COMMENTS_ON_CLAIMS FROM COMMENTS_ON_CLAIMS
WHERE claim_id LIKE ? AND parent_id IS NULL WHERE claim_id LIKE ? AND parent_id IS NULL
LIMIT ? OFFSET ? """, LIMIT ? OFFSET ? """,
@ -40,7 +40,7 @@ def get_claim_comments(conn: sqlite3.Connection, claim_id: str, parent_id: str =
) )
elif parent_id is None: elif parent_id is None:
results = [clean(dict(row)) for row in conn.execute( results = [clean(dict(row)) for row in conn.execute(
""" SELECT * """ SELECT comment, comment_id, channel_name, channel_id, channel_url, timestamp, signature, parent_id
FROM COMMENTS_ON_CLAIMS FROM COMMENTS_ON_CLAIMS
WHERE claim_id LIKE ? WHERE claim_id LIKE ?
LIMIT ? OFFSET ? """, LIMIT ? OFFSET ? """,
@ -55,7 +55,7 @@ def get_claim_comments(conn: sqlite3.Connection, claim_id: str, parent_id: str =
) )
else: else:
results = [clean(dict(row)) for row in conn.execute( results = [clean(dict(row)) for row in conn.execute(
""" SELECT * """ SELECT comment, comment_id, channel_name, channel_id, channel_url, timestamp, signature, parent_id
FROM COMMENTS_ON_CLAIMS FROM COMMENTS_ON_CLAIMS
WHERE claim_id LIKE ? AND parent_id = ? WHERE claim_id LIKE ? AND parent_id = ?
LIMIT ? OFFSET ? """, LIMIT ? OFFSET ? """,
@ -144,10 +144,14 @@ def create_comment(conn: sqlite3.Connection, comment: str, claim_id: str, **kwar
) )
except sqlite3.IntegrityError as ie: except sqlite3.IntegrityError as ie:
logger.exception(ie) logger.exception(ie)
return None # silently return none return None
curry = conn.execute( curry = conn.execute(
'SELECT * FROM COMMENTS_ON_CLAIMS WHERE comment_id = ?', (comment_id,) """
SELECT comment, comment_id, channel_name, channel_id, channel_url, timestamp, signature, parent_id
FROM COMMENTS_ON_CLAIMS WHERE comment_id = ?
""",
(comment_id,)
) )
thing = curry.fetchone() thing = curry.fetchone()
return clean(dict(thing)) if thing else None return clean(dict(thing)) if thing else None