X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/124d23a42f7e6153c8b4de59dd337bdd98a9d893..HEAD:/src/social/templatetags/social_tags.py

diff --git a/src/social/templatetags/social_tags.py b/src/social/templatetags/social_tags.py
index 0af1da285..a4b0f3ed2 100644
--- a/src/social/templatetags/social_tags.py
+++ b/src/social/templatetags/social_tags.py
@@ -1,40 +1,41 @@
-# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
-# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+# This file is part of Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
 #
 import re
 from django import template
 from django.utils.functional import lazy
 from django.utils.cache import add_never_cache_headers
-from catalogue.models import Book
-from ssify import ssi_variable
-from ssify.utils import ssi_vary_on_cookie
-from social.utils import likes, get_or_choose_cite
+from catalogue.models import Book, Fragment
+from social.utils import likes, get_or_choose_cite, choose_cite as cs
 from ..models import Carousel, Cite
 
 register = template.Library()
 
 
-@ssi_variable(register, patch_response=[ssi_vary_on_cookie])
-def likes_book(request, book_id):
-    return likes(request.user, Book.objects.get(pk=book_id), request)
+@register.simple_tag(takes_context=True)
+def likes_book(context, book):
+    request = context['request']
+    return likes(request.user, book, request)
 
 
-@ssi_variable(register, name='choose_cite', patch_response=[add_never_cache_headers])
-def choose_cite_tag(request, book_id=None, tag_ids=None):
-    cite = get_or_choose_cite(request, book_id, tag_ids)
-    return cite.pk if cite is not None else None
+@register.simple_tag(takes_context=True)
+def choose_cite(context, book_id=None, tag_ids=None):
+    request = context['request']
+    return get_or_choose_cite(request, book_id, tag_ids)
 
 
-@register.inclusion_tag('social/cite_promo.html')
-def render_cite(cite):
-    return {
-        'cite': cite,
-    }
+@register.simple_tag
+def choose_cites(number, book=None, author=None):
+    if book is not None:
+        return book.choose_fragments(number) # todo: cites?
+    elif author is not None:
+        return Fragment.tagged.with_all([author]).order_by('?')[:number]
 
 
-@ssi_variable(register, patch_response=[ssi_vary_on_cookie])
-def book_shelf_tags(request, book_id):
-    if not request.user.is_authenticated():
+@register.simple_tag(takes_context=True)
+def book_shelf_tags(context, book_id):
+    request = context['request']
+    if not request.user.is_authenticated:
         return ''
     book = Book.objects.get(pk=book_id)
     lks = likes(request.user, book, request)
@@ -51,41 +52,10 @@ def book_shelf_tags(request, book_id):
 
 
 @register.inclusion_tag('social/carousel.html', takes_context=True)
-def carousel(context, slug):
-    # TODO: cache
-    try:
-        carousel = Carousel.objects.get(slug=slug)
-    except Carousel.DoesNotExist:
-        # TODO: add sanity check for install.
-        carousel = Carousel.objects.create(slug=slug)
-    banners = [
-            item.get_banner()
-            for item in carousel.carouselitem_set.all().select_related('banner')
-            ]
-
-    request = context['request']
-    if 'banner' in request.GET:
-        try:
-            banner_id = int(request.GET['banner'])
-        except (TypeError, ValueError):
-            pass
-        else:
-            try:
-                index = [b.pk for b in banners].index(banner_id)
-            except ValueError:
-                if request.user.is_staff:
-                    # Staff is allowed to preview any banner.
-                    try:
-                        banners.insert(0, Cite.objects.get(pk=banner_id))
-                    except Cite.DoesNotExist:
-                        pass
-            else:
-                # Put selected banner to front.
-                banners = [banners[index]] + banners[:index] + banners[index+1:]
-
+def carousel(context, placement):
+    banners = Carousel.get(placement).carouselitem_set.all()#first().get_banner()
     return {
-        'carousel': carousel,
-        'banners': banners,
+        'banners': [b.get_banner() for b in banners],
     }