Browse Source

Merge branch 'api-remove-is-prefix' into 'develop-1.101'

Remove is_ prefix from API schema property names

See merge request tildes/tildes!166
merge-requests/166/merge
talklittle 4 months ago
parent
commit
679923f58c
  1. 14
      tildes/openapi_beta.yaml
  2. 24
      tildes/tildes/views/api/beta/comment.py

14
tildes/openapi_beta.yaml

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

24
tildes/tildes/views/api/beta/comment.py

@ -15,22 +15,22 @@ def comment_to_dict(request: Request, comment: Comment) -> dict:
author = None author = None
rendered_html = None rendered_html = None
exemplary = None exemplary = None
is_op = None
is_me = None
is_new = None
by_op = None
by_me = None
is_new_comment = None
if request.has_permission("view", comment): if request.has_permission("view", comment):
author = comment.user.username author = comment.user.username
rendered_html = comment.rendered_html rendered_html = comment.rendered_html
exemplary = comment.is_label_active("exemplary") 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): if request.has_permission("view_author", comment.topic):
is_op = comment.user == comment.topic.user
is_new = (
by_op = comment.user == comment.topic.user
is_new_comment = (
(comment.created_time > comment.topic.last_visit_time) (comment.created_time > comment.topic.last_visit_time)
if ( if (
hasattr(comment.topic, "last_visit_time") hasattr(comment.topic, "last_visit_time")
and comment.topic.last_visit_time and comment.topic.last_visit_time
and not is_me
and not by_me
) )
else False 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 comment.last_edited_time.isoformat() if comment.last_edited_time else None
), ),
"votes": comment.num_votes, "votes": comment.num_votes,
"is_removed": comment.is_removed,
"is_deleted": comment.is_deleted,
"removed": comment.is_removed,
"deleted": comment.is_deleted,
"exemplary": exemplary, "exemplary": exemplary,
"collapsed": ( "collapsed": (
(comment.collapsed_state == "full") (comment.collapsed_state == "full")
@ -58,9 +58,9 @@ def comment_to_dict(request: Request, comment: Comment) -> dict:
if hasattr(comment, "collapsed_state") if hasattr(comment, "collapsed_state")
else None else None
), ),
"is_op": is_op,
"is_me": is_me,
"is_new": is_new,
"by_op": by_op,
"by_me": by_me,
"new_comment": is_new_comment,
"voted": comment.user_voted, "voted": comment.user_voted,
"bookmarked": comment.user_bookmarked, "bookmarked": comment.user_bookmarked,
} }

Loading…
Cancel
Save