Merge branch 'timelime_timeline' into 'main'

Corrected typo: timelime -> timeline

See merge request brutaldon/brutaldon!10

Pipfile

@@ -21,9 +21,10 @@ requests = "*"
 six = "*"
 "urllib3" = "*"
 webencodings = "*"
-Django = "~=3.2"
+Django = "~=4.2"
 django-html_sanitizer = "*"
 inscriptis = "*"
 lxml = "*"
 
 [dev-packages]
+python-lsp-server = {extras = ["pyflakes", "rope", "yapf"], version = "*"}

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/notifications.html

@@ -4,7 +4,7 @@
 {% load sanitizer %}
 
 {% block title %}
-    Brutaldon ({{ own_acct.username }}) - Notifications timelime
+    Brutaldon ({{ own_acct.username }}) - Notifications timeline
 {% endblock %}
 
 {% comment %}

brutaldon/templates/main/timeline.html

@@ -4,7 +4,7 @@
 {% load cache %}
 
 {% block title %}
-    Brutaldon ({{ own_acct.username }}) - {{ timeline_name }} timelime
+    Brutaldon ({{ own_acct.username }}) - {{ timeline_name }} timeline
 {% endblock %}
 
 {% block page_scripts %}

brutaldon/templates/main/user.html

@@ -4,7 +4,7 @@
 {% load taglinks %}
 
 {% block title %}
-Brutaldon ({{ own_acct.username }}) - {{ user.acct }} timelime
+Brutaldon ({{ own_acct.username }}) - {{ user.acct }} timeline
 {% endblock %}
 
 {% block content %}

brutaldon/views.py

@@ -583,6 +583,7 @@ def old_login(request):
                 account.username = request.session["active_username"]
                 request.session["timezone"] = account.preferences.timezone
 
+                account.save()
                 accounts_dict = request.session.get("accounts_dict")
                 if not accounts_dict:
                     accounts_dict = {}
@@ -591,7 +592,6 @@ def old_login(request):
                     "user": user,
                 }
                 request.session["accounts_dict"] = accounts_dict
-                account.save()
 
                 return redirect(home)
             except IntegrityError: