rename distinguish_level to distinguished

files/classes/comment.py

@@ -182,7 +182,7 @@ class Comment(Base):
 	ghost = Column(Boolean, default=False)
 	bannedfor = Column(String)
 	chuddedfor = Column(String)
-	distinguish_level = Column(Integer, default=0)
+	distinguished = Column(Boolean, default=False)
 	deleted_utc = Column(Integer, default=0)
 	is_approved = Column(Integer, ForeignKey("users.id"))
 	level = Column(Integer, default=1)
@@ -383,7 +383,7 @@ class Comment(Base):
 				'is_nsfw': self.nsfw,
 				'permalink': f'/comment/{self.id}#context',
 				'stickied': self.stickied,
-				'distinguish_level': self.distinguish_level,
+				'distinguished': self.distinguished,
 				'post_id': self.post.id if self.post else 0,
 				'score': self.score,
 				'upvotes': self.upvotes,

files/classes/post.py

@@ -38,7 +38,7 @@ class Post(Base):
 	effortpost = Column(Boolean, default=False)
 	views = Column(Integer, default=0)
 	deleted_utc = Column(Integer, default=0)
-	distinguish_level = Column(Integer, default=0)
+	distinguished = Column(Boolean, default=False)
 	stickied = Column(String)
 	stickied_utc = Column(Integer)
 	hole_pinned = Column(String)
@@ -254,7 +254,7 @@ class Post(Base):
 				'downvotes': self.downvotes,
 				'stickied': self.stickied,
 				'private' : self.private,
-				'distinguish_level': self.distinguish_level,
+				'distinguished': self.distinguished,
 				'voted': self.voted if hasattr(self, 'voted') else 0,
 				'reports': reports,
 				}
@@ -269,7 +269,7 @@ class Post(Base):
 		if v and v.poor:
 			return 0
 
-		if self.distinguish_level and SITE_NAME == 'WPD':
+		if self.distinguished and SITE_NAME == 'WPD':
 			return 0
 
 		num = len([x for x in self.awards if x.kind == kind])

files/helpers/actions.py

@@ -241,7 +241,7 @@ def execute_snappy(post, v):
 
 	if len(body_html) < COMMENT_BODY_HTML_LENGTH_LIMIT:
 		c = Comment(author_id=SNAPPY_ID,
-			distinguish_level=6,
+			distinguished=True,
 			parent_post=post.id,
 			level=1,
 			nsfw=False,
@@ -314,7 +314,7 @@ def execute_zozbot(c, level, post, v):
 		body_html='<p class="zozbot">zoz</p>',
 		top_comment_id=c.top_comment_id,
 		ghost=c.ghost,
-		distinguish_level=6
+		distinguished=True
 	)
 
 	g.db.add(c2)
@@ -332,7 +332,7 @@ def execute_zozbot(c, level, post, v):
 		body_html='<p class="zozbot">zle</p>',
 		top_comment_id=c.top_comment_id,
 		ghost=c.ghost,
-		distinguish_level=6
+		distinguished=True
 	)
 
 	g.db.add(c3)
@@ -349,7 +349,7 @@ def execute_zozbot(c, level, post, v):
 		body_html='<p class="zozbot">zozzle</p>',
 		top_comment_id=c.top_comment_id,
 		ghost=c.ghost,
-		distinguish_level=6
+		distinguished=True
 	)
 
 	g.db.add(c4)

files/helpers/alerts.py

@@ -19,7 +19,7 @@ def create_comment(text_html):
 	new_comment = Comment(author_id=AUTOJANNY_ID,
 							parent_post=None,
 							body_html=text_html,
-							distinguish_level=6,
+							distinguished=True,
 							is_bot=True)
 	g.db.add(new_comment)
 	g.db.flush()
@@ -310,7 +310,7 @@ def alert_admins(body):
 						level=1,
 						body_html=body_html,
 						sentto=MODMAIL_ID,
-						distinguish_level=6,
+						distinguished=True,
 						is_bot=True
 						)
 	g.db.add(new_comment)

