app/item/views.py

@@ -8,7 +8,7 @@ from django.shortcuts import render
 from django.db.models import Q
 from django.utils.html import mark_safe
 from django.conf import settings
-from django.http import HttpResponse, Http404
+from django.http import HttpResponse
 
 from . import models
 from . import tasks
@@ -19,10 +19,6 @@ from ..utils import default_context
 TS_FORMAT = "%Y-%m-%dT%H:%M:%S"
 
 
-def get_now():
-    return timezone.make_aware(datetime.now(), timezone.get_default_timezone())
-
-
 def index(request):
     context = default_context(request)
     now = request.GET.get("now")
@@ -30,7 +26,7 @@ def index(request):
         now = datetime.strptime(now, TS_FORMAT)
         now = timezone.make_aware(now, timezone.get_default_timezone())
     elif request.user.is_staff:
-        now = get_now()
+        now = timezone.make_aware(datetime.now(), timezone.get_default_timezone())
     else:
         now = None
     week, archive = models.Item.public(now)
@@ -54,10 +50,6 @@ def archive(request):
 def item(request, id):
     context = default_context(request)
     item = models.Item.objects.get(id=id)
-    if not request.user.is_staff and (
-        not item.published or item.published >= get_now()
-    ):
-        raise Http404
     context['item'] = item
     qs = item.comments.order_by('created')
     if not request.user.is_staff:
@@ -90,7 +82,7 @@ def comment(request):
     if request.user.is_authenticated:
         comment.user = request.user
         if comment.user.has_perm('app.item.can_post_comment'):
-            comment.published = get_now()
+            comment.published = timezone.now()
     else:
         comment.name = data['name']
         comment.email = data['email']
@@ -108,7 +100,7 @@ def publish_comment(request):
     data = json.loads(request.body)
     if request.user.is_staff:
         comment = models.Comment.objects.get(id=data['comment'])
-        comment.published = get_now()
+        comment.published = timezone.now()
         comment.save()
         if comment.data.get("moderator_ts"):
             account = settings.SIGNAL_ACCOUNT

app/templates/index.html

@@ -11,7 +11,7 @@
     {% endfor %}
     {% if archive %}
     <div class="archive">
-        <a href="/archive/">previous weeks</a>
+        <a href="/archive/">older items</a>
     </div>
     {% endif %}
     </div>