Browse Source

Remove is_ prefix from API schema property names

Keep "is_new" because "new" is a reserved keyword in many
programming languages.
merge-requests/166/head
Andrew Shu 2 months ago
parent
commit
8fe65afa05
  1. 12
      tildes/openapi_beta.yaml
  2. 18
      tildes/tildes/views/api/beta/comment.py

12
tildes/openapi_beta.yaml

@ -343,8 +343,8 @@ components:
- created_at
- edited_at
- votes
- is_removed
- is_deleted
- removed
- deleted
- exemplary
- voted
- bookmarked
@ -366,9 +366,9 @@ components:
nullable: true
votes:
type: integer
is_removed:
removed:
type: boolean
is_deleted:
deleted:
type: boolean
exemplary:
type: boolean
@ -379,10 +379,10 @@ components:
collapsed_individual:
type: boolean
nullable: true
is_op:
by_op:
type: boolean
nullable: true
is_me:
by_me:
type: boolean
nullable: true
is_new:

18
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
is_op = None
is_me = None
by_op = None
by_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")
is_me = request.user == comment.user if request.user else False
by_me = request.user == comment.user if request.user else False
if request.has_permission("view_author", comment.topic):
is_op = comment.user == comment.topic.user
by_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 is_me
and not by_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,
"is_removed": comment.is_removed,
"is_deleted": comment.is_deleted,
"removed": comment.is_removed,
"deleted": comment.is_deleted,
"exemplary": exemplary,
"collapsed": (
(comment.collapsed_state == "full")
@ -58,8 +58,8 @@ def comment_to_dict(request: Request, comment: Comment) -> dict:
if hasattr(comment, "collapsed_state")
else None
),
"is_op": is_op,
"is_me": is_me,
"by_op": by_op,
"by_me": by_me,
"is_new": is_new,
"voted": comment.user_voted,
"bookmarked": comment.user_bookmarked,

Loading…
Cancel
Save