files/helpers/offsitementions.py

@@ -99,7 +99,7 @@ def notify_mentions(mentions, send_to=None, mention_str='site mention'):
 							author_id=const.AUTOJANNY_ID,
 							parent_post=None,
 							body_html=notif_text,
-							distinguish_level=6,
+							distinguished=True,
 							created_utc=int(m['created_utc']),
 						)
 		g.db.add(new_comment)

files/helpers/sanitize.py

@@ -34,7 +34,7 @@ def create_comment_duplicated(text_html):
 	new_comment = Comment(author_id=AUTOJANNY_ID,
 							parent_post=None,
 							body_html=text_html,
-							distinguish_level=6,
+							distinguished=True,
 							is_bot=True)
 	g.db.add(new_comment)
 	g.db.flush()

files/routes/admin.py

@@ -1451,11 +1451,11 @@ def approve_post(post_id, v):
 def distinguish_post(post_id, v):
 	post = get_post(post_id)
 
-	if post.distinguish_level:
+	if post.distinguished:
-		post.distinguish_level = 0
+		post.distinguished = False
 		kind = 'undistinguish_post'
 	else:
-		post.distinguish_level = v.admin_level
+		post.distinguished = True
 		kind = 'distinguish_post'
 
 	g.db.add(post)
@@ -1468,7 +1468,7 @@ def distinguish_post(post_id, v):
 	g.db.add(ma)
 
 
-	if post.distinguish_level: return {"message": "Post distinguished!"}
+	if post.distinguished: return {"message": "Post distinguished!"}
 	else: return {"message": "Post undistinguished!"}
 
 
@@ -1686,11 +1686,11 @@ def approve_comment(c_id, v):
 def admin_distinguish_comment(c_id, v):
 	comment = get_comment(c_id, v=v)
 
-	if comment.distinguish_level:
+	if comment.distinguished:
-		comment.distinguish_level = 0
+		comment.distinguished = False
 		kind = 'undistinguish_comment'
 	else:
-		comment.distinguish_level = v.admin_level
+		comment.distinguished = True
 		kind = 'distinguish_comment'
 
 	g.db.add(comment)
@@ -1703,7 +1703,7 @@ def admin_distinguish_comment(c_id, v):
 	g.db.add(ma)
 
 
-	if comment.distinguish_level: return {"message": "Comment distinguished!"}
+	if comment.distinguished: return {"message": "Comment distinguished!"}
 	else: return {"message": "Comment undistinguished!"}
 
 @app.get("/admin/banned_domains/")

files/routes/awards.py

@@ -205,7 +205,7 @@ def award_thing(v, thing_type, id):
 	if isinstance(obj, Post) and obj.id == 210983:
 		abort(403, "You can't award this post!")
 
-	if isinstance(obj, Post) and obj.distinguish_level and AWARDS[kind]['cosmetic']:
+	if isinstance(obj, Post) and obj.distinguished and AWARDS[kind]['cosmetic']:
 		abort(403, "Distinguished posts are immune to cosmetic awards!")
 
 	if kind == "benefactor":

files/routes/comments.py

@@ -326,7 +326,7 @@ def comment(v):
 		c_jannied = Comment(author_id=AUTOJANNY_ID,
 			parent_post=post_target.id if posting_to_post else None,
 			wall_user_id=post_target.id if not posting_to_post else None,
-			distinguish_level=6,
+			distinguished=True,
 			parent_comment_id=c.id,
 			level=level+1,
 			is_bot=True,

files/routes/posts.py

@@ -674,7 +674,7 @@ def submit_post(v, hole=None):
 			nsfw=False,
 			is_bot=True,
 			app_id=None,
-			distinguish_level=6,
+			distinguished=True,
 			body=body,
 			body_html=body_jannied_html,
 			ghost=p.ghost

files/templates/comments.html

@@ -153,7 +153,7 @@
 								<i id='pinned-{{c.id}}'class="fas fa-thumbtack fa-rotate--45 pr-1 text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned by @{{c.stickied}}" {% if c.stickied_utc %}data-onmouseover="pinned_timestamp('pinned-{{c.id}}')" data-timestamp={{c.stickied_utc}} data-nonce="{{g.nonce}}"{% endif %}></i>
 							{% endif %}
 
-							{% if c.distinguish_level and not c.ghost %}
+							{% if c.distinguished and not c.ghost %}
 								<i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{SITE_NAME}} Admin, speaking officially"></i>
 							{% endif %}
 
