From 29e179adadca32ae75f5077106da552bf61cb373 Mon Sep 17 00:00:00 2001
From: Colin Powell <colin@unbl.ink>
Date: Thu, 2 Apr 2026 11:55:29 -0400
Subject: [PATCH] [scrobbles] Move tags out of org title and into page

---
 vrobbler/apps/scrobbles/urls.py               |  9 +-
 vrobbler/apps/scrobbles/views.py              | 20 ++++
 vrobbler/apps/tasks/models.py                 |  2 +-
 .../scrobbles/scrobble_all_list.html          | 92 +++++++++++++++++++
 .../templates/scrobbles/scrobble_detail.html  |  9 ++
 5 files changed, 127 insertions(+), 5 deletions(-)
 create mode 100644 vrobbler/templates/scrobbles/scrobble_all_list.html

diff --git a/vrobbler/apps/scrobbles/urls.py b/vrobbler/apps/scrobbles/urls.py
index 42dbd8f..84a921b 100644
--- a/vrobbler/apps/scrobbles/urls.py
+++ b/vrobbler/apps/scrobbles/urls.py
@@ -122,11 +122,12 @@ urlpatterns = [
         name="long-plays",
     ),
     path(
-        "scrobble/<slug:uuid>/",
+        "scrobbles/<slug:uuid>/",
         views.ScrobbleDetailView.as_view(),
         name="detail",
     ),
-    path("scrobble/<slug:uuid>/start/", views.scrobble_start, name="start"),
-    path("scrobble/<slug:uuid>/finish/", views.scrobble_finish, name="finish"),
-    path("scrobble/<slug:uuid>/cancel/", views.scrobble_cancel, name="cancel"),
+    path("scrobbles/<slug:uuid>/start/", views.scrobble_start, name="start"),
+    path("scrobbles/<slug:uuid>/finish/", views.scrobble_finish, name="finish"),
+    path("scrobbles/<slug:uuid>/cancel/", views.scrobble_cancel, name="cancel"),
+    path("scrobbles/", views.ScrobbleListView.as_view(), name="scrobble-list"),
 ]
diff --git a/vrobbler/apps/scrobbles/views.py b/vrobbler/apps/scrobbles/views.py
index b26551a..6dc06b1 100644
--- a/vrobbler/apps/scrobbles/views.py
+++ b/vrobbler/apps/scrobbles/views.py
@@ -192,6 +192,26 @@ class ScrobbleableDetailView(ChartContextMixin, DetailView):
 class RecentScrobbleList(ListView):
     model = Scrobble
 
+
+class ScrobbleListView(LoginRequiredMixin, ListView):
+    model = Scrobble
+    paginate_by = 100
+    template_name = "scrobbles/scrobble_all_list.html"
+
+    def get_queryset(self):
+        qs = Scrobble.objects.filter(user=self.request.user).order_by("-timestamp")
+        tags_param = self.request.GET.get("tags", "")
+        if tags_param:
+            tag_list = [t.strip() for t in tags_param.split(",") if t.strip()]
+            if tag_list:
+                qs = qs.filter(tags__name__in=tag_list).distinct()
+        return qs
+
+    def get_context_data(self, **kwargs):
+        ctx = super().get_context_data(**kwargs)
+        ctx["tags_param"] = self.request.GET.get("tags", "")
+        return ctx
+
     def get(self, *args, **kwargs):
         user = self.request.user
         if user.is_authenticated:
diff --git a/vrobbler/apps/tasks/models.py b/vrobbler/apps/tasks/models.py
index 6770de5..ecc3fc0 100644
--- a/vrobbler/apps/tasks/models.py
+++ b/vrobbler/apps/tasks/models.py
@@ -55,7 +55,7 @@ class TaskLogData(BaseLogData):
                     timestamp, note_text = next(iter(note.items()))
                     # Flatten newlines and clean whitespace
                     note_text = " ".join(note_text.strip().split())
-                    lines.append(f"{timestamp}: {note_text} [{labels_str}]")
+                    lines.append(f"{timestamp}: {note_text}")
                 if isinstance(note, list):
                     lines += note
                 if isinstance(note, str):
