mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-27 03:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Fixes handling of ratings in status views and urls

Browse source
This commit is contained in:
Mouse Reeve 2021-02-25 15:05:51 -08:00
parent 2e36cfbcf6
commit 4a10c99026
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/templates/snippets/status/status_content.html
View file

@ -1,6 +1,6 @@
{% load bookwyrm_tags %} {% load bookwyrm_tags %}
<div class="block"> <div class="block">
{% if status.status_type == 'Review' %} {% if status.status_type == 'Review' or status.status_type == 'Rating' %}
<div> <div>
<h3 class="title is-5 has-subtitle"> <h3 class="title is-5 has-subtitle">
{% if status.name %}<span dir="auto">{{ status.name }}</span><br>{% endif %} {% if status.name %}<span dir="auto">{{ status.name }}</span><br>{% endif %}

2
bookwyrm/templates/snippets/status/status_header.html
View file

@ -4,7 +4,7 @@
{% if status.status_type == 'GeneratedNote' %} {% if status.status_type == 'GeneratedNote' %}
{{ status.content | safe }} {{ status.content | safe }}
{% elif status.status_type == 'Review' and not status.name and not status.content%} {% elif status.status_type == 'Rating' %}
rated rated
{% elif status.status_type == 'Review' %} {% elif status.status_type == 'Review' %}
reviewed reviewed

1
bookwyrm/urls.py
View file

@ -13,6 +13,7 @@ local_user_path = r'^user/(?P<username>%s)' % regex.localname
status_types = [ status_types = [
'status', 'status',
'review', 'review',
'reviewrating',
'comment', 'comment',
'quotation', 'quotation',
'boost', 'boost',

4
bookwyrm/views/status.py
View file

@ -56,7 +56,7 @@ class CreateStatus(View):
status.mention_users.set(set(status.mention_users.all())) status.mention_users.set(set(status.mention_users.all()))
# don't apply formatting to generated notes # don't apply formatting to generated notes
if not isinstance(status, models.GeneratedNote): if not isinstance(status, models.GeneratedNote) and content:
status.content = to_markdown(content) status.content = to_markdown(content)
# do apply formatting to quotes # do apply formatting to quotes
if hasattr(status, 'quote'): if hasattr(status, 'quote'):
@ -82,6 +82,8 @@ class DeleteStatus(View):
def find_mentions(content): def find_mentions(content):
''' detect @mentions in raw status content ''' ''' detect @mentions in raw status content '''
if not content:
return
for match in re.finditer(regex.strict_username, content): for match in re.finditer(regex.strict_username, content):
username = match.group().strip().split('@')[1:] username = match.group().strip().split('@')[1:]
if len(username) == 1: if len(username) == 1: