sdffsd

files/classes/award.py

@@ -35,7 +35,7 @@ if site_name == "Drama":
 		"grass": {
 			"kind": "grass",
 			"title": "Grass",
-			"description": "Ban the author permenantly (must provide a timestamped picture of them touching grass to the admins to get unbanned)",
+			"description": "Ban the author permanently (must provide a timestamped picture of them touching grass to the admins to get unbanned)",
 			"icon": "fas fa-seedling",
 			"color": "text-success",
 			"price": 500

files/classes/badges.py

@@ -63,7 +63,7 @@ class Badge(Base):
 		if self.name == "Agendaposter":
 			ti = self.user.agendaposter_expires_utc
 			if ti: return self.badge.description + " until " + datetime.utcfromtimestamp(ti).strftime('%Y-%m-%d %H:%M:%S')
-			else: return self.badge.description + " permenantly" 
+			else: return self.badge.description + " permanently" 
 		elif self.description: return self.description
 		else: return self.badge.description
 

files/classes/user.py

@@ -52,7 +52,7 @@ if site_name == "Drama":
 		"grass": {
 			"kind": "grass",
 			"title": "Grass",
-			"description": "Ban the author permenantly (must provide a timestamped picture of them touching grass to the admins to get unbanned)",
+			"description": "Ban the author permanently (must provide a timestamped picture of them touching grass to the admins to get unbanned)",
 			"icon": "fas fa-seedling",
 			"color": "text-success",
 			"price": 500

files/routes/awards.py

@@ -39,7 +39,7 @@ def shop(v):
 			"grass": {
 				"kind": "grass",
 				"title": "Grass",
-				"description": "Ban the author permenantly (must provide a timestamped picture of them touching grass to the admins to get unbanned)",
+				"description": "Ban the author permanently (must provide a timestamped picture of them touching grass to the admins to get unbanned)",
 				"icon": "fas fa-seedling",
 				"color": "text-success",
 				"price": 500
@@ -124,7 +124,7 @@ def buy(v, award):
 			"grass": {
 				"kind": "grass",
 				"title": "Grass",
-				"description": "Ban the author permenantly (must provide a timestamped picture of them touching grass to the admins to get unbanned)",
+				"description": "Ban the author permanently (must provide a timestamped picture of them touching grass to the admins to get unbanned)",
 				"icon": "fas fa-seedling",
 				"color": "text-success",
 				"price": 500
@@ -197,7 +197,7 @@ def grass_trigger(post=None, comment=None):
 	link = f"[this post]({post.permalink})" if post else f"[this comment]({comment.permalink})"
 
 	author.ban(reason="grass award used")
-	send_notification(NOTIFICATIONS_ACCOUNT, author, f"Your account has been suspended permenantly for {link}. You must [provide the admins](/contact) a timestamped picture of you touching grass to get unbanned!")
+	send_notification(NOTIFICATIONS_ACCOUNT, author, f"Your account has been suspended permanently for {link}. You must [provide the admins](/contact) a timestamped picture of you touching grass to get unbanned!")
 
 ACTIONS = {
 	"ban": banaward_trigger,

files/templates/award_modal.html

@@ -64,7 +64,7 @@
 
 	@media (min-width: 767.98px) {
 		.award-columns {
-			column-count: 3 !important;
+			column-count: 4 !important;
 		}
 	}
 </style>

files/templates/comments.html

@@ -126,13 +126,13 @@
 		  <strong class="text-black">{{c.author.post_count}}</strong>
 		  <span class="text-black">posts</span>
 		</span>
-		<span class="ml-2">
+		<span class="ml-3">
 		  <strong class="text-black">{{c.author.comment_count}}</strong>
 		  <span class="text-black">comments</span>
 		</span>
-		<span class="ml-2">
+		<span class="ml-3">
 			<strong class="text-black">{{c.author.coins}}</strong>
-			<span class="text-black">dramacoins</span>
+			<span class="text-black">coins</span>
 		</span>  
 		&nbsp;&nbsp;&nbsp;&nbsp;
 		<a {% if v %}href="{{c.author.url}}"{% else %}href="/logged_out{{c.author.url}}"{% endif %} target="_blank" class="ml-auto text-decoration-none">

files/templates/submission.html

@@ -181,13 +181,13 @@
 		  <strong class="text-black">{{p.author.post_count}}</strong>
 		  <span class="text-black">posts</span>
 		</span>
-		<span class="ml-2">
+		<span class="ml-3">
 		  <strong class="text-black">{{p.author.comment_count}}</strong>
 		  <span class="text-black">comments</span>
 		</span>
-		<span class="ml-2">
+		<span class="ml-3">
 			<strong class="text-black">{{p.author.coins}}</strong>
-			<span class="text-black">dramacoins</span>
+			<span class="text-black">coins</span>
 		</span>  
 		&nbsp;&nbsp;&nbsp;&nbsp;
 		<a {% if v %}href="{{p.author.url}}"{% else %}href="/logged_out{{p.author.url}}"{% endif %} target="_blank" class="ml-auto text-decoration-none">

files/templates/submission_listing.html

@@ -41,6 +41,10 @@
 		<img class="avatar-72 rounded img-thumbnail shadow-sm" src="{{p.author.profile_url}}">
 		<div class="px-3 text-truncate">
 		  <h5 class="text-truncate text-black">{{p.author.username}}</h5>
+		  {% if p.author.id != 995 %}<a id="button-unsub2" class="smolbtn btn-secondary {% if not is_following %}d-none{% endif %}" href="javascript:void(0)" onclick="post_toast2('/unfollow/{{p.author.username}}','button-unsub2','button-sub2')">Unfollow</a>{% endif %}
+		  <a id="button-sub2" class="smolbtn btn-primary {% if is_following or p.author.is_nofollow or p.author.is_blocked %}d-none{% endif %}" href="javascript:void(0)" onclick="post_toast2('/follow/{{p.author.username}}','button-unsub2','button-sub2')">Follow</a>
+		  <button id="block-user-{{p.id}}" class="smolbtn btn-primary {% if p.is_blocking %}d-none{% endif %}" href="javascript:void(0)" onclick="alert('1')"><i class="fas fa-eye-slash"></i>Block</button>
+		  <a id="unblock-user-{{p.id}}" class="smolbtn btn-primary {% if not p.is_blocking %}d-none{% endif %}" href="javascript:void(0)" onclick="post_toast2('/settings/unblock?username={{p.author.username}}','block-user-{{p.id}}','unblock-user-{{p.id}}')"><i class="fas fa-eye"></i>Unblock</a>
 		</div>
 	  </div>
 	  <div class="px-3">
@@ -51,13 +55,13 @@
 		  <strong class="text-black">{{p.author.post_count}}</strong>
 		  <span class="text-black">posts</span>
 		</span>
-		<span class="ml-2">
+		<span class="ml-3">
 		  <strong class="text-black">{{p.author.comment_count}}</strong>
 		  <span class="text-black">comments</span>
 		</span>
-		<span class="ml-2">
+		<span class="ml-3">
 			<strong class="text-black">{{p.author.coins}}</strong>
-			<span class="text-black">dramacoins</span>
+			<span class="text-black">coins</span>
 		</span>  
 		&nbsp;&nbsp;&nbsp;&nbsp;
 	    <a {% if v %}href="{{p.author.url}}"{% else %}href="/logged_out{{p.author.url}}"{% endif %} target="_blank" class="ml-auto text-decoration-none">