@@ -174,7 +174,7 @@
 							{% endif %}
 
 							{% if c.ghost %}
-								<span {% if c.distinguish_level %}class="mod {% if SITE_NAME == 'rDrama' %}mod-rdrama{% endif %}"{% endif %}>👻</span>
+								<span {% if c.distinguished %}class="mod {% if SITE_NAME == 'rDrama' %}mod-rdrama{% endif %}"{% endif %}>👻</span>
 							{% else %}
 								{% if FEATURES['PATRON_ICONS'] and c.author.patron > 1 %}
 									<img loading="lazy" src="{{SITE_FULL_IMAGES}}/i/{{SITE_NAME}}/badges/2{{c.author.patron}}.webp?b=11" class="patron-img" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{c.author.patron_tooltip}}" alt="{{c.author.patron_tooltip}}">
@@ -194,7 +194,7 @@
 											<img class="profile-pic-30-hat hat" loading="lazy" src="{{c.author.hat_active(v)[0]}}?x=7" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{c.author.hat_active(v)[1]}}" alt="@{{c.author.username}}'s hat">
 										{%- endif %}
 									</div>
-									<span {% if c.author.patron and not c.distinguish_level %}class="patron" style="background-color:#{{c.author.name_color}}"{% elif c.distinguish_level %}class="mod {% if SITE_NAME == 'rDrama' %}mod-rdrama{% endif %}"{% endif %} {% if c.author.pride_username(v) %}pride_username{% endif %}>{{c.author_name}}</span>
+									<span {% if c.author.patron and not c.distinguished %}class="patron" style="background-color:#{{c.author.name_color}}"{% elif c.distinguished %}class="mod {% if SITE_NAME == 'rDrama' %}mod-rdrama{% endif %}"{% endif %} {% if c.author.pride_username(v) %}pride_username{% endif %}>{{c.author_name}}</span>
 								</a>
 								{% if FEATURES['PRONOUNS'] %}
 									<span class="pronouns" style="color:#{{c.author.flaircolor}} !important;border-color:#{{c.author.flaircolor}} !important">{{c.author.pronouns_display}}</span>
@@ -422,9 +422,9 @@
 											{% endif %}
 
 											{% if v.admin_level >= PERMS['POST_COMMENT_DISTINGUISH'] %}
-												<button type="button" id="distinguish-{{c.id}}" class="dropdown-item list-inline-item d-none {% if not c.distinguish_level %}d-md-block{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish_comment/{{c.id}}','distinguish-{{c.id}}','undistinguish-{{c.id}}','d-md-block')"><i class="fas fa-id-badge text-info fa-fw"></i>Distinguish</button>
+												<button type="button" id="distinguish-{{c.id}}" class="dropdown-item list-inline-item d-none {% if not c.distinguished %}d-md-block{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish_comment/{{c.id}}','distinguish-{{c.id}}','undistinguish-{{c.id}}','d-md-block')"><i class="fas fa-id-badge text-info fa-fw"></i>Distinguish</button>
 
-												<button type="button" id="undistinguish-{{c.id}}" class="dropdown-item list-inline-item d-none {% if c.distinguish_level %}d-md-block{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish_comment/{{c.id}}','distinguish-{{c.id}}','undistinguish-{{c.id}}','d-md-block')"><i class="fas fa-id-badge text-info fa-fw"></i>Undistinguish</button>
+												<button type="button" id="undistinguish-{{c.id}}" class="dropdown-item list-inline-item d-none {% if c.distinguished %}d-md-block{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish_comment/{{c.id}}','distinguish-{{c.id}}','undistinguish-{{c.id}}','d-md-block')"><i class="fas fa-id-badge text-info fa-fw"></i>Undistinguish</button>
 											{% endif %}
 
 											{% if c.parent_post %}
