Merge branch 'working-search'

Pipfile

@@ -21,7 +21,7 @@ requests = "*"
 six = "*"
 "urllib3" = "*"
 webencodings = "*"
-Django = "~=3.2"
+Django = "~=4.2"
 django-html_sanitizer = "*"
 inscriptis = "*"
 lxml = "*"

brutaldon/settings.py

@@ -12,6 +12,14 @@ https://docs.djangoproject.com/en/2.0/ref/settings/
 
 import os
 
+# Work around issue in sanitizer
+import django
+try:
+    from django.utils.encoding import smart_text
+except:
+    from django.utils.encoding import smart_str
+    django.utils.encoding.smart_text = smart_str
+
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 

brutaldon/templates/main/timeline.html

@@ -14,16 +14,8 @@
 {% endblock %}
 
 {% block content %}
-    <h1>Brutaldon ({{ own_acct.username }}) - {{ timeline_name }} timelime</h1>
+    <h1 class="title">Your {{ timeline_name }} timeline</h1>
-    {% if form %}
+    <div id="timeline">
-        <h2 >Post</h2>
-        <div >
-            {% include "main/post_minimal_partial.html" %}
-        </div>
-        <hr >
-    {% endif %}
-    <h2 >Your {{ timeline_name }} timeline</h2>
-    <div>
         {% for toot in toots %}
             {% cache 600 toot_partial toot.id %}
                 {% if toot.reblog %}

brutaldon/templates/main/toot_partial.html

@@ -11,13 +11,16 @@
         <article>
 {% endif %}
 
-<figure>
+<div class="media-content">
+    <div class="content">
+<figure class="">
+    <p class="image is-64x64 account-avatar">
         <a href="{% url "user" toot.account.acct %}">
             <img class="avatar" loading="auto" src="{{ toot.account.avatar_static }}"
                  alt="">
         </a>
+    </p>
 </figure>
-    <div >
         <p>
             <h3><strong>{{ toot.account.display_name | fix_emojos:toot.account.emojis | strip_html |safe}}</strong></h3>
             <small><a href="{% url "user" toot.account.acct %}">
@@ -26,6 +29,13 @@
                 <small>{{ toot.created_at |humane_time  }}</small>
             </a>
             {% if reblog %}
+        <figure>
+        <p class="image is-32x32" >
+            <a href="{% url "user" reblog_by %}">
+                <img loading="auto" src ="{{ reblog_icon }}" alt="">
+            </a>
+        </p>
+        </figure>
                 <br>
                 Boosted by @{{ reblog_by }}
 		<figure>