Threaded threads

brutaldon/forms.py

@@ -28,19 +28,7 @@ class OAuthLoginForm(forms.Form):
 class PreferencesForm(forms.ModelForm):
     class Meta:
         model = Preference
-        fields = [
-            "theme",
-            "filter_replies",
-            "filter_boosts",
-            "timezone",
-            "no_javascript",
-            "notifications",
-            "click_to_load",
-            "lightbox",
-            "filter_notifications",
-            "bundle_notifications",
-            "poll_frequency",
-        ]
+        fields = Preference._fields
 
 
 class PostForm(forms.Form):

brutaldon/models.py

@@ -29,14 +29,39 @@ class Theme(models.Model):
     def __str__(self):
         return self.name
 
+from django.db.models.fields.related_descriptors import ForeignKeyDeferredAttribute
+def set_fields(klass):
+    fields = []
+    for n in dir(klass):
+        assert n != "_fields"
+        v = getattr(klass, n)
+        if not hasattr(v, 'field'): continue
+        if not isinstance(v.field, models.Field): continue
+        if isinstance(v, ForeignKeyDeferredAttribute): continue
+        fields.append(n)
+    setattr(klass, '_fields', fields)
+    return klass
 
+@set_fields
 class Preference(models.Model):
     theme = models.ForeignKey(Theme, models.CASCADE, null=False, default=1)
     filter_replies = models.BooleanField(default=False)
     filter_boosts = models.BooleanField(default=False)
     timezone = models.CharField(
         max_length=80, blank=True, null=True, choices=timezones, default="UTC"
     )