@@ -688,8 +688,8 @@
 										{% endif %}
 
 										{% if v.admin_level >= PERMS['POST_COMMENT_DISTINGUISH'] %}
-											<button type="button" id="distinguish2-{{c.id}}" class="list-group-item {% if c.distinguish_level %}d-none{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish_comment/{{c.id}}','distinguish2-{{c.id}}','undistinguish2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-id-badge text-info mr-2"></i>Distinguish</button>
+											<button type="button" id="distinguish2-{{c.id}}" class="list-group-item {% if c.distinguished %}d-none{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish_comment/{{c.id}}','distinguish2-{{c.id}}','undistinguish2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-id-badge text-info mr-2"></i>Distinguish</button>
-											<button type="button" id="undistinguish2-{{c.id}}" class="list-group-item {% if not c.distinguish_level %}d-none{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish_comment/{{c.id}}','distinguish2-{{c.id}}','undistinguish2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-id-badge text-info mr-2"></i>Undistinguish</button>
+											<button type="button" id="undistinguish2-{{c.id}}" class="list-group-item {% if not c.distinguished %}d-none{% endif %} text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish_comment/{{c.id}}','distinguish2-{{c.id}}','undistinguish2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-id-badge text-info mr-2"></i>Undistinguish</button>
 										{% endif %}
 
 										<button type="button" id="pin2-{{c.id}}" class="list-group-item {% if c.stickied %}d-none{% endif %} text-info" data-bs-target="#adminModal-{{c.id}}" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/sticky_comment/{{c.id}}','pin2-{{c.id}}','unpin2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-info mr-2"></i>Pin</button>

files/templates/post_actions.html

@@ -59,8 +59,8 @@
 		{% endif %}
 
 		{% if v.admin_level >= PERMS['POST_COMMENT_DISTINGUISH'] %}
-			<button type="button" id="distinguish-{{p.id}}" class="dropdown-item {% if p.distinguish_level %}d-none{% endif %} list-inline-item text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish/{{p.id}}','distinguish-{{p.id}}','undistinguish-{{p.id}}','d-none')"><i class="fas fa-crown"></i>Distinguish</button>
+			<button type="button" id="distinguish-{{p.id}}" class="dropdown-item {% if p.distinguished %}d-none{% endif %} list-inline-item text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish/{{p.id}}','distinguish-{{p.id}}','undistinguish-{{p.id}}','d-none')"><i class="fas fa-crown"></i>Distinguish</button>
-			<button type="button" id="undistinguish-{{p.id}}" class="dropdown-item {% if not p.distinguish_level %}d-none{% endif %} list-inline-item text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish/{{p.id}}','distinguish-{{p.id}}','undistinguish-{{p.id}}','d-none')"><i class="fas fa-crown"></i>Undistinguish</button>
+			<button type="button" id="undistinguish-{{p.id}}" class="dropdown-item {% if not p.distinguished %}d-none{% endif %} list-inline-item text-info" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish/{{p.id}}','distinguish-{{p.id}}','undistinguish-{{p.id}}','d-none')"><i class="fas fa-crown"></i>Undistinguish</button>
 		{% endif %}
 
 		{% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}

files/templates/post_admin_actions_mobile.html

@@ -23,9 +23,9 @@
 					{% endif %}
 
 					{% if v.admin_level >= PERMS['POST_COMMENT_DISTINGUISH'] %}
-						<button type="button" id="distinguish2-{{p.id}}" class="{% if p.distinguish_level %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-primary" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish/{{p.id}}','distinguish2-{{p.id}}','undistinguish2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-crown text-center text-primary mr-2"></i>Distinguish</button>
+						<button type="button" id="distinguish2-{{p.id}}" class="{% if p.distinguished %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-primary" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish/{{p.id}}','distinguish2-{{p.id}}','undistinguish2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-crown text-center text-primary mr-2"></i>Distinguish</button>
 
