Merge branch 'master' into top/bug/profile-marsey-love

LICENSE (AGPL3.0+You must publish source code as a publicly-available git repository)

@@ -220,6 +220,8 @@ terms of section 4, provided that you also meet all of these conditions:
 	interfaces that do not display Appropriate Legal Notices, your
 	work need not make them do so.
 
+	e) The work must be published as a publicly-available git repository.
+
 	A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,

files/assets/css/awards.css

@@ -280,7 +280,7 @@
 }
 
 .zozbot, [pride_username], :not(td) > a[href="/h/countryclub"]:not(.hole-flair) {
-	color: red;
+	color: red !important;
 	animation: lgbt 3s linear infinite;
 }
 

files/assets/css/main.css

@@ -7686,17 +7686,14 @@ thead {
 }
 
 #imgnav-next, #imgnav-prev {
-	border: 4px solid transparent;
-	color: black !important;
-	font-size: 35px;
-	background-color: #939393 !important;
 	margin-left: -5px;
 	cursor: pointer;
 	text-decoration: none !important;
 }
 
 #imgnav-next:hover, #imgnav-prev:hover {
-	border: 4px solid var(--primary);
+	background-color: var(--primary) !important;
+	border-color: var(--primary) !important;
 }
 
 

files/assets/js/expanded_image_modal.js

@@ -18,11 +18,11 @@ function handle_navigation(delta) {
 	position += delta
 	if (position < last_img_index) {
 		imgnav_next.classList.remove('d-none')
-		imgnav_next.href = all_images[position+1].dataset.src
+		imgnav_next.dataset.href = all_images[position+1].dataset.src
 	}
 	if (position > 0) {
 		imgnav_prev.classList.remove('d-none')
-		imgnav_prev.href = all_images[position-1].dataset.src
+		imgnav_prev.dataset.href = all_images[position-1].dataset.src
 	}
 }
 
@@ -53,12 +53,12 @@ function expandImage(url) {
 
 
 imgnav_next.onclick = () => {
-	expandImage(imgnav_next.href)
+	expandImage(imgnav_next.dataset.href)
 	handle_navigation(1)
 }
 
 imgnav_prev.onclick = () => {
-	expandImage(imgnav_prev.href)
+	expandImage(imgnav_prev.dataset.href)
 	handle_navigation(-1)
 }
 

files/helpers/actions.py

@@ -311,7 +311,7 @@ def execute_zozbot(c, level, post, v):
 		level=level+1,
 		is_bot=True,
 		body="zoz",
-		body_html='<p class="zozbot">zoz</p>',
+		body_html='<p>zoz</p>',
 		top_comment_id=c.top_comment_id,
 		ghost=c.ghost,
 		distinguished=True
@@ -329,7 +329,7 @@ def execute_zozbot(c, level, post, v):
 		level=level+2,
 		is_bot=True,
 		body="zle",
-		body_html='<p class="zozbot">zle</p>',
+		body_html='<p>zle</p>',
 		top_comment_id=c.top_comment_id,
 		ghost=c.ghost,
 		distinguished=True
@@ -346,7 +346,7 @@ def execute_zozbot(c, level, post, v):
 		level=level+3,
 		is_bot=True,
 		body="zozzle",
-		body_html='<p class="zozbot">zozzle</p>',
+		body_html='<p>zozzle</p>',
 		top_comment_id=c.top_comment_id,
 		ghost=c.ghost,
 		distinguished=True

files/routes/jinja2.py

@@ -200,7 +200,8 @@ def inject_constants():
 			"CHUD_PHRASES":CHUD_PHRASES, "hasattr":hasattr, "calc_users":calc_users, "HOLE_INACTIVITY_DELETION":HOLE_INACTIVITY_DELETION, "LIGHT_THEMES":LIGHT_THEMES, "NSFW_EMOJIS":NSFW_EMOJIS, "HOLES":HOLES,
 			"MAX_IMAGE_AUDIO_SIZE_MB":MAX_IMAGE_AUDIO_SIZE_MB, "MAX_IMAGE_AUDIO_SIZE_MB_PATRON":MAX_IMAGE_AUDIO_SIZE_MB_PATRON,
 			"MAX_VIDEO_SIZE_MB":MAX_VIDEO_SIZE_MB, "MAX_VIDEO_SIZE_MB_PATRON":MAX_VIDEO_SIZE_MB_PATRON,
-			"CURSORMARSEY_DEFAULT":CURSORMARSEY_DEFAULT, "SNAPPY_ID":SNAPPY_ID, "get_running_orgy":get_running_orgy,
+			"CURSORMARSEY_DEFAULT":CURSORMARSEY_DEFAULT, "SNAPPY_ID":SNAPPY_ID, "ZOZBOT_ID":ZOZBOT_ID, "get_running_orgy":get_running_orgy,
 			"bar_position":bar_position, "datetime":datetime, "CSS_LENGTH_LIMIT":CSS_LENGTH_LIMIT, "cache":cache, "emoji_count":emoji_count, "HOLE_SIDEBAR_COLUMN_LENGTH":HOLE_SIDEBAR_COLUMN_LENGTH, "HOLE_SNAPPY_QUOTES_LENGTH":HOLE_SNAPPY_QUOTES_LENGTH,
 			"SIDEBAR_REQUEST_THREAD":SIDEBAR_REQUEST_THREAD, "BANNER_REQUEST_THREAD":BANNER_REQUEST_THREAD, "poster_of_the_day":poster_of_the_day,
+
 		}

files/templates/comments.html

@@ -278,7 +278,7 @@
 
 						{% set realbody = c.realbody(v) %}
 						{% set tilt = c.award_count('tilt', v) %}
-						<div id="comment-text-{{c.id}}" class="{{c.award_classes(v)}} comment-text mb-0" {% if tilt %}style="transform: rotate({{tilt}}deg); padding: {{tilt*4}}px min(10vw,{{tilt*10}}px)"{% endif %}>
+						<div id="comment-text-{{c.id}}" class="{{c.award_classes(v)}} comment-text mb-0 {% if c.author_id == ZOZBOT_ID %}zozbot{% endif %}" {% if tilt %}style="transform: rotate({{tilt}}deg); padding: {{tilt*4}}px min(10vw,{{tilt*10}}px)"{% endif %}>
 							{{realbody | safe}}
 						</div>
 

files/templates/modals/expanded_image.html

@@ -1,12 +1,18 @@
 <div class="modal" id="expandImageModal" tabindex="-1">
 	<div class="modal-dialog modal-dialog-centered">
-		<a id="imgnav-prev" class="fas fa-arrow-left px-5 py-3 px-md-4 py-md-5 d-none"></a>
+		<a id="imgnav-prev" class="btn btn-primary px-5 py-3 px-md-4 py-md-5 d-none">
+			<img b class="emoji mirrored" alt=":!marseyyes:" height="30" src="{{SITE_FULL_IMAGES}}/e/marseyyes.webp">
+		</a>
+
 		<div class="modal-body text-center p-0">
 			<a rel="noopener" target="_blank" id="expanded-image-wrap-link">
 				<img loading="lazy" alt="expanded image" class="rounded" id="expanded-image">
 			</a>
 		</div>
-		<a id="imgnav-next" class="fas fa-arrow-right px-5 py-3 px-md-4 py-md-5 d-none"></a>
+
+		<a id="imgnav-next" class="btn btn-primary px-5 py-3 px-md-4 py-md-5 d-none">
+			<img b class="emoji" alt=":marseyyes:" height="30" src="{{SITE_FULL_IMAGES}}/e/marseyyes.webp">
+		</a>
 	</div>
 </div>
 

files/templates/post_listing.html

@@ -255,6 +255,7 @@
 		{% include "modals/punish.html" %}
 	{% endif %}
 	{% include "modals/emoji.html" %}
+	{% include "modals/gif.html" %}
 {% endif %}
 
 <script defer src="{{'js/vendor/clipboard.js' | asset}}"></script>

schema.sql

@@ -183,9 +183,7 @@ CREATE TABLE public.users (
     hole_creation_notifs boolean NOT NULL,
     group_creation_notifs boolean NOT NULL,
     effortpost_notifs boolean NOT NULL,
-    shadowban_reason character varying(256),
+    shadowban_reason character varying(256)
-    hidevotedon boolean,
-    hide_cw boolean
 );
 
 
@@ -874,8 +872,7 @@ CREATE TABLE public.posts (
     queened boolean NOT NULL,
     sharpened boolean NOT NULL,
     effortpost boolean NOT NULL,
-    distinguished boolean NOT NULL,
+    distinguished boolean NOT NULL
-    cw boolean
 );