diff --git a/vrobbler/apps/scrobbles/notifications.py b/vrobbler/apps/scrobbles/notifications.py index f8f44bd..fa38f71 100644 --- a/vrobbler/apps/scrobbles/notifications.py +++ b/vrobbler/apps/scrobbles/notifications.py @@ -47,8 +47,8 @@ class ScrobbleNtfyNotification(ScrobbleNotification): self.click_url = self.url_tmpl.format(path=self.scrobble.finish_url) self.title = "Finish " + self.media_obj.strings.verb.lower() + "?" - if self.scrobble.log and isinstance(self.scrobble.log, dict) and self.scrobble.log.get("description"): - self.ntfy_str += f" - {self.scrobble.log.get('description')}" + if self.scrobble.log and isinstance(self.scrobble.log, dict) and self.scrobble.log.get("title"): + self.ntfy_str += f" - {self.scrobble.log.get('title')}" def send(self): if ( diff --git a/vrobbler/templates/base.html b/vrobbler/templates/base.html index a1aa285..5d4cc6c 100644 --- a/vrobbler/templates/base.html +++ b/vrobbler/templates/base.html @@ -219,7 +219,7 @@ {% if scrobble.media_obj.primary_image_url %}
{% endif %}

{{scrobble.media_obj.title}}

{% if scrobble.media_obj.subtitle %}

{{scrobble.media_obj.subtitle}}

{% endif %} - {% if scrobble.logdata %}{% if scrobble.logdata.description %}

{{scrobble.logdata.description}}

{% endif %}{% endif %} + {% if scrobble.logdata %}{% if scrobble.logdata.title%}

{{scrobble.logdata.title}}

{% endif %}{% endif %}

{{scrobble.local_timestamp|naturaltime}} from {{scrobble.source}}

diff --git a/vrobbler/templates/scrobbles/_last_scrobbles.html b/vrobbler/templates/scrobbles/_last_scrobbles.html index ed703b9..29a1e6a 100644 --- a/vrobbler/templates/scrobbles/_last_scrobbles.html +++ b/vrobbler/templates/scrobbles/_last_scrobbles.html @@ -97,7 +97,7 @@

No brick sets today

{% endif %} -

Puzzles

+

Puzzles

{% if Puzzle %} {% with scrobbles=Puzzle count=Puzzle_count time=Puzzle_time %} {% include "scrobbles/_scrobble_table.html" %} diff --git a/vrobbler/templates/scrobbles/_row.html b/vrobbler/templates/scrobbles/_row.html index 5e31a41..ce6e31b 100644 --- a/vrobbler/templates/scrobbles/_row.html +++ b/vrobbler/templates/scrobbles/_row.html @@ -4,7 +4,7 @@ {% if scrobble.in_progress %}{{scrobble.media_obj.strings.verb}} now | Finish{% else %}{{scrobble.local_timestamp|naturaltime}}{% endif %} {% if scrobble.media_type == "Task" %} -

{{scrobble.media_obj.title|truncatechars_html:45}} - {% if scrobble.logdata %}{% if scrobble.logdata.description %}{{scrobble.logdata.description}}{% endif %}{% endif %}

+

{{scrobble.media_obj.title|truncatechars_html:45}} - {% if scrobble.logdata %}{% if scrobble.logdata.title%}{{scrobble.logdata.title}}{% endif %}{% endif %}

{% else %} {{scrobble.media_obj|truncatechars_html:45}} {% endif %}