From a714a7d187e29fcdefa9337c4a80139c26dab8b9 Mon Sep 17 00:00:00 2001
From: rscmbbng <rscmbbng@noreply.codeberg.org>
Date: Fri, 8 Mar 2024 10:49:29 +0000
Subject: [PATCH 1/7] more vertical alignment

---
 app/templates/community/add_post.html | 2 +-
 app/templates/user/show_profile.html  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/templates/community/add_post.html b/app/templates/community/add_post.html
index 70cbdd65..1f0a07c3 100644
--- a/app/templates/community/add_post.html
+++ b/app/templates/community/add_post.html
@@ -114,7 +114,7 @@
     </div>
 
     <aside id="side_pane" class="col-12 col-md-4 side_pane" role="complementary">
-        <div class="card mt-3">
+        <div class="card mb-3">
             <div class="card-header">
                  <h2>{{ community.title }}</h2>
             </div>
diff --git a/app/templates/user/show_profile.html b/app/templates/user/show_profile.html
index 2d9ca073..b39c2642 100644
--- a/app/templates/user/show_profile.html
+++ b/app/templates/user/show_profile.html
@@ -108,7 +108,7 @@
 
     <aside id="side_pane" class="col-12 col-md-4 side_pane" role="complementary">
         {% if current_user.is_authenticated and current_user.id == user.id %}
-            <div class="card">
+            <div class="card mb-3">
                 <div class="card-header">
                      <h2>{{ _('Manage') }}</h2>
                 </div>
@@ -125,7 +125,7 @@
             </div>
         {% endif %}
         {% if len(subscribed) > 0 or len(moderates) > 0 %}
-            <div class="card mt-3">
+            <div class="card mb-3">
                 <div class="card-header">
                      <h2>{{ _('Communities') }}</h2>
                 </div>
@@ -154,7 +154,7 @@
             </div>
         {% endif %}
         {% if current_user.is_authenticated and (user_access('ban users', current_user.id) or user_access('manage users', current_user.id)) and user.id != current_user.id %}
-            <div class="card mt-3">
+            <div class="card mb-3">
                 <div class="card-header">
                      <h2>{{ _('Crush') }}</h2>
                 </div>
@@ -184,7 +184,7 @@
             </div>
         {% endif %}
         {% if upvoted %}
-            <div class="card mt-3">
+            <div class="card mb-3">
                 <div class="card-header">
                      <h2>{{ _('Upvoted') }}</h2>
                 </div>

From 9b2d58971aa303486502d83a4e0f821c6f00d0ac Mon Sep 17 00:00:00 2001
From: rra <rscmbbng@riseup.net>
Date: Thu, 21 Mar 2024 21:55:05 +0100
Subject: [PATCH 2/7] add current page to community edit and community mods

---
 app/community/routes.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/community/routes.py b/app/community/routes.py
index ed350e22..2ef4f1cc 100644
--- a/app/community/routes.py
+++ b/app/community/routes.py
@@ -651,7 +651,7 @@ def community_edit(community_id: int):
             form.topic.data = community.topic_id if community.topic_id else None
             form.default_layout.data = community.default_layout
         return render_template('community/community_edit.html', title=_('Edit community'), form=form,
-                               current_app=current_app,
+                               current_app=current_app, current="edit_settings",
                                community=community, moderating_communities=moderating_communities(current_user.get_id()),
                                joined_communities=joined_communities(current_user.get_id()))
     else:
@@ -692,7 +692,7 @@ def community_mod_list(community_id: int):
             filter(CommunityMember.community_id == community_id, or_(CommunityMember.is_moderator == True, CommunityMember.is_owner == True)).all()
 
         return render_template('community/community_mod_list.html', title=_('Moderators for %(community)s', community=community.display_name()),
-                        moderators=moderators, community=community,
+                        moderators=moderators, community=community, current="moderators",
                         moderating_communities=moderating_communities(current_user.get_id()),
                         joined_communities=joined_communities(current_user.get_id())
                         )

From c1961c41c34e66c993de97da4ecfbc9fc3bb5ee0 Mon Sep 17 00:00:00 2001
From: rra <rscmbbng@riseup.net>
Date: Tue, 26 Mar 2024 17:16:51 +0100
Subject: [PATCH 3/7] fix crash when there are no topics

---
 app/community/routes.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/community/routes.py b/app/community/routes.py
index 7ffd6907..c711ed47 100644
--- a/app/community/routes.py
+++ b/app/community/routes.py
@@ -639,7 +639,8 @@ def community_edit(community_id: int):
                     community.image = file
 
             db.session.commit()
