diff --git a/journal/templates/like_stats.html b/journal/templates/like_stats.html deleted file mode 100644 index 927c06ee..00000000 --- a/journal/templates/like_stats.html +++ /dev/null @@ -1,18 +0,0 @@ -{% if liked %} - - - {{ piece.like_count }} - -{% else %} - - - {% if piece.like_count %}{{ piece.like_count }}{% endif %} - -{% endif %} diff --git a/journal/templatetags/user_actions.py b/journal/templatetags/user_actions.py index c830bbb2..5ef8e355 100644 --- a/journal/templatetags/user_actions.py +++ b/journal/templatetags/user_actions.py @@ -1,7 +1,6 @@ from django import template from django.urls import reverse -from journal.models import Collection, Like from takahe.utils import Takahe register = template.Library() @@ -19,18 +18,6 @@ def wish_item_action(context, item): return action -@register.simple_tag(takes_context=True) -def like_piece_action(context, piece): - user = context["request"].user - action = {} - if user and user.is_authenticated and piece and piece.latest_post: - action = { - "taken": Takahe.post_liked_by(piece.latest_post.pk, user.identity.pk), - "url": reverse("journal:like", args=[piece.uuid]), - } - return action - - @register.simple_tag(takes_context=True) def liked_piece(context, piece): user = context["request"].user diff --git a/journal/urls.py b/journal/urls.py index c688f0a0..630072fd 100644 --- a/journal/urls.py +++ b/journal/urls.py @@ -19,8 +19,6 @@ def _get_all_shelf_types(): urlpatterns = [ path("wish/", wish, name="wish"), - path("like/", like, name="like"), - path("unlike/", unlike, name="unlike"), path("mark/", mark, name="mark"), path("comment/", comment, name="comment"), path("piece//replies", piece_replies, name="piece_replies"), diff --git a/journal/views/__init__.py b/journal/views/__init__.py index 64653bca..f7782e82 100644 --- a/journal/views/__init__.py +++ b/journal/views/__init__.py @@ -16,7 +16,7 @@ from .collection import ( user_liked_collection_list, ) from .common import piece_delete -from .mark import comment, like, mark, mark_log, unlike, user_mark_list, wish +from .mark import comment, mark, mark_log, user_mark_list, wish from .post import ( piece_replies, post_boost, diff --git a/journal/views/mark.py b/journal/views/mark.py index 9988bff8..ab97ee46 100644 --- a/journal/views/mark.py +++ b/journal/views/mark.py @@ -6,7 +6,6 @@ from django.contrib.auth.decorators import login_required from django.core.exceptions import BadRequest, ObjectDoesNotExist, PermissionDenied from django.http import Http404, HttpResponse, HttpResponseRedirect from django.shortcuts import get_object_or_404, redirect, render -from django.urls import reverse from django.utils import timezone from django.utils.dateparse import parse_datetime from django.utils.translation import gettext_lazy as _ @@ -16,14 +15,7 @@ from common.utils import AuthedHttpRequest, PageLinksGenerator, get_uuid_or_404 from mastodon.api import boost_toot_later, share_comment from takahe.utils import Takahe -from ..models import ( - Comment, - Mark, - Piece, - ShelfType, - TagManager, - get_shelf_labels_for_category, -) +from ..models import Comment, Mark, ShelfType, TagManager, get_shelf_labels_for_category from .common import render_list, render_relogin, target_identity_required _logger = logging.getLogger(__name__) @@ -47,58 +39,6 @@ def wish(request: AuthedHttpRequest, item_uuid): return HttpResponse(_checkmark) -@login_required -def like(request: AuthedHttpRequest, piece_uuid): - if request.method != "POST": - raise BadRequest() - piece = get_object_or_404(Piece, uid=get_uuid_or_404(piece_uuid)) - if not piece: - raise Http404() - post = piece.latest_post - if post: - Takahe.like_post(post.pk, request.user.identity.pk) - if request.GET.get("back"): - return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/")) - elif request.GET.get("stats"): - return render( - request, - "like_stats.html", - { - "piece": piece, - "liked": True, - "label": request.GET.get("label"), - "icon": request.GET.get("icon"), - }, - ) - return HttpResponse(_checkmark) - - -@login_required -def unlike(request: AuthedHttpRequest, piece_uuid): - if request.method != "POST": - raise BadRequest() - piece = get_object_or_404(Piece, uid=get_uuid_or_404(piece_uuid)) - if not piece: - raise Http404() - post = piece.latest_post - if post: - Takahe.unlike_post(post.pk, request.user.identity.pk) - if request.GET.get("back"): - return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/")) - elif request.GET.get("stats"): - return render( - request, - "like_stats.html", - { - "piece": piece, - "liked": False, - "label": request.GET.get("label"), - "icon": request.GET.get("icon"), - }, - ) - return HttpResponse(_checkmark) - - @login_required def mark(request: AuthedHttpRequest, item_uuid): item = get_object_or_404(Item, uid=get_uuid_or_404(item_uuid)) diff --git a/social/templates/activity/comment_child_item.html b/social/templates/activity/comment_child_item.html index ac86729f..cc5ef38f 100644 --- a/social/templates/activity/comment_child_item.html +++ b/social/templates/activity/comment_child_item.html @@ -10,7 +10,6 @@ {% load user_actions %} {% load duration %} {% wish_item_action activity.action_object.item.parent_item as action %} -{% like_piece_action activity.action_object as like_action %} {% if activity.action_object.item.class_name == 'podcastepisode' %}