+    preview_sensitive = models.BooleanField(
+        default=False,
+        help_text=_(
+            'Show preview for media marked as "sensitive"'))
+    open_detail = models.BooleanField(
+        default=False,
+        help_text=_(
+            'Open details (posts with subjects) by default'))
+    tree_threads = models.BooleanField(
+        default=True,
+        help_text=_(
+            'Display threads as a tree, or as a flat list if disabled.'))
     no_javascript = models.BooleanField(
         default=False,
         help_text=_(

brutaldon/static/css/brutaldon-dark.css

@@ -255,3 +255,25 @@ div.poll {
 {
     margin-top: 0;
 }
+
+html { 
+   overflow-x: inherit;
+}
+li {
+     margin-top: 0.1vh;
+     min-width: 40em;
+}
+ul {
+     padding-left: 2vw;
+}
+
+.input,
+.textarea {
+    color: inherit;
+    background-color: inherit;
+}
+
+input[type="text"] {
+    color: inherit;
+    background-color: inherit;
+}

brutaldon/templates/main/thread.html

@@ -18,16 +18,32 @@
     <h1 id="title" class="title">
         Thread
     </h1>
-    {% include "main/toot_partial.html" with toot=root %}
-    {% for descendant in descendants %}
-        {% if descendant == toot %}
-            {% include "main/toot_partial.html" with toot=toot active=True %}
-        {% else %}
-            {% include "main/toot_partial.html" with toot=descendant %}
-        {% endif %}
-        <hr class="is-hidden">
-    {% endfor %}
-
+    {% if preferences.tree_threads %}
+        {% for op in toots %}
+           {% if op == IN %}
+           <ul>
+           {% elif op == OUT %}
+           </ul>
+           {% else %}
+           <li>
+           {% if op.toot == activetoot %}
+                {% include "main/toot_partial.html" with toot=op.toot active=True %}
+           {% else %}
+                {% include "main/toot_partial.html" with toot=op.toot %}
+           {% endif %}
+           </li>
+           {% endif %}
+        {% endfor %}
+    {% else %}
+        {% include "main/toot_partial.html" with toot=root %}
+        {% for cur in descendants %}
+           {% if cur == activetoot %}
+                   {% include "main/toot_partial.html" with toot=cur active=True %}
+           {% else %}
+                {% include "main/toot_partial.html" with toot=cur %}
+           {% endif %}
+        {% endfor %}
+    {% endif %}
     {% if not preferences.no_javascript %}
         <script type="application/javascript">
          Intercooler.ready(expandCWButtonPrepare);

brutaldon/templates/main/toot_partial.html

@@ -41,7 +41,11 @@
             {% endif %}
         </p>
         {% if toot.spoiler_text %}
-            <details class="toot">
+            <details class="toot"
+            {% if preferences.open_detail %}
+            open=""
+            {% endif %}
+            >
                 <summary><strong>{{ toot.spoiler_text }} </strong></summary>
                 <div class="toot">
                     {{ toot.content | relink_toot | fix_emojos:toot.emojis | strip_html | safe }}
@@ -101,7 +105,7 @@
                         <figure class="column attachment-image">
                             <a href="{{ media.url }}">
                                 <noscript class="loading-lazy">
-                                {% if toot.sensitive %}
+                                {% if toot.sensitive and not preferences.preview_sensitive %}
                                     <img loading="lazy" src="{% static "images/sensitive.png" %}"
                                 {% else %}
                                     <img loading="lazy" src="{{ media.preview_url }}"
@@ -127,7 +131,7 @@
                                 <source src="{{ media.url }}" type="video/mp4">
                                 <a href="{{ media.url }}">
                                     <noscript class="loading-lazy">
-                                    {% if toot.sensitive %}
+                                    {% if toot.sensitive and not preferences.preview_sensitive %}
                                         <img loading="lazy" src="{% static "images/sensitive.png" %}"
                                     {% else %}
                                         <img loading="lazy" src="{{ media.preview_url }}"

brutaldon/templates/setup/settings.html

@@ -29,7 +29,52 @@ <h2 class="subtitle">General Options</h2>
                     </div>
                 </div>
             </div>
-
+            <h2 class="subtitle">Options</h2>
+            <div class="columns">
+                <div class="column is-quarter">
+                    <label class="label checkbox" for="id_preview_sensitive">
+                        {% render_field form.preview_sensitive class+="checkbox" %}
+                        {{ form.preview_sensitive.label }}
+                    </label>
+                </div>
+                <div class="column is-quarter">
+                    <p class="notification is-info preferences-help">
+                        {{ form.preview_sensitive.help_text }}
+                    </p>
+                </div>
+                <div class="column is-half">
+                </div>
+            </div>
+            <div class="columns">
+                <div class="column is-quarter">
+                    <label class="label checkbox" for="id_open_details">
+                        {% render_field form.open_detail class+="checkbox" %}
+                        {{ form.open_detail.label }}
+                    </label>
+                </div>
+                <div class="column is-quarter">
+                    <p class="notification is-info preferences-help">
+                        {{ form.open_detail.help_text }}
+                    </p>
+                </div>
+                <div class="column is-half">
+                </div>
+            </div>
+            <div class="columns">
+                <div class="column is-quarter">
+                    <label class="label checkbox" for="id_tree_threads">
+                        {% render_field form.tree_threads class+="checkbox" %}
+                        {{ form.tree_threads.label }}
+                    </label>
+                </div>
+                <div class="column is-quarter">
+                    <p class="notification is-info preferences-help">
+                        {{ form.tree_threads.help_text }}
+                    </p>
+                </div>
+                <div class="column is-half">
+                </div>
+            </div>
             <h2 class="subtitle">Timeline Options</h2>
             <div class="field">
                 <label class="label checkbox">

brutaldon/threadtree.py

@@ -0,0 +1,98 @@
+class filtered_toot:
+    class account:
+        acct = "(filtered)"
+        display_name = "(filtered)"
+        emojis = ()
+    avatar_static = 'about:blank'
+    created_at = None
+    spoiler_text = None
+    content = ""
+    poll = None
+    card = None
+    media_attachments = None
+    sensitive = False
+    id = None
+    replies_count = -1
+    visibility = 'filtered'
+    favourited = False
+    in_reply_to_id = None
+
+
+def maketree(mastodon, oktoot, root, descendants):
+    # Apply filters later...
+    # descendants = [toot for toot in descendants if oktoot(toot)]
+    lookup = dict((descendant.id, descendant) for descendant in descendants)
+    lookup[root.id] = root
+    replies = {}
+    roots = set([root.id])
+    def lookup_or_fetch(id):
+        if not id in lookup:
+            toot = mastodon.status(id)
+            if not oktoot(toot):
+                # just a placeholder so it doesn't mess up the UI
+                return filtered_toot
+            lookup[id] = toot
+            return toot
+        return lookup[id]
+    def getreps(id):
+        if id in replies:
+            reps = replies[id]
+        else:
+            reps = set()
+            replies[id] = reps
+        return reps
+    for descendant in descendants:
+        if not descendant.in_reply_to_id:
+            roots.add(descendant.id)
+        else:
+            reps = getreps(descendant.in_reply_to_id)
+            reps.add(descendant.id)
+            reps = getreps(descendant.in_reply_to_account_id)
+            reps.add(descendant.id)
+    seen = set()
+    def onelevel(reps):
+        for rep in sorted(reps):
+            if rep in seen: continue
+            seen.add(rep)
+            subreps = replies.get(rep)
+            if subreps:
+                yield lookup_or_fetch(rep), onelevel(subreps)
+            else:
+                yield lookup_or_fetch(rep), ()
+    def leftovers():
+        for leftover in set(lookup.keys()) - seen:
+            yield lookup_or_fetch(leftover)
+    return onelevel(roots), leftovers
+
+# returns (status, gen[(status, gen[(status, ...), (status, ())]), ...])
+
+# django can't do recursion well so we'll turn the tree
+# ((A, (B, C)))
+# into
+# (in, in, A, in, B, C, out, out, out)
+
+IN = 0
+OUT = 1
+class TOOT:
+    toot = None
+    def __init__(self, toot):
+        self.toot = toot
+
+def unmaketree(tree):
+    for toot, children in tree:
+        yield TOOT(toot)
+        if children:
+            yield IN
+            yield from unmaketree(children)
+            yield OUT
+
+def build(mastodon, oktoot, root, descendants):
+    tree, leftover = maketree(mastodon, oktoot, root, descendants)
+    yield IN
+    yield from unmaketree(tree)
+    yield OUT
+    yield IN
+    leftover = tuple(leftover())
+    for toot in leftover:
+        yield TOOT(toot)
+    yield OUT