-            community.topic.num_communities = community.topic.communities.count()
+            if community.topic:
+                community.topic.num_communities = community.topic.communities.count()
             db.session.commit()
             flash(_('Saved'))
             return redirect(url_for('activitypub.community_profile', actor=community.ap_id if community.ap_id is not None else community.name))

From 9fccd2d3b3a4162de65967527a81b17bd396c071 Mon Sep 17 00:00:00 2001
From: rra <rscmbbng@riseup.net>
Date: Tue, 26 Mar 2024 17:29:08 +0100
Subject: [PATCH 4/7] The system expects domains to start with http, validate
 for it

---
 app/community/forms.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/community/forms.py b/app/community/forms.py
index ca80ba6c..797df505 100644
--- a/app/community/forms.py
+++ b/app/community/forms.py
@@ -3,7 +3,7 @@ from flask_login import current_user
 from flask_wtf import FlaskForm
 from wtforms import StringField, SubmitField, TextAreaField, BooleanField, HiddenField, SelectField, FileField, \
     DateField
-from wtforms.validators import ValidationError, DataRequired, Email, EqualTo, Length, Optional
+from wtforms.validators import ValidationError, DataRequired, Email, EqualTo, Length, Regexp, Optional
 from flask_babel import _, lazy_gettext as _l
 
 from app import db
@@ -82,7 +82,7 @@ class CreatePostForm(FlaskForm):
     link_title = StringField(_l('Title'), validators={Optional(), Length(min=3, max=255)})
     link_body = TextAreaField(_l('Body'), validators={Optional(), Length(min=3, max=5000)},
                                     render_kw={'placeholder': 'Text (optional)'})
-    link_url = StringField(_l('URL'), render_kw={'placeholder': 'https://...'})
+    link_url = StringField(_l('URL'), validators=[Regexp(r'^https?://', message='Submitted links need to start with "http://"" or "https://"')], render_kw={'placeholder': 'https://...'})
     image_title = StringField(_l('Title'), validators={Optional(), Length(min=3, max=255)})
     image_alt_text = StringField(_l('Alt text'), validators={Optional(), Length(min=3, max=255)})
     image_body = TextAreaField(_l('Body'), validators={Optional(), Length(min=3, max=5000)},

From 1108bbe06676ea2de84c4a0510b2664a3939709e Mon Sep 17 00:00:00 2001
From: rra <rscmbbng@riseup.net>
Date: Tue, 26 Mar 2024 22:20:42 +0100
Subject: [PATCH 5/7] fix typo breaking reporting function

---
 app/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models.py b/app/models.py
index 3ccb3022..d3b44a99 100644
--- a/app/models.py
+++ b/app/models.py
@@ -1215,7 +1215,7 @@ class Report(db.Model):
             return types[self.type]
 
     def is_local(self):
-        return self.source_instance == 1
+        return self.source_instance_id == 1
 
 
 class IpBan(db.Model):

From 4eef40e09db194e8602cbfb925d4a448e63bb880 Mon Sep 17 00:00:00 2001
From: rra <rscmbbng@riseup.net>
Date: Tue, 26 Mar 2024 22:48:45 +0100
Subject: [PATCH 6/7] change unclear and unhelpful terminology

---
 app/templates/user/show_profile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/user/show_profile.html b/app/templates/user/show_profile.html
index 17cced75..b6d17c05 100644
--- a/app/templates/user/show_profile.html
+++ b/app/templates/user/show_profile.html
@@ -159,7 +159,7 @@
         {% if current_user.is_authenticated and (user_access('ban users', current_user.id) or user_access('manage users', current_user.id)) and user.id != current_user.id %}
             <div class="card mb-3">
                 <div class="card-header">
-                     <h2>{{ _('Crush') }}</h2>
+                     <h2>{{ _('Moderate user') }}</h2>
                 </div>
                 <div class="card-body">
                     <div class="row">

From 18f8da4d0a2b38f985e235580acd573da87fdb46 Mon Sep 17 00:00:00 2001
From: rra <rscmbbng@riseup.net>
Date: Tue, 26 Mar 2024 23:17:10 +0100
Subject: [PATCH 7/7] community edit and moderation are now visually a single
 screen; community delete button moved to settings

---
 .../community/_community_moderation_nav.html         | 12 ++++++++++--
 app/templates/community/community.html               | 10 +++-------
 app/templates/community/community_delete.html        |  2 ++
 app/templates/community/community_edit.html          | 12 +++++++++---
 app/templates/community/community_mod_list.html      |  2 ++
 app/templates/community/community_moderate.html      |  6 +++---
 .../community/community_moderate_banned.html         |  7 ++++---
 7 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/app/templates/community/_community_moderation_nav.html b/app/templates/community/_community_moderation_nav.html
index 51dea95d..12a54047 100644
--- a/app/templates/community/_community_moderation_nav.html
+++ b/app/templates/community/_community_moderation_nav.html
@@ -1,14 +1,22 @@
 <div class="btn-group mt-1 mb-2">
+{% if community.is_owner() or current_user.is_admin() %}
+    <a href="{{ url_for('community.community_edit', community_id=community.id) }}" class="btn {{ 'btn-primary' if current == '' or current == 'edit_settings' else 'btn-outline-secondary' }}" rel="nofollow noindex">
+        {{ _('Settings') }}
+    </a>
+    <a href="{{ url_for('community.community_mod_list', community_id=community.id) }}" class="btn {{ 'btn-primary' if current == 'moderators' else 'btn-outline-secondary' }}" rel="nofollow noindex">
+        {{ _('Moderators') }}
+    </a>
+{% endif %}
     <a href="/community/{{ community.link() }}/moderate" aria-label="{{ _('Sort by hot') }}" class="btn {{ 'btn-primary' if current == '' or current == 'reports' else 'btn-outline-secondary' }}" rel="nofollow noindex">
         {{ _('Reports') }}
     </a>
     <a href="/community/{{ community.link() }}/moderate/banned" class="btn {{ 'btn-primary' if current == 'banned' else 'btn-outline-secondary' }}" rel="nofollow noindex">
         {{ _('Banned people') }}
     </a>
-    <a href="/community/{{ community.link() }}/moderate/appeals" class="btn {{ 'btn-primary' if current == 'appeals' else 'btn-outline-secondary' }}" rel="nofollow noindex">
+    <a href="/community/{{ community.link() }}/moderate/appeals" class="btn {{ 'btn-primary' if current == 'appeals' else 'btn-outline-secondary' }} disabled" rel="nofollow noindex" >
         {{ _('Appeals') }}
     </a>
-    <a href="/community/{{ community.link() }}/moderate/modlog" class="btn {{ 'btn-primary' if current == 'modlog' else 'btn-outline-secondary' }}" rel="nofollow noindex">
+    <a href="/community/{{ community.link() }}/moderate/modlog" class="btn {{ 'btn-primary' if current == 'modlog' else 'btn-outline-secondary' }} disabled" rel="nofollow noindex" >
         {{ _('Mod log') }}
     </a>
 </div>
\ No newline at end of file
diff --git a/app/templates/community/community.html b/app/templates/community/community.html
index 24252648..712758bf 100644
--- a/app/templates/community/community.html
+++ b/app/templates/community/community.html
@@ -175,14 +175,10 @@
                  <h2>{{ _('Community Settings') }}</h2>
             </div>
             <div class="card-body">
-                {% if is_moderator or is_owner or is_admin %}
-                <p><a href="/community/{{ community.link() }}/moderate" class="btn btn-primary">{{ _('Moderate') }}</a></p>
-                {% endif %}
                 {% if is_owner or is_admin %}
-                    <p><a href="{{ url_for('community.community_edit', community_id=community.id) }}" class="btn btn-primary">{{ _('Settings') }}</a></p>
-                {% endif %}
-                {% if community.is_local() and (community.is_owner() or current_user.is_admin()) %}
-                    <p><a class="btn btn-primary btn-warning" href="{{ url_for('community.community_delete', community_id=community.id) }}" rel="nofollow">Delete community</a></p>
+                <p><a href="{{ url_for('community.community_edit', community_id=community.id) }}" class="btn btn-primary">{{ _('Settings & Moderation') }}</a></p>
+                {% elif is_moderator %}
+                <p><a href="/community/{{ community.link() }}/moderate" class="btn btn-primary">{{ _('Moderation') }}</a></p>
                 {% endif %}
             </div>
         </div>
diff --git a/app/templates/community/community_delete.html b/app/templates/community/community_delete.html
index 28e1bf91..486ee070 100644
--- a/app/templates/community/community_delete.html
+++ b/app/templates/community/community_delete.html
@@ -12,7 +12,9 @@
                 <div class="card-body p-6">
                     <div class="card-title">{{ _('Delete "%(community_title)s"', community_title=community.title) }}</div>
                     <div class="card-body">
+                        <p class="card-text"> Are you sure you want to delete this community? This is irreversible and will delete all posts and comments associated with it.</p>
                         {{ render_form(form) }}
+                        <a class="btn btn-primary mt-2" href="/c/{{ community.link() }}">Go back</a>
                     </div>
                 </div>
             </div>
diff --git a/app/templates/community/community_edit.html b/app/templates/community/community_edit.html
index 6bf3744e..9e3bc21b 100644
--- a/app/templates/community/community_edit.html
+++ b/app/templates/community/community_edit.html
@@ -15,13 +15,17 @@
                 <li class="breadcrumb-item active">{{ _('Settings') }}</li>
             </ol>
         </nav>
+        {% if community %}
+        {% include "community/_community_moderation_nav.html" %}
+        {% endif %}
         <h1 class="mt-2">
             {% if community %}
-                {{ _('Edit community') }}
+                {{ _('Edit %(community)s', community=community.display_name()) }}
             {% else %}
                 {{ _('Create community') }}
             {% endif %}
         </h1>
+        <p>{{ _('Edit and configure this community') }}</p>
         <form method="post" enctype="multipart/form-data" id="add_local_community_form" role="form">
             {{ form.csrf_token() }}
             {{ render_field(form.title) }}
@@ -48,10 +52,12 @@
                     {{ render_field(form.submit) }}
                 </div>
                 <div class="col-auto">
-                    <a class="btn btn-outline-secondary" href="{{ url_for('community.community_mod_list', community_id=community.id) }}">{{ _('Moderators') }}</a>
-                </div>
+                {% if community.is_local() and (community.is_owner() or current_user.is_admin()) %}
+                    <p><a class="btn btn-primary btn-warning" href="{{ url_for('community.community_delete', community_id=community.id) }}" rel="nofollow">Delete community</a></p>
+                {% endif %}
             </div>
 
+
         </form>
     </div>
 </div>
diff --git a/app/templates/community/community_mod_list.html b/app/templates/community/community_mod_list.html
index fcb13f22..16e306a6 100644
--- a/app/templates/community/community_mod_list.html
+++ b/app/templates/community/community_mod_list.html
@@ -16,10 +16,12 @@
             <li class="breadcrumb-item active">{{ _('Moderators') }}</li>
           </ol>
         </nav>
+        {% include "community/_community_moderation_nav.html" %}
         <div class="row">
             <div class="col-12 col-md-10">
                 <h1 class="mt-2">{{ _('Moderators for %(community)s', community=community.display_name()) }}</h1>
             </div>
+            <p>{{ _('See and change who moderates this community') }}</p>
             <div class="col-12 col-md-2 text-right">
                 <a class="btn btn-primary" href="{{ url_for('community.community_add_moderator', community_id=community.id) }}">{{ _('Add moderator') }}</a>
             </div>
diff --git a/app/templates/community/community_moderate.html b/app/templates/community/community_moderate.html
index df481696..881c9618 100644
--- a/app/templates/community/community_moderate.html
+++ b/app/templates/community/community_moderate.html
@@ -15,16 +15,16 @@
             <li class="breadcrumb-item active">{{ _('Moderation') }}</li>
           </ol>
         </nav>
+        {% include "community/_community_moderation_nav.html" %}
         <div class="row">
             <div class="col-12 col-md-10">
-                <h1 class="mt-2">{{ _('Moderation of %(community)s', community=community.display_name()) }}</h1>
+                <h1 class="mt-2">{{ _('Reports') }}</h1>
             </div>
             <div class="col-12 col-md-2 text-right">
                 <!-- <a class="btn btn-primary" href="{{ url_for('community.community_add_moderator', community_id=community.id) }}">{{ _('Add moderator') }}</a> -->
             </div>
         </div>
-        {% include "community/_community_moderation_nav.html" %}
-        <h2>{{ _('Reports') }}</h2>
+        <p>{{ _('See and handle all reports made about %(community)s', community=community.display_name()) }}</p>
         {% if reports.items %}
         <form method="get">
             <input type="search" name="search" value="{{ search }}">
diff --git a/app/templates/community/community_moderate_banned.html b/app/templates/community/community_moderate_banned.html
index 96505f46..74a5b200 100644
--- a/app/templates/community/community_moderate_banned.html
+++ b/app/templates/community/community_moderate_banned.html
@@ -15,16 +15,17 @@
             <li class="breadcrumb-item active">{{ _('Moderation') }}</li>
           </ol>
         </nav>
+        {% include "community/_community_moderation_nav.html" %}
         <div class="row">
             <div class="col-12 col-md-10">
-                <h1 class="mt-2">{{ _('Moderation of %(community)s', community=community.display_name()) }}</h1>
+                <h1 class="mt-2">{{ _('Banned people') }}</h1>
             </div>
             <div class="col-12 col-md-2 text-right">
                 <!-- <a class="btn btn-primary" href="{{ url_for('community.community_add_moderator', community_id=community.id) }}">{{ _('Add moderator') }}</a> -->
             </div>
         </div>
-        {% include "community/_community_moderation_nav.html" %}
-        <h2>{{ _('Banned people') }}</h2>
+        <p>{{ _('See and manage who is banned from %(community)s', community=community.display_name()) }}</p>
+        <h2></h2>
         {% if banned_people %}
             <form method="get">
                 <input type="search" name="search" value="{{ search }}">