Skip to content

Don't deliver deleted comments to the client, fixes #2 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lexbailey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't deliver deleted comments to the client, fixes #2 #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions index.cgi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,18 +104,17 @@ def change_review_status(db, reviewId, closed):
def list_comments(db, reviewId):
processedResults = []
cur = db.cursor()
cur.execute("SELECT comments.id, comments.hash, comments.author, comments.pageId, comments.type, comments.msg, comments.status, comments.rects, comments.replyToId, comments.timestamp, comments.deleted, myread.myread FROM comments LEFT JOIN myread ON comments.hash=myread.commenthash AND comments.reviewid=myread.reviewid AND myread.reader=%s WHERE comments.reviewid=%s ORDER BY comments.id ASC;", (login_email, reviewId))
cur.execute("SELECT comments.id, comments.hash, comments.author, comments.pageId, comments.type, comments.msg, comments.status, comments.rects, comments.replyToId, comments.timestamp, myread.myread FROM comments LEFT JOIN myread ON comments.hash=myread.commenthash AND comments.reviewid=myread.reviewid AND myread.reader=%s WHERE comments.deleted = 0 AND comments.reviewid=%s ORDER BY comments.id ASC;", (login_email, reviewId))
result = cur.fetchall()
cur.close()
if result:
for (id, hash, author, pageId, type, msg, status, rects, replyToId, timestamp, deleted, read) in result:
for (id, hash, author, pageId, type, msg, status, rects, replyToId, timestamp, read) in result:
tmp = {
"id": hash,
"author": author,
"msg": msg,
"status": status,
"secs_UTC": timestamp,
"deleted": deleted,
"owner": (author == login_name)
}
if (pageId is not None): tmp["pageId"] = pageId
Expand Down