gdf

files/classes/comment.py

@@ -410,7 +410,7 @@ class Comment(Base):
 
 		if self.is_banned: return True
 
-		if path.startswith('/post') and (self.slots_result or self.blackjack_result) and (not self.body or len(self.body) <= 20) and self.level > 1: return True
+		if path.startswith('/post') and (self.slots_result or self.blackjack_result) and (not self.body or len(self.body) <= 50) and self.level > 1: return True
 			
 		if v and v.filter_words and self.body and any(x in self.body for x in v.filter_words): return True
 		

files/classes/mod_logs.py

@@ -113,18 +113,18 @@ class ModAction(Base):
 ACTIONTYPES={
 	"grant_awards": {
 		"str": "granted awards to {self.target_link}",
-		"icon": "fa-user",
+		"icon": "fa-gift",
 		"color": "bg-primary",
 	},
 	"check": {
 		"str": "gave {self.target_link} a checkmark",
-		"icon": "fa-user",
+		"icon": "fa-badge-check",
 		"color": "bg-success",
 	},
 	"uncheck": {
 		"str": "removed checkmark from {self.target_link}",
-		"icon": "fa-user-slash",
+		"icon": "fa-badge-check",
-		"color": "bg-danger",
+		"color": "bg-muted",
 	},
 	"ban_domain": {
 		"str": "banned a domain",
@@ -144,17 +144,12 @@ ACTIONTYPES={
 	"revoke_app": {
 		"str": "revoked an application by {self.target_link}",
 		"icon": "fa-robot",
-		"color": "bg-danger",
+		"color": "bg-muted",
 	},
 	"reject_app": {
 		"str": "rejected an application request by {self.target_link}",
 		"icon": "fa-robot",
-		"color": "bg-danger",
+		"color": "bg-muted",
-	},
-	"change_rules": {
-		"str": "changed the <a href='/rules'>rules</a>",
-		"icon": "fa-balance-scale",
-		"color": "bg-primary",
 	},
 	"change_sidebar": {
 		"str": "changed the sidebar",
@@ -163,18 +158,18 @@ ACTIONTYPES={
 	},
 	"disable_signups": {
 		"str": "disabled signups",
-		"icon": "fa-user-slash",
+		"icon": "fa-users",
 		"color": "bg-danger",
 	},
 	"enable_signups": {
 		"str": "enabled signups",
-		"icon": "fa-user",
+		"icon": "fa-users",
 		"color": "bg-success",
 	},
 	"disable_under_attack": {
 		"str": "disabled under attack mode",
 		"icon": "fa-shield",
-		"color": "bg-danger",
+		"color": "bg-muted",
 	},
 	"enable_under_attack": {
 		"str": "enabled under attack mode",
@@ -188,47 +183,47 @@ ACTIONTYPES={
 	},
 	"unban_user":{
 		"str":'unbanned user {self.target_link}',
-		"icon": "fa-user-slash",
+		"icon": "fa-user",
 		"color": "bg-success",
 	},
 	"nuke_user":{
 		"str":'removed all content of {self.target_link}',
-		"icon":"fa-user-slash",
+		"icon":"fa-radiation-alt",
 		"color": "bg-danger",
 	},
 	"unnuke_user":{
 		"str":'approved all content of {self.target_link}',
-		"icon": "fa-user-slash",
+		"icon": "fa-radiation-alt",
 		"color": "bg-success",
 	},
 	"shadowban": {
 		"str": 'shadowbanned {self.target_link}',
-		"icon": "fa-user-slash",
+		"icon": "fa-eye-slash",
 		"color": "bg-danger",
 	},
 	"unshadowban": {
 		"str": 'unshadowbanned {self.target_link}',
-		"icon": "fa-user-slash",
+		"icon": "fa-eye",
 		"color": "bg-success",
 	},
 	"agendaposter": {
 		"str": "set chud theme on {self.target_link}",
-		"icon": "fa-user-slash",
+		"icon": "fa-snooze",
 		"color": "bg-danger",
 	},
 	"unagendaposter": {
 		"str": "removed chud theme from {self.target_link}",
-		"icon": "fa-user-slash",
+		"icon": "fa-snooze",
 		"color": "bg-success",
 	},
 	"set_flair_locked":{
 		"str":"set {self.target_link}'s flair (locked)",
-		"icon": "fa-user-slash",
+		"icon": "fa-award",
 		"color": "bg-primary",
 	},
 	"set_flair_notlocked":{
 		"str":"set {self.target_link}'s flair (not locked)",
-		"icon": "fa-user-slash",
+		"icon": "fa-award",
 		"color": "bg-primary",
 	},
 	"pin_comment":{
@@ -239,7 +234,7 @@ ACTIONTYPES={
 	"unpin_comment":{
 		"str":'un-pinned a {self.target_link}',
 		"icon":"fa-thumbtack fa-rotate--45",
-		"color": "bg-danger",
+		"color": "bg-muted",
 	},
 	"pin_post":{
 		"str":'pinned post {self.target_link}',
@@ -249,7 +244,7 @@ ACTIONTYPES={
 	"unpin_post":{
 		"str":'un-pinned post {self.target_link}',
 		"icon":"fa-thumbtack fa-rotate--45",
-		"color": "bg-danger",
+		"color": "bg-muted",
 	},
 	"set_nsfw":{
 		"str":'set nsfw on post {self.target_link}',
@@ -281,6 +276,101 @@ ACTIONTYPES={
 		"icon":"fa-comment",
 		"color": "bg-success",
 	},
+	"delete_report":{
+		"str": 'deleted report on {self.target_link}',
+		"icon":"fa-flag",
+		"color": "bg-danger",
+	},
+	"make_admin": {
+		"str": 'made {self.target_link} admin',
+		"icon": "fa-user-crown",
+		"color": "bg-success",
+	},
+	"remove_admin": {
+		"str": 'removed {self.target_link} as admin',
+		"icon": "fa-user-crown",
+		"color": "bg-danger",
+	},
+	"make_meme_admin": {
+		"str": 'made {self.target_link} meme admin',
+		"icon": "fa-user-crown",
+		"color": "bg-success",
+	},
+	"remove_meme_admin": {
+		"str": 'removed {self.target_link} as meme admin',
+		"icon": "fa-user-crown",
+		"color": "bg-danger",
+	},
+	"distribute":{
+		"str": 'distributed bet winnings to voters on {self.target_link}',
+		"icon":"fa-dollar-sign",
+		"color": "bg-success",
+	},
+	"revert":{
+		"str": 'reverted {self.target_link} mod actions',
+		"icon":"fa-history",
+		"color": "bg-danger",
+	},
+	"club_allow":{
+		"str":'allowed user {self.target_link} into the {cc}',
+		"icon":"fa-golf-club",
+		"color": "bg-success",
+	},
+	"club_ban":{
+		"str":'disallowed user {self.target_link} from the {cc}',
+		"icon": "fa-golf-club",
+		"color": "bg-danger",
+	},
+	"monthly":{
+		"str": 'distributed monthly marseybux',
+		"icon":"fa-sack-dollar",
+		"color": "bg-success",
+	},
+	"purge_cache":{
+		"str": 'purged cache',
+		"icon":"fa-memory",
+		"color": "bg-muted",
+	},
+	"dump_cache":{
+		"str": 'dumped cache',
+		"icon":"fa-trash-alt",
+		"color": "bg-muted",
+	},
+	"badge_grant":{
+		"str":'granted badge to {self.target_link}',
+		"icon":"fa-badge",
+		"color": "bg-success",
+	},
+	"badge_remove":{
+		"str":'removed badge from {self.target_link}',
+		"icon": "fa-badge",
+		"color": "bg-danger",
+	},
+	"link_accounts":{
+		"str": 'linked {self.target_link}',
+		"icon":"fa-link",
+		"color": "bg-success",
+	},
+	"distinguish_comment":{
+		"str":'distinguished their {self.target_link}',
+		"icon": "fa-crown",
+		"color": "bg-success"
+	},
+	"distinguish_post":{
+		"str":'distinguished their post {self.target_link}',
+		"icon": "fa-crown",
+		"color": "bg-success"
+	},
+	"undistinguish_comment":{
+		"str":'un-distinguished their {self.target_link}',
+		"icon": "fa-crown",
+		"color": "bg-muted"
+		},
+	"undistinguish_post":{
+		"str":'un-distinguished their post {self.target_link}',
+		"icon": "fa-crown",
+		"color": "bg-muted"
+	},
 }
 
 ACTIONTYPES2 = deepcopy(ACTIONTYPES)

files/routes/posts.py

@@ -177,8 +177,8 @@ def post_id(pid, anything=None, v=None):
 		elif sort == "bottom":
 			comments = comments.order_by(Comment.upvotes - Comment.downvotes)
 
-		first = [c[0] for c in comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 20)).all()]
+		first = [c[0] for c in comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 50)).all()]
-		second = [c[0] for c in comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 20).all()]
+		second = [c[0] for c in comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 50).all()]
 		comments = first + second
 	else:
 		pinned = g.db.query(Comment).filter(Comment.parent_submission == post.id, Comment.is_pinned != None).all()
@@ -196,8 +196,8 @@ def post_id(pid, anything=None, v=None):
 		elif sort == "bottom":
 			comments = comments.order_by(Comment.upvotes - Comment.downvotes)
 
-		first = comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 20)).all()
+		first = comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 50)).all()
-		second = comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 20).all()
+		second = comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 50).all()
 		comments = first + second
 
 	offset = 0
