show wish mark in timeline

books/models.py

@@ -92,6 +92,10 @@ class Book(Entity):
     def get_absolute_url(self):
         return reverse("books:retrieve", args=[self.id])
 
+    @property
+    def wish_url(self):
+        return reverse("books:wish", args=[self.id])
+
     def get_tags_manager(self):
         return self.book_tags
 

collection/models.py

@@ -58,10 +58,18 @@ class Collection(UserOwnedEntity):
     def item(self):
         return self
 
+    @property
+    def mark_class(self):
+        return CollectionMark
+
     @property
     def url(self):
         return settings.APP_WEBSITE + reverse("collection:retrieve", args=[self.id])
 
+    @property
+    def wish_url(self):
+        return reverse("collection:wish", args=[self.id])
+
     def is_editable_by(self, viewer):
         if viewer.is_staff or viewer.is_superuser or viewer == self.owner:
             return True

collection/urls.py

@@ -21,6 +21,7 @@ urlpatterns = [
     path('with/<str:type>/<int:id>/', list_with, name='list_with'),
     path('add_to_list/<str:type>/<int:id>/', add_to_list, name='add_to_list'),
     path('share/<int:id>/', share, name='share'),
+    path('follow2/<int:id>/', wish, name='wish'),
 
     # TODO: tag
 ]

collection/views.py

@@ -2,7 +2,7 @@ import logging
 from django.shortcuts import render, get_object_or_404, redirect, reverse
 from django.contrib.auth.decorators import login_required, permission_required
 from django.utils.translation import gettext_lazy as _
-from django.http import HttpResponseBadRequest, HttpResponseServerError
+from django.http import HttpResponseBadRequest, HttpResponseServerError, HttpResponse
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.db import IntegrityError, transaction
 from django.db.models import Count
@@ -219,6 +219,15 @@ def delete(request, id):
         raise PermissionDenied()
 
 
+@login_required
+def wish(request, id):
+    try:
+        CollectionMark.objects.create(owner=request.user, collection=Collection.objects.get(id=id))
+    except Exception:
+        pass
+    return HttpResponse("✔️")
+
+
 @login_required
 def follow(request, id):
     CollectionMark.objects.create(owner=request.user, collection=Collection.objects.get(id=id))

common/templatetags/neo.py

@@ -1,6 +1,7 @@
 from django import template
 import datetime
 from django.utils import timezone
+from collection.models import Collection
 
 
 register = template.Library()
@@ -8,8 +9,12 @@ register = template.Library()
 
 @register.simple_tag(takes_context=True)
 def current_user_marked_item(context, item):
-    if context['request'].user and context['request'].user.is_authenticated:
-        return context['request'].user.get_mark_for_item(item)
+    user = context['request'].user
+    if user and user.is_authenticated:
+        if isinstance(item, Collection) and item.owner == user:
+            return item
+        else:
+            return context['request'].user.get_mark_for_item(item)
     return None
 
 

games/models.py

@@ -77,8 +77,6 @@ class Game(Entity):
 
     cover = models.ImageField(_("封面"), upload_to=game_cover_path, default=settings.DEFAULT_GAME_IMAGE, blank=True)
 
-
-
     def __str__(self):
         return self.title
 
@@ -97,6 +95,10 @@ class Game(Entity):
     def get_absolute_url(self):
         return reverse("games:retrieve", args=[self.id])
 
+    @property
+    def wish_url(self):
+        return reverse("games:wish", args=[self.id])
+
     def get_tags_manager(self):
         return self.game_tags
 

movies/models.py

@@ -170,10 +170,9 @@ class Movie(Entity):
     ############################################
     is_series = models.BooleanField(default=False)
 
-
     def __str__(self):
         if self.year:
-            return self.title + f"({self.year})"  
+            return self.title + f"({self.year})"
         else:
             return self.title
 
@@ -197,6 +196,10 @@ class Movie(Entity):
     def get_absolute_url(self):
         return reverse("movies:retrieve", args=[self.id])
 
+    @property
+    def wish_url(self):
+        return reverse("movies:wish", args=[self.id])
+
     def get_tags_manager(self):
         return self.movie_tags
 

music/models.py

@@ -76,6 +76,10 @@ class Album(Entity):
     def get_absolute_url(self):
         return reverse("music:retrieve_album", args=[self.id])
 
+    @property
+    def wish_url(self):
+        return reverse("music:wish_album", args=[self.id])
+
     def get_tags_manager(self):
         return self.album_tags
 
@@ -135,6 +139,10 @@ class Song(Entity):
     def get_absolute_url(self):
         return reverse("music:retrieve_song", args=[self.id])
 
+    @property
+    def wish_url(self):
+        return reverse("music:wish_song", args=[self.id])
+
     def get_tags_manager(self):
         return self.song_tags
 

timeline/templates/timeline.html

@@ -12,7 +12,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{ site_name }} - 首页</title>
+    <title>{{ site_name }}</title>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/htmx/1.7.0/htmx.min.js"></script>
     <script src="{% static 'lib/js/rating-star.js' %}"></script>

timeline/templates/timeline_data.html

@@ -9,11 +9,15 @@
 {% load neo %}
 
 {% for activity in activities %}
+{% current_user_marked_item activity.target.item as marked %}
 <li class="entity-list__entity">
     <div class="entity-list__entity-img-wrapper">
         <a href="{{ activity.target.item.url }}">
             <img src="{{ activity.target.item.cover|thumb:'normal' }}" alt="" class="entity-list__entity-img" style="min-width:80px;max-width:80px">
         </a>
+        {% if not marked %}
+        <a class="entity-list__entity-action-icon" hx-post="{{ activity.target.item.wish_url }}">➕</a>
+        {% endif %}
     </div>
     <div class="entity-list__entity-text">
         <div class="collection-item-position-edit">