diff --git a/vrobbler/templates/scrobbles/scrobble_all_list.html b/vrobbler/templates/scrobbles/scrobble_all_list.html
new file mode 100644
index 0000000..becbc03
--- /dev/null
+++ b/vrobbler/templates/scrobbles/scrobble_all_list.html
@@ -0,0 +1,92 @@
+{% extends "base.html" %}
+{% load humanize %}
+{% load naturalduration %}
+
+{% block content %}
+<main class="col-md-9 ms-sm-auto col-lg-10 px-md-4">
+    <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+        <h1 class="h2">All Scrobbles</h1>
+    </div>
+
+    <div class="table-responsive">
+        <table class="table table-striped table-sm">
+            <thead>
+                <tr>
+                    <th scope="col">Date</th>
+                    <th scope="col">Type</th>
+                    <th scope="col">Title</th>
+                    <th scope="col">Time</th>
+                </tr>
+            </thead>
+            <tbody>
+                {% for scrobble in object_list %}
+                <tr>
+                    <td><a href="{{scrobble.get_absolute_url}}">{{ scrobble.timestamp|naturaltime }}</a></td>
+                    <td>{{ scrobble.get_media_type_display }}</td>
+                    <td>
+                        {% if scrobble.video %}
+                        <a href="{% url 'videos:video_detail' scrobble.video.uuid %}">{{ scrobble.video.title }}</a>
+                        {% elif scrobble.track %}
+                        <a href="{% url 'music:track_detail' scrobble.track.uuid %}">{{ scrobble.track.title }}</a>
+                        {% elif scrobble.video_game %}
+                        <a href="{% url 'videogames:videogame_detail' scrobble.video_game.uuid %}">{{ scrobble.video_game.name }}</a>
+                        {% elif scrobble.book %}
+                        <a href="{% url 'books:book_detail' scrobble.book.uuid %}">{{ scrobble.book.title }}</a>
+                        {% elif scrobble.food %}
+                        <a href="{% url 'foods:food_detail' scrobble.food.uuid %}">{{ scrobble.food.title }}</a>
+                        {% elif scrobble.beer %}
+                        <a href="{% url 'beers:beer_detail' scrobble.beer.uuid %}">{{ scrobble.beer.title }}</a>
+                        {% elif scrobble.web_page %}
+                        <a href="{% url 'webpages:webpage_detail' scrobble.web_page.uuid %}">{{ scrobble.web_page.title }}</a>
+                        {% elif scrobble.podcast_episode %}
+                        <a href="{% url 'podcasts:podcast_detail' scrobble.podcast_episode.podcast.id %}">{{ scrobble.podcast_episode.title }}</a>
+                        {% elif scrobble.board_game %}
+                        <a href="{% url 'boardgames:boardgame_detail' scrobble.board_game.uuid %}">{{ scrobble.board_game.name }}</a>
+                        {% elif scrobble.trail %}
+                        <a href="{% url 'trails:trail_detail' scrobble.trail.uuid %}">{{ scrobble.trail.name }}</a>
+                        {% elif scrobble.puzzle %}
+                        <a href="{% url 'puzzles:puzzle_detail' scrobble.puzzle.uuid %}">{{ scrobble.puzzle.name }}</a>
+                        {% elif scrobble.brick_set %}
+                        <a href="{% url 'bricksets:brickset_detail' scrobble.brick_set.set_num %}">{{ scrobble.brick_set.name }}</a>
+                        {% elif scrobble.task %}
+                        <a href="{% url 'tasks:task_detail' scrobble.task.id %}">{{ scrobble.task.title }}</a>
+                        {% elif scrobble.life_event %}
+                        <a href="{% url 'lifeevents:lifeevent_detail' scrobble.life_event.uuid %}">{{ scrobble.life_event.title }}</a>
+                        {% elif scrobble.mood %}
+                        <a href="{% url 'moods:mood_detail' scrobble.mood.id %}">{{ scrobble.mood.name }}</a>
+                        {% elif scrobble.geo_location %}
+                        <a href="{% url 'locations:geolocation_detail' scrobble.geo_location.uuid %}">{{ scrobble.geo_location.name }}</a>
+                        {% else %}
+                        Unknown
+                        {% endif %}
+                    </td>
+                    <td>
+                        {% if scrobble.playback_position_seconds %}
+                        {{ scrobble.playback_position_seconds|natural_duration }}
+                        {% endif %}
+                    </td>
+                </tr>
+                {% empty %}
+                <tr>
+                    <td colspan="4">No scrobbles found.</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+
+    {% if page_obj.has_previous or page_obj.has_next %}
+    <nav>
+        <ul class="pagination">
+            {% if page_obj.has_previous %}
+            <li class="page-item"><a class="page-link" href="?page={{ page_obj.previous_page_number }}{% if tags_param %}&tags={{ tags_param }}{% endif %}">Previous</a></li>
+            {% endif %}
+            <li class="page-item"><span class="page-link">Page {{ page_obj.number }} of {{ page_obj.paginator.num_pages }}</span></li>
+            {% if page_obj.has_next %}
+            <li class="page-item"><a class="page-link" href="?page={{ page_obj.next_page_number }}{% if tags_param %}&tags={{ tags_param }}{% endif %}">Next</a></li>
+            {% endif %}
+        </ul>
+    </nav>
+    {% endif %}
+</main>
+{% endblock %}
diff --git a/vrobbler/templates/scrobbles/scrobble_detail.html b/vrobbler/templates/scrobbles/scrobble_detail.html
index fa81091..24451a2 100644
--- a/vrobbler/templates/scrobbles/scrobble_detail.html
+++ b/vrobbler/templates/scrobbles/scrobble_detail.html
@@ -21,6 +21,15 @@
 <p>{{ object.logdata.description }}</p>
 {% endif %}
 
+Tags: {{object.tags}}
+{% if object.tags.all %}
+<p>
+  {% for tag in object.tags.all %}
+    <a href="{% url 'scrobbles:scrobble-list' %}?tag={{ tag.name }}" class="badge bg-secondary">{{ tag.name }}</a>
+  {% endfor %}
+</p>
+{% endif %}
+
 {% with notes_html=object.logdata.notes_as_html %}
 {% if notes_html %}
 <div class="mb-3">