@@ -303,8 +303,8 @@ def viewmore(v, pid, sort, offset):
 		elif sort == "bottom":
 			comments = comments.order_by(Comment.upvotes - Comment.downvotes)
 
-		first = [c[0] for c in comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 20)).all()]
+		first = [c[0] for c in comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 50)).all()]
-		second = [c[0] for c in comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 20).all()]
+		second = [c[0] for c in comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 50).all()]
 		comments = first + second
 	else:
 		comments = g.db.query(Comment).join(User, User.id == Comment.author_id).filter(User.shadowbanned == None, Comment.parent_submission == pid, Comment.author_id.notin_((AUTOPOLLER_ID, AUTOBETTER_ID)), Comment.level == 1, Comment.is_pinned == None, Comment.id.notin_(ids))
@@ -320,8 +320,8 @@ def viewmore(v, pid, sort, offset):
 		elif sort == "bottom":
 			comments = comments.order_by(Comment.upvotes - Comment.downvotes)
 		
-		first = comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 20)).all()
+		first = comments.filter(or_(and_(Comment.slots_result == None, Comment.blackjack_result == None), func.length(Comment.body) > 50)).all()
-		second = comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 20).all()
+		second = comments.filter(or_(Comment.slots_result != None, Comment.blackjack_result != None), func.length(Comment.body) <= 50).all()
 		comments = first + second
 		comments = comments[offset:]
 

