From 64ec54296a775d04900d5b327b7875bb76ca65e4 Mon Sep 17 00:00:00 2001
From: Her Email <nobody@example.org>
Date: Sun, 3 Dec 2023 16:27:59 -0500
Subject: [PATCH] combile public and unlisted in reply

---
 journal/templates/replies.html | 13 ++-----------
 takahe/utils.py                |  5 +++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/journal/templates/replies.html b/journal/templates/replies.html
index bbcedbaf..d413ea22 100644
--- a/journal/templates/replies.html
+++ b/journal/templates/replies.html
@@ -50,20 +50,11 @@
           <label>
             <input type="radio"
                    name="visibility"
-                   value="0"
-                   {% if post.visibility == 0 %}checked{% endif %} />
+                   value="{% if request.user.preference.mastodon_publish_public %}0{% else %}1{% endif %}"
+                   {% if post.visibility <= 1 %}checked{% endif %} />
             <i class="fa-solid fa-globe"></i>
           </label>
         </li>
-        <li>
-          <label>
-            <input type="radio"
-                   name="visibility"
-                   value="1"
-                   {% if post.visibility == 1 %}checked{% endif %} />
-            <i class="fa-solid fa-lock-open"></i>
-          </label>
-        </li>
         <li>
           <label>
             <input type="radio"
diff --git a/takahe/utils.py b/takahe/utils.py
index bd32b264..cf257d95 100644
--- a/takahe/utils.py
+++ b/takahe/utils.py
@@ -6,6 +6,7 @@ from django.core.cache import cache
 from .models import *
 
 if TYPE_CHECKING:
+    from journal.models import Collection
     from users.models import APIdentity
     from users.models import User as NeoUser
 
@@ -426,11 +427,11 @@ class Takahe:
             return Takahe.Visibilities.unlisted
 
     @staticmethod
-    def post_collection(collection):
+    def post_collection(collection: "Collection"):
         existing_post = collection.latest_post
         user = collection.owner.user
         visibility = Takahe.visibility_n2t(
-            collection, user.preference.mastodon_publish_public
+            collection.visibility, user.preference.mastodon_publish_public
         )
         if existing_post and visibility != existing_post.visibility:
             Takahe.delete_posts([existing_post])