-						<button type="button" id="undistinguish2-{{p.id}}" class="{% if not p.distinguish_level %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-primary" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish/{{p.id}}','distinguish2-{{p.id}}','undistinguish2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-crown text-center text-primary mr-2"></i>Undistinguish</button>
+						<button type="button" id="undistinguish2-{{p.id}}" class="{% if not p.distinguished %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-primary" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/distinguish/{{p.id}}','distinguish2-{{p.id}}','undistinguish2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-crown text-center text-primary mr-2"></i>Undistinguish</button>
 					{% endif %}
 
 					{% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}

files/templates/util/macros.html

@@ -51,7 +51,7 @@
 		<i id='hole-pinned-{{p.id}}' class="fas fa-thumbtack fa-rotate--45 pr-1 ml-1 mt-3 text-blue" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned to /h/{{p.hole}} by @{{p.hole_pinned}}"></i>
 	{% endif %}
 
-	{% if p.distinguish_level %}<i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{SITE_NAME}} Admin, speaking officially"></i>{% endif %}
+	{% if p.distinguished %}<i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{SITE_NAME}} Admin, speaking officially"></i>{% endif %}
 	{% if p.is_pinned and request.path != '/' %}
 		<i class="fas fa-thumbtack fa-rotate--45 pr-1 ml-1 mt-3 text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned to profile"></i>
 	{% endif %}
@@ -66,7 +66,7 @@
 	{% endif %}
 
 	{% if p.ghost %}
-		<span {% if p.distinguish_level %}class="mod {% if SITE_NAME == 'rDrama' %}mod-rdrama{% endif %}"{% endif %}>👻</span>
+		<span {% if p.distinguished %}class="mod {% if SITE_NAME == 'rDrama' %}mod-rdrama{% endif %}"{% endif %}>👻</span>
 	{% else %}
 		{% if FEATURES['PATRON_ICONS'] and p.author.patron > 1 %}
 			<img loading="lazy" src="{{SITE_FULL_IMAGES}}/i/{{SITE_NAME}}/badges/2{{p.author.patron}}.webp?b=11" class="patron-img" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.patron_tooltip}}" alt="{{p.author.patron_tooltip}}">
@@ -85,7 +85,7 @@
 					<img class="profile-pic-30-hat hat" loading="lazy" src="{{p.author.hat_active(v)[0]}}?x=7" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.hat_active(v)[1]}}" alt="@{{p.author.username}}'s hat">
 				{%- endif %}
 			</div>
-			<span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.name_color}}"{% elif p.distinguish_level %}class="mod {% if SITE_NAME == 'rDrama' %}mod-rdrama{% endif %}"{% endif %} {% if p.author.pride_username(v) %}pride_username{% endif %}>{{p.author_name}}</span>
+			<span {% if p.author.patron and not p.distinguished %}class="patron" style="background-color:#{{p.author.name_color}}"{% elif p.distinguished %}class="mod {% if SITE_NAME == 'rDrama' %}mod-rdrama{% endif %}"{% endif %} {% if p.author.pride_username(v) %}pride_username{% endif %}>{{p.author_name}}</span>
 		</a>
 		{% if FEATURES['PRONOUNS'] %}
 			<span class="pronouns" style="color:#{{p.author.flaircolor}} !important;border-color:#{{p.author.flaircolor}} !important">{{p.author.pronouns_display}}</span>

migrations/20240216-rename-distinguish-level-to-distinguished.sql

@@ -0,0 +1,9 @@
+alter table posts add column distinguished bool default false not null;
+update posts set distinguished=true where distinguish_level>0;
+alter table comments add column distinguished bool default false not null;
+update comments set distinguished=true where distinguish_level>0;
+
+alter table posts alter column distinguished drop default;
+alter table posts drop column distinguish_level;
+alter table comments alter column distinguished drop default;
+alter table comments drop column distinguish_level;