files/routes/reporting.py

@@ -67,14 +67,14 @@ def remove_report(report_fn, v):
 	if report_fn.startswith('c'):
 		report = g.db.query(CommentFlag).filter_by(id=int(report_fn.lstrip('c'))).one_or_none()
 		ma=ModAction(
-			kind="delete_report_comment",
+			kind="delete_report",
 			user_id=v.id,
 			target_comment_id=report.comment_id
 		)
 	elif report_fn.startswith('p'):
 		report = g.db.query(Flag).filter_by(id=int(report_fn.lstrip('p'))).one_or_none()
 		ma=ModAction(
-			kind="delete_report_post",
+			kind="delete_report",
 			user_id=v.id,
 			target_submission_id=report.post_id
 		)

files/templates/authforms.html

@@ -15,7 +15,7 @@
 
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=106"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=107"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
 			{% if v.agendaposter %}
 				<style>
 					html {
@@ -39,7 +39,7 @@
 			{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=106"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=107"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
 		{% endif %}
 
 </head>

files/templates/default.html

@@ -7,7 +7,7 @@
 	<script src="/static/assets/js/bootstrap.js?a=240"></script>
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=106">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=107">
 		<link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
 		{% if v.agendaposter %}
 			<style>
@@ -32,7 +32,7 @@
 		{% endif %}
 	{% else %}
 		<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=106"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=107"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
 	{% endif %}
 
 	<meta charset="utf-8">

files/templates/log.html

@@ -6,7 +6,7 @@
 {% block content %}
 {% if v %}
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=106"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=107"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
 	{% if v.agendaposter %}
 		<style>
 			html {
@@ -30,7 +30,7 @@
 	{% endif %}
 {% else %}
 	<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=106"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=107"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
 {% endif %}
 
 <div class="row justify-content-around">

files/templates/login.html

@@ -18,7 +18,7 @@
 	{% endblock %}
 	
 	<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=106">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=107">
 	<link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
 
 </head>

files/templates/login_2fa.html

@@ -14,7 +14,7 @@
 		<title>2-Step Login - {{SITE_NAME}}</title>
 
 		<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=106"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=107"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
 
 </head>
 

files/templates/settings.html

@@ -34,7 +34,7 @@
 
 
 	<style>:root{--primary:#{{v.themecolor}}}</style>
-	<link rel="stylesheet" href="/static/assets/css/main.css?a=106"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
+	<link rel="stylesheet" href="/static/assets/css/main.css?a=107"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
 	{% if v.agendaposter %}
 		<style>
 			html {

files/templates/settings2.html

@@ -39,10 +39,10 @@
 	
 	{% if v %}
 		<style>:root{--primary:#{{v.themecolor}}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=106"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=107"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
 	{% else %}
 		<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=106"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=107"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
 	{% endif %}
 </head>
 

files/templates/sign_up.html

@@ -31,7 +31,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}Sign up - {{SITE_NAME}}{% endif %}</title>
 
 		<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=106"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=107"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
 
 </head>
 

files/templates/sign_up_failed_ref.html

@@ -32,7 +32,7 @@
 		<title>{% if ref_user %}{{ref_user.username}} invites you to {{SITE_NAME}}{% else %}{{SITE_NAME}}{% endif %}</title>
 
 		<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
-		<link rel="stylesheet" href="/static/assets/css/main.css?a=106"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
+		<link rel="stylesheet" href="/static/assets/css/main.css?a=107"><link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
 
 </head>
 

files/templates/submit.html

@@ -26,7 +26,7 @@
 		{% block stylesheets %}
 		{% if v %}
 			<style>:root{--primary:#{{v.themecolor}}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=106"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=107"><link rel="stylesheet" href="/static/assets/css/{{v.theme}}.css?a=15">
 			{% if v.agendaposter %}
 				<style>
 					html {
@@ -50,7 +50,7 @@
 			{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{config('DEFAULT_COLOR')}}</style>
-			<link rel="stylesheet" href="/static/assets/css/main.css?a=106">
+			<link rel="stylesheet" href="/static/assets/css/main.css?a=107">
 			<link rel="stylesheet" href="/static/assets/css/{{config('DEFAULT_THEME')}}.css?a=15">
 		{% endif %}
 		{% endblock %}