clean up legacy code

This commit is contained in:
Your Name 2023-12-29 21:56:23 -05:00 committed by Henri Dickson
parent 7b3885fbd9
commit 1e3e409a7e
6 changed files with 2 additions and 96 deletions

View file

@ -1,18 +0,0 @@
{% if liked %}
<a class="activated"
{% if request.user.is_authenticated %} hx-post="{% url 'journal:unlike' piece.uuid %}?stats=1&amp;icon={{ icon }}&amp;label={{ label }}" {% endif %}
hx-swap="outerHTML"
hx-target="this"
title="已喜欢">
<i class="fa-solid fa-heart"></i>
<span>{{ piece.like_count }}</span>
</a>
{% else %}
<a hx-swap="outerHTML"
hx-target="this"
{% if request.user.is_authenticated %} hx-post="{% url 'journal:like' piece.uuid %}?stats=1&amp;icon={{ icon }}&amp;label={{ label }}" {% endif %}
title="喜欢">
<i class="fa-regular fa-heart"></i>
{% if piece.like_count %}<span>{{ piece.like_count }}</span>{% endif %}
</a>
{% endif %}

View file

@ -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

View file

@ -19,8 +19,6 @@ def _get_all_shelf_types():
urlpatterns = [
path("wish/<str:item_uuid>", wish, name="wish"),
path("like/<str:piece_uuid>", like, name="like"),
path("unlike/<str:piece_uuid>", unlike, name="unlike"),
path("mark/<str:item_uuid>", mark, name="mark"),
path("comment/<str:item_uuid>", comment, name="comment"),
path("piece/<str:piece_uuid>/replies", piece_replies, name="piece_replies"),

View file

@ -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,

View file

@ -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))

View file

@ -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 %}
<span class="action">
{% if activity.action_object.item.class_name == 'podcastepisode' %}
<span>