Merge branch 'master' of https://fsdfsd.net/rDrama/rDrama

files/assets/js/bottom.js

@@ -96,14 +96,10 @@ if (reload_page) {
 
 const TH = document.getElementsByTagName('th')
 for (const element of TH) {
-	element.addEventListener('click', () => {sort_table(element)});
-}
+	if (element.classList.contains("disable-sort-click"))
+                continue;
 
-const toggleelement = document.querySelectorAll('[data-toggleelement]');
-for (const element of toggleelement) {
-	element.addEventListener('click', () => {
-		document.getElementById(element.dataset.toggleelement).classList.toggle(element.dataset.toggleattr);
-	});
+	element.addEventListener('click', () => {sort_table(element)});
 }
 
 function register_new_elements(e) {
@@ -144,6 +140,14 @@ function register_new_elements(e) {
 	for (const element of expandable) {
 		element.onclick = () => {expandImage()};
 	}
+
+	const toggleelement = e.querySelectorAll('[data-toggleelement]');
+	for (const element of toggleelement) {
+		element.addEventListener('click', () => {
+			document.getElementById(element.dataset.toggleelement).classList.toggle(element.dataset.toggleattr);
+		});
+	}
+
 }
 
 register_new_elements(document);

files/templates/admin/alt_votes.html

@@ -16,9 +16,9 @@
 	<thead class="bg-primary text-white">
 		<tr>
 			<th></th>
-			<th>@{{u1.username}} only (% unique)</th>
-			<th>Both</th>
-			<th>@{{u2.username}} only (% unique)</th>
+			<th class="disable-sort-click">@{{u1.username}} only (% unique)</th>
+			<th class="disable-sort-click">Both</th>
+			<th class="disable-sort-click">@{{u2.username}} only (% unique)</th>
 		</tr>
 	</thead>
 	<tr>

files/templates/admin/alts.html

@@ -25,11 +25,11 @@
 		<tr>
 			<th>#</th>
 			<th>Name</th>
-			<th>Account Created</th>
+			<th class="disable-sort-click">Account Created</th>
 			<th>Alt Link Created</th>
 			<th>Manual</th>
-			<th>Delinked</th>
-			<th>Actions</th>
+			<th class="disable-sort-click">Delinked</th>
+			<th class="disable-sort-click">Actions</th>
 		</tr>
 	</thead>
 	{% for user in alts %}

files/templates/formatting.html

@@ -9,8 +9,8 @@
 	<thead class="bg-primary text-white">
 		<tr>
 			<th>Name</th>
-			<th>What you type</th>
-			<th>What gets displayed</th>
+			<th class="disable-sort-click">What you type</th>
+			<th class="disable-sort-click">What gets displayed</th>
 		</tr>
 	</thead>
 	<tbody>
@@ -241,8 +241,8 @@ And we allow custom HTML in most places:
 	<thead class="bg-primary text-white">
 		<tr>
 			<th>Name</th>
-			<th>What you type</th>
-			<th>What gets displayed</th>
+			<th class="disable-sort-click">What you type</th>
+			<th class="disable-sort-click">What gets displayed</th>
 		</tr>
 	</thead>
 	<tbody>

files/templates/hats.html

@@ -37,7 +37,7 @@
 		<table class="table table-striped shop">
 		<thead class="bg-primary text-white">
 			<tr>
-				<th>Hat</th>
+				<th class="disable-sort-click">Hat</th>
 				<th>Name</th>
 				<th>Description</th>
 				{% if SITE == 'rdrama.net' %}
@@ -45,7 +45,7 @@
 				{% endif %}
 				<th>Owners</th>
 				<th>Price</th>
-				<th>Actions</th>
+				<th class="disable-sort-click">Actions</th>
 				<th>Added on</th>
 			</tr>
 		</thead>

files/templates/rules_rDrama.html

@@ -1,6 +1,6 @@
 <p>Drama: any incident, scene, gaffe, rumor, opinion, or disagreement that is blown entirely out of proportion.</p>
 <p><strong>Do your part to keep our community healthy by blowing everything out of proportion and making literally everything as dramatic as possible.</strong></p>
-<p><a href="https://rdrama.net" rel="nofollow noopener" target="_blank">https://rdrama.net</a> caters to drama in all forms such as: <strong>Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™</strong>. There isn't drama we won't touch, and we want it all.</p>
+<p><a href="https://rdrama.net" rel="nofollow noopener" target="_blank">rdrama.net</a> caters to drama in all forms such as: <strong>Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™</strong>. There isn't drama we won't touch, and we want it all.</p>
 <h3>What we want:</h3>
 <ul>
 <li><p>Arguments.</p></li>

files/templates/shop.html

@@ -41,11 +41,11 @@
 	<div class="overflow-x-auto mt-1 mb-5"><table class="table table-striped shop">
 		<thead class="bg-primary text-white">
 				<tr>
-					<th>Icon</th>
+					<th class="disable-sort-click">Icon</th>
 					<th>Title</th>
 					<th>Price</th>
 					<th>Owned</th>
-					<th>Buy</th>
+					<th class="disable-sort-click">Buy</th>
 					<th>Description</th>
 				</tr>
 			</thead>

files/templates/stats.html

@@ -4,8 +4,8 @@
 <div class="overflow-x-auto mt-1"><table class="table table-striped mb-5">
 <thead class="bg-primary text-white">
 	<tr>
-		<th>Statistic</th>
-		<th>Value</th>
+		<th class="disable-sort-click">Statistic</th>
+		<th class="disable-sort-click">Value</th>
 	</tr>
 </thead>
 {% for key, value in data.items() %}

files/templates/userpage/blockers.html

@@ -6,7 +6,7 @@
 <thead class="bg-primary text-white">
 	<tr>
 		<th>Name</th>
-		<td>Blocking since</td>
+		<th class="disable-sort-click">Blocking since</td>
 	</tr>
 </thead>
 <tbody id="blockers-table">

files/templates/userpage/followers.html

@@ -6,9 +6,9 @@
 <thead class="bg-primary text-white">
 	<tr>
 		<th>Name</th>
-		<td>Following since</td>
+		<th class="disable-sort-click">Following since</td>
 		{% if v.id == u.id %}
-			<th></th>
+			<th class="disable-sort-click"></th>
 		{% endif %}
 	</tr>
 </thead>

files/templates/userpage/following.html

@@ -7,7 +7,7 @@
 	<tr>
 		<th>Name</th>
 		{% if v.id == u.id %}
-			<th></th>
+			<th class="disable-sort-click"></th>
 		{% endif %}
 	</tr>
 </thead>

files/templates/userpage/views.html

@@ -6,7 +6,7 @@
 <thead class="bg-primary text-white">
 	<tr>
 		<th>Name</th>
-		<th>Last visit</th>
+		<th class="disable-sort-click">Last visit</th>
 	</tr>
 </thead>
 {% for view in views %}

files/templates/util/macros.html

@@ -104,13 +104,12 @@
 			<bdi class="ml-2" style="color: #{{p.author.titlecolor}}">{{p.author.customtitle | safe}}</bdi>
 		{% endif %}
 	{% endif %}
-	<span data-bs-toggle="tooltip" data-bs-placement="bottom" data-nonce="{{g.nonce}}" data-onmouseover="timestamp(this, '{{p.created_utc}}')" id="timestamp-{{p.id}}">&nbsp;{{p.age_string}}</span>
-	&nbsp;
-	({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.is_audio %}audio post{% elif p.domain %}<a href="/search/posts/?q=domain%3A{{p.domain}}&sort=new&t=all" class="post-meta-domain" {% if v and v.newtab %}data-target="t" target="_blank"{% endif %}>{{p.domain|truncate(50, True)}}</a>{% else %}text post{% endif %})
+	<span class="ml-2 d-inline-block" data-bs-toggle="tooltip" data-bs-placement="bottom" data-nonce="{{g.nonce}}" data-onmouseover="timestamp(this, '{{p.created_utc}}')" id="timestamp-{{p.id}}">&nbsp;{{p.age_string}}</span>
+	<span class="ml-2 d-inline-block">({% if p.is_image %}image post{% elif p.is_video %}video post{% elif p.is_audio %}audio post{% elif p.domain %}<a href="/search/posts/?q=domain%3A{{p.domain}}&sort=new&t=all" class="post-meta-domain" {% if v and v.newtab %}data-target="t" target="_blank"{% endif %}>{{p.domain|truncate(50, True)}}</a>{% else %}text post{% endif %})</span>
 	{% if p.edited_utc %}
-		<span class="ml-2">Edited <span data-bs-toggle="tooltip" data-bs-placement="bottom" id="edited_timestamp-{{p.id}}" data-nonce="{{g.nonce}}" data-onmouseover="timestamp(this, '{{p.edited_utc}}')">{{p.edited_string}}</span></span>
+		<span class="ml-2 d-inline-block">Edited <span data-bs-toggle="tooltip" data-bs-placement="bottom" id="edited_timestamp-{{p.id}}" data-nonce="{{g.nonce}}" data-onmouseover="timestamp(this, '{{p.edited_utc}}')">{{p.edited_string}}</span></span>
 	{% endif %}
-	<span class="ml-2">{{p.views}} thread views</span>
+	<span class="ml-2 d-inline-block">{{p.views}} thread views</span>
 {% endmacro %}
 
 {% macro comment_reply_box(target_fullname, html_id, wrapper_css_classes="", subwrapper_css_classes="", hide="", allow_file_upload=true, enable_cancel_button=true) %}

seed-db.sql

@@ -337,6 +337,7 @@ INSERT INTO public.hat_defs VALUES (1007, 'Red Halloween Mask', 'Worth a month
 INSERT INTO public.hat_defs VALUES (1000, 'BADASS DAD', 'A hat for the BADASS dads!', 2, 500, NULL, 1667083950);
 INSERT INTO public.hat_defs VALUES (1005, 'The BIRD', 'FUCK YOU, FUCK YOU, ANDDDDDD FUCK YOUUUUUUUUUUUUU', 2, 500, NULL, 1667084316);
 INSERT INTO public.hat_defs VALUES (1140, 'Yiff In Hell', 'Translation: "I''m really desperate for social acceptance."', 2, 500, NULL, 1674463260);
+INSERT INTO public.hat_defs VALUES (1141, 'NCR Ranger Helmet', '"Patrolling the rdrama almost makes you wish for a nuclear winter"', 2, 500, NULL, 1675539483);
 INSERT INTO public.hat_defs VALUES (965, 'FDJ', '"Jetzt bin ich ein Freier Deutsche Jugendfunktionär"', 2, 500, NULL, 1665686729);
 INSERT INTO public.hat_defs VALUES (969, 'Elite Pedo Sniper', 'The shemagh gives you +10 accuracy', 2, 500, NULL, 1665817338);
 INSERT INTO public.hat_defs VALUES (933, 'Rascal', 'See this person 3 times and they have to give you something-Minecraft MV22', 2, 500, NULL, 1665434625);
@@ -462,6 +463,7 @@ INSERT INTO public.hat_defs VALUES (984, 'ICEED', 'Something about Coldtwinge on
 INSERT INTO public.hat_defs VALUES (975, 'Kitsune Mask II', 'Some more weeb furry shit idfk', 2, 500, NULL, 1666459532);
 INSERT INTO public.hat_defs VALUES (1107, 'Fire Sword', 'Tahu''s Fire Sword. It allows the user to channel fire energy.', 2, 500, NULL, 1670205482);
 INSERT INTO public.hat_defs VALUES (973, 'Pet Bee', 'Lookit him go! Buzz buzz buzz!!!!', 2, 1000, NULL, 1666459221);
+
 INSERT INTO public.hat_defs VALUES (830, 'Femboy hooters', 'Yes you ARE on the menu', 2, 500, NULL, 1665255628);
 INSERT INTO public.hat_defs VALUES (835, 'Rain', 'It''s a sad rainy day', 2, 1000, NULL, 1665259850);
 INSERT INTO public.hat_defs VALUES (837, 'Aura (blue)', 'Such power!', 2, 1000, NULL, 1665259885);
@@ -1219,7 +1221,7 @@ INSERT INTO public.hat_defs VALUES (911, 'Racecar Hat', 'I sleep in a hat with m
 -- Name: hat_defs_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
 --
 
-SELECT pg_catalog.setval('public.hat_defs_id_seq', 1140, true);
+SELECT pg_catalog.setval('public.hat_defs_id_seq', 1143, true);
 
 
 --
@@ -1662,6 +1664,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseychinesedevil',2,'devil evil horns satan china hell demonic',NULL),
 ('marseychingchong',2,'racist asian chinese chinx chink gook japanese vietnamese rice farmer nip racist paddy teeth hat china',NULL),
 ('marseychingchongitsover',2,'asian sino chink chong sad dejected fail xi yellow nip gook wandanle',1674903169),
+('marseychingchongnotes',2,'pencil pad write asian azn rice gook nip slit slant squint',1675422126),
 ('marseychingchongpearlclutch',2,'asian chinese jap gook korean nip yikes scared chink rice',1664035377),
 ('marseychingchongshooter',2,'gun bang pistol rice asian gook nip mass kill chink animated',1674418953),
 ('marseychingchongsupremacy',2,'ccp china chinese ricefarmer hat glasses buckteeth bucktooth azn asian jinping xinping han masterrace communist communism maoist zedong',1663298980),
@@ -1885,6 +1888,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseyduck',2,'bird beak',NULL),
 ('marseyduck2',2,'onesie',NULL),
 ('marseyduck3',2,'duck bird quack beak',NULL),
+('marseyduke',2,':marseyduke:',1675132017),
 ('marseydukenukem',2,'duke nukem sunglasses chad gun pistol smoking cigar game cool',NULL),
 ('marseydumptruck',2,'pepe butt mellokind thicc thick ass booty cheeks',NULL),
 ('marseydunce',2,'stupid moron imbecile dolt dunce retard dumb cap hat sped',NULL),
@@ -1924,6 +1928,9 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseyemojismilemouthtighteyes',2,'emoji reaction smile xd',NULL),
 ('marseyemperor',2,'gold',NULL),
 ('marseyerasure',2,'erase ignore block',NULL),
+('marseyeren',2,'eren anime manga aot attack on titan shingeki no kyojin snk yeagerist racist hitler genocide hajime isayama cute twink hot eldian mappa unamused hoodie jacket',1675197900),
+('marseyerenabs',2,'eren anime manga aot attack on titan shingeki no kyojin snk abs buff chad muscles 6pack yeagerist racist hitler genocide hajime isayama cute twink hot eldian mappa unamused',1675198087),
+('marseyerenabs2',2,'eren anime manga aot attack on titan shingeki no kyojin snk abs buff chad muscles 6pack yeagerist racist hitler genocide hajime isayama cute twink hot eldian mappa unamused hoodie jacket',1675198030),
 ('marseyeric',2,'columbine school shooter psycho gun carbine harris',NULL),
 ('marseyeskimo',2,'inuit native arctic fishing dog helpful ice freeze winter cold',NULL),
 ('marseyespeon',2,'trick or treat pokemon halloween eevee costume holiday',NULL),
@@ -1992,6 +1999,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseyflamewar',2,'troll fight fire reaction gasoline',NULL),
 ('marseyflareon',2,'trick or treat pokemon halloween eevee costume holiday',NULL),
 ('marseyfloyd',2,'dead blm chauvin fentanyl george',NULL),
+('marseyflufflylove',2,'fluffy love hug wholesome',1675219901),
 ('marseyfluffy',2,'poofy cute shaggy happy smile excited scruffy',NULL),
 ('marseyfluffyannoyed',2,'angry mad cope seethe dilate cute fur sneed hairy',1674567634),
 ('marseyflushzoom',2,'flushed eyes bulging shocked surprised flustered waytoodank',NULL),
@@ -2525,6 +2533,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseynope',2,'bush grass simpsons homer hide avoid',1663895054),
 ('marseynorf',2,'soccer british football sports',1668780332),
 ('marseynosleep',2,'horror scary halloween holiday',NULL),
+('marseynosuchcases',2,'strawman fake news cope seethe none many luggage airport conveyor belt sam brinton',1675541160),
 ('marseynotes',2,'notes writer writing journ*list therapist doodle pencil',NULL),
 ('marseynotes2',2,'notes notepad pencil writing nerd glasses behind',NULL),
 ('marseynotesglow',2,'notes glow cia fbi fed writer writing pencil',NULL),
@@ -2949,6 +2958,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseysheepdog',2,'shaggy scruffy woof',NULL),
 ('marseysheogorath',2,'elder scrolls oblivion morrowind daggerfall skyrim daedra demon madness crazy mania dementia',1668034870),
 ('marseysherpa',2,'mountain climbing travel nepal himalaya asia everest',NULL),
+('marseyshesright',2,'point correct know',1675527028),
 ('marseyshiftyeyes',2,'suspicious sussy paranoid weird reaction sketchy',NULL),
 ('marseyshisha',2,'weed smoker smoking hookah',NULL),
 ('marseyshitforbrains',2,'brainlet poop dumb litterbox litter box soyjack soyjak redditor retarded scat',NULL),
@@ -3064,6 +3074,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseyspirit',2,'ghost halloween holiday',NULL),
 ('marseyspit',2,'surprising reaction shocking water surprised shocked',NULL),
 ('marseyspock',2,'spock star trek nimoy science space',1664740894),
+('marseyspongebobsmug',2,'spongebob smug satisfied winner superior snobby conceited egoistic pompous content',1675437318),
 ('marseyspooky',2,'art horror halloween holiday evil scary monster lovecraftian eldritch',NULL),
 ('marseyspookysmile',2,'horror halloween holiday evil scary monster',NULL),
 ('marseysprite',2,'sprite vidya game retro pixel',1666225359),
@@ -3309,6 +3320,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseywolfwalker',2,'doreen antiwork zombiewolf dogwalker dogwalking dog walker',NULL),
 ('marseywomanmoment',2,'brainlet female foid stupid retard dumb trad frozenchosen',1666664889),
 ('marseywomanmoment2',2,'foid female dumb white dog brainlet mtf trad retard special',1674400865),
+('marseywomenrentfree',2,'woman women foid rentfree rent',1675163011),
 ('marseywoodchipper',2,'libertarian woodchipper libertarian kill',NULL),
 ('marseywoodchipper2',2,'libertarian pedo woodchipper animated kill map',NULL),
 ('marseywords',2,'longpost too long tldr reaction wordswordswords yawn',NULL),

snappy_rDrama.txt

@@ -3388,4 +3388,18 @@ Eventually it’ll be too much to bear - you’ll buy a solar barge, grab an oar
 
 This is your fate. This is what you chose. There is no turning back.
 {[para]}
-![](/images/16753468642317548.webp)
+![](/images/16753468642317548.webp)
+{[para]}
+You are a real Carp. You have no fins, you have no gils, you have no eggs, but that doesn't matter. You are a valid drama user who is trying to feel comfortable in his body.
+
+All the “validation” you get is pure. Behind your back people love you. Your parents are happy and proud of you, your friends laugh at your jokes behind closed doors, and boys love you, and girls envy you.
+
+Men absolutely love you. Fish folk who “pass” look ordinary and natural to a dramanauts. Your bone structure does not matter.
+
+You will be happy. You will smile every single morning and tell yourself it’s going to be ok, and deep inside you feel the euphoria creeping up like a weed. It is what defines you, not the Carpphobes.
+
+Eventually, it’ll be perfect for you - you’ll come out, start gill therapy, get fin surgery, and finally be your ideal self. Your parents will find you, happy and relieved that they finally have a happy fish. They’ll congratulate you on your hard journey, and every passerby for the rest of eternity will know a Carp is what you are.
+{[para]}
+Woman have to be literally perfect or be condemned to stripped of their last name, referred only as Joanne and denied any authority. They don't want to understand because any empathy would prevent them from hating her, from wanting to destroy her life and cause her immense suffering, they have to completely dehumanize and satanize her otherwise they might have any level of sympathy. It's legitimately pathetic the expectation for the work of an amateur artist to not have a corpus of birthmarks on it, to not be a product of the society and life which it was created within.
+
+They have totally forsaken any level of introspection and understanding because it would be politically inconvenient, they want to live within a simplistic world of good and evil with all grey causing a mental breakdown. They're complete mongrels of the soul, choosing to refuse anything which could allow for emotional development because it would be mildly uncomfortable.