From 8415241f03547a237c02d284e70a3d4d2a3d0a8d Mon Sep 17 00:00:00 2001 From: Andrew Shu Date: Tue, 11 Nov 2025 23:55:17 -0800 Subject: [PATCH] Revert "Remove is_ prefix from API schema property names" This reverts commit b6441b555f5f656c4a337cc124b888275519ae5a. Defer JSON API to v1.102 --- tildes/openapi_beta.yaml | 14 +++++++------- tildes/tildes/views/api/beta/comment.py | 24 ++++++++++++------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tildes/openapi_beta.yaml b/tildes/openapi_beta.yaml index 5204d74..8f4de6e 100644 --- a/tildes/openapi_beta.yaml +++ b/tildes/openapi_beta.yaml @@ -343,8 +343,8 @@ components: - created_at - edited_at - votes - - removed - - deleted + - is_removed + - is_deleted - exemplary - voted - bookmarked @@ -366,9 +366,9 @@ components: nullable: true votes: type: integer - removed: + is_removed: type: boolean - deleted: + is_deleted: type: boolean exemplary: type: boolean @@ -379,13 +379,13 @@ components: collapsed_individual: type: boolean nullable: true - by_op: + is_op: type: boolean nullable: true - by_me: + is_me: type: boolean nullable: true - new_comment: + is_new: type: boolean nullable: true voted: diff --git a/tildes/tildes/views/api/beta/comment.py b/tildes/tildes/views/api/beta/comment.py index e57b355..ee8da1b 100644 --- a/tildes/tildes/views/api/beta/comment.py +++ b/tildes/tildes/views/api/beta/comment.py @@ -15,22 +15,22 @@ def comment_to_dict(request: Request, comment: Comment) -> dict: author = None rendered_html = None exemplary = None - by_op = None - by_me = None - is_new_comment = None + is_op = None + is_me = None + is_new = None if request.has_permission("view", comment): author = comment.user.username rendered_html = comment.rendered_html exemplary = comment.is_label_active("exemplary") - by_me = request.user == comment.user if request.user else False + is_me = request.user == comment.user if request.user else False if request.has_permission("view_author", comment.topic): - by_op = comment.user == comment.topic.user - is_new_comment = ( + is_op = comment.user == comment.topic.user + is_new = ( (comment.created_time > comment.topic.last_visit_time) if ( hasattr(comment.topic, "last_visit_time") and comment.topic.last_visit_time - and not by_me + and not is_me ) else False ) @@ -45,8 +45,8 @@ def comment_to_dict(request: Request, comment: Comment) -> dict: comment.last_edited_time.isoformat() if comment.last_edited_time else None ), "votes": comment.num_votes, - "removed": comment.is_removed, - "deleted": comment.is_deleted, + "is_removed": comment.is_removed, + "is_deleted": comment.is_deleted, "exemplary": exemplary, "collapsed": ( (comment.collapsed_state == "full") @@ -58,9 +58,9 @@ def comment_to_dict(request: Request, comment: Comment) -> dict: if hasattr(comment, "collapsed_state") else None ), - "by_op": by_op, - "by_me": by_me, - "new_comment": is_new_comment, + "is_op": is_op, + "is_me": is_me, + "is_new": is_new, "voted": comment.user_voted, "bookmarked": comment.user_bookmarked, }