-
{% if page>1 %}
- - Prev + Prev {% else %}
- Prev {% endif %} {% if next_exists %}
- - Next + Next {% else %}
- Next diff --git a/files/templates/rules.html b/files/templates/rules.html index 1cbd87708..139358004 100644 --- a/files/templates/rules.html +++ b/files/templates/rules.html @@ -25,14 +25,16 @@
- Make your point reasonably clear and plain. Try to assume other people are doing the same.
- Be no more antagonistic than is absolutely necessary for your argument.
- Be charitable. +
- Keep to a single account.
-
-
- Avoid low-effort participation -
- Do not weakman in order to show how bad a group is -
- Keep culture war in the culture war thread -
- Leave the rest of the internet at the door +
- Avoid low-effort participation. +
- Do not weakman in order to show how bad a group is. +
- Keep culture war in the culture war thread. +
- Leave the rest of the internet at the door. +
- Post on multiple subjects.
Keep to a single account.
+
+ We strongly discourage people from making alt accounts without good reason, and in the absence of a good reason, we consider alt accounts to be bannable on sight. Alt accounts are almost exclusively used for mod evasion purposes and very rarely used for any purpose that helps the community; it makes moderation more difficult and it makes conversation more difficult.
+
+ If you do feel you need an alt account (most commonly, if you're a well-established user who wants to post something that can't be linked to their public persona), please ask the mods.
+
+ If you don't want the mods to know about it either, be aware that there's a good chance we'll find out about it anyway.
+
@@ -167,7 +178,7 @@
invest effort if they want to post things that have traditionally been pain points.
- Avoid low-effort participation
+Avoid low-effort participation.
Discussing things is hard. Discussing things in a useful way, in an environment with opposing views, is really
hard. Doing all of this while responding to three-word shitposts is basically impossible.
@@ -177,7 +188,7 @@
in encouraging that.
Do not weakman in order to show how bad a group is
+Do not weakman in order to show how bad a group is.
There are literally millions of people on either side of every major conflict, and finding that one of them is doing something wrong or thoughtless proves nothing and adds nothing to the conversation. We want to engage with @@ -203,7 +214,7 @@ discussion), a news story which is about tweets from non-prominent people reacting to some event isn't ok.
-Keep culture war in the culture war thread
+Keep culture war in the culture war thread.
"Culture war" is hard to define, but here's a list of things that currently fall in that category:
-
@@ -241,7 +252,7 @@
is inconvenient, but that's intended.
-
Leave the rest of the internet at the door
+Leave the rest of the internet at the door.
In keeping with the rules above regarding "low-effort" and "weak-man" comments, and our goal to produce more light than heat, we ask that you refrain from posting bare links to culture-war-related discussions held outside @@ -254,6 +265,17 @@ may be made for communities specifically designed for compatible content, but these will be examined by the moderators on a case by case basis. If in doubt, please ask first by messaging the moderators.
+ +Post on multiple subjects.
+
+ We occasionally have trouble with people who turn into single-issue posters, posting and commenting only on a single subject. We'd like to discourage this. If you find yourself posting constantly on a single subject, please make an effort to post on other subjects as well.
+
+
+ This doesn't mean you need to write megaposts! This can be as simple as going to the Friday Fun Thread once in a while and posting a few paragraphs about whatever video game you last played. But this community is fundamentally for people, and if a poster is acting more like a propaganda-bot than a person, we're going to start looking at them suspiciously.
+
+
+ This rule is going to be applied with delicacy; if I can find not-low-effort comments about three different subjects within your last two weeks or two pages of comments, you're likely fine.
+
diff --git a/files/templates/sidebar_TheMotte.html b/files/templates/sidebar_TheMotte.html index ffbff109b..e26c346bd 100644 --- a/files/templates/sidebar_TheMotte.html +++ b/files/templates/sidebar_TheMotte.html @@ -61,14 +61,16 @@
-
-
- Avoid low-effort participation -
- Do not weakman in order to show how bad a group is -
- Keep culture war in the culture war thread -
- Leave the rest of the internet at the door +
- Avoid low-effort participation. +
- Do not weakman in order to show how bad a group is. +
- Keep culture war in the culture war thread. +
- Leave the rest of the internet at the door. +
- Post on multiple subjects.
@@ -199,13 +196,11 @@
{% endif %}
{% if p.realurl(v) %}
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 3fedb9301..f7889fbbe 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -246,9 +246,6 @@
-
-
-
{% endif %}
{% if v and v.admin_level >= PERMS['USER_SET_PROFILE_PRIVACY'] %}
Set Private Mode
@@ -425,15 +422,8 @@
{% if v and v.admin_level >= 2 %}
-
-
-
-
-
{% if u.is_suspended %}
diff --git a/files/tests/test_child_comment_counts.py b/files/tests/test_child_comment_counts.py
index f19878842..fd0b57da7 100644
--- a/files/tests/test_child_comment_counts.py
+++ b/files/tests/test_child_comment_counts.py
@@ -192,7 +192,6 @@ def test_bulk_update_descendant_count_quick(accounts, submissions, comments):
for i in range(2):
post = Submission(**{
'private': False,
- 'club': None,
'author_id': alice.id,
'over_18': False,
'app_id': None,
diff --git a/migrations/versions/2023_08_08_14_36_38_d08833c2adc7_excise_country_club.py b/migrations/versions/2023_08_08_14_36_38_d08833c2adc7_excise_country_club.py
new file mode 100644
index 000000000..7e8f8b188
--- /dev/null
+++ b/migrations/versions/2023_08_08_14_36_38_d08833c2adc7_excise_country_club.py
@@ -0,0 +1,27 @@
+"""excise country club
+
+Revision ID: d08833c2adc7
+Revises: 85dad82a4a67
+Create Date: 2023-08-08 14:36:38.797624+00:00
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'd08833c2adc7'
+down_revision = '85dad82a4a67'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ op.drop_column('submissions', 'club')
+ op.drop_column('users', 'club_allowed')
+
+
+def downgrade():
+ op.add_column('users', sa.Column('club_allowed', sa.BOOLEAN(), autoincrement=False, nullable=True))
+ op.add_column('submissions', sa.Column('club', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=False))
+ op.add_column('commentvotes', sa.Column('created_utc', sa.INTEGER(), autoincrement=False, nullable=False))
- {% if p.club %}{{CC}}{% endif %} {% if p.flair %}{{p.flair | safe}}{% endif %} {{p.realtitle(v) | safe}}
{% else %}- {% if p.club %}{{CC}}{% endif %} {% if p.flair %}{{p.flair | safe}}{% endif %} {{p.realtitle(v) | safe}}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index e404e5078..6a697083b 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -1,5 +1,3 @@ -{% set cc='COUNTRY CLUB' %} - {% if not v or v.highlightcomments %} {% endif %} @@ -148,7 +146,6 @@- {% if p.club %}{{CC}}{% endif %} {% if p.flair %}{{p.flair | safe}}{% endif %} {{p.realtitle(v) | safe}}
@@ -305,30 +302,28 @@ {% include "component/post/actions_admin_mobile.html" %} {% endif %} - {% if not p.club or v and (v.paid_dues or v.id == p.author_id) %} - {% if p.realbody(v) %} -
- {{p.realbody(v) | safe}}
-
- {% endif %}
+ {% if p.realbody(v) %}
+
+ {{p.realbody(v) | safe}}
+
+ {% endif %}
- {% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and CARD_VIEW)) %}
-
-
- 
-
-
- {% elif p.is_video %}
-
-
-
-
-
- {% elif p.is_youtube %}
-
- {% endif %}
+ {% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and CARD_VIEW)) %}
+
+
+
+
+
+ {% elif p.is_video %}
+
+
+
+
+
+ {% elif p.is_youtube %}
+
{% endif %}
-
-
-