Merge branch 'spooky-22' of https://github.com/Aevann1/rDrama into spooky-22

files/templates/expanded_image_modal.html

@@ -4,7 +4,7 @@
 			<div class="modal-body text-center p-0">
 				<div class="d-inline-block position-relative">
 					<a href="/" rel="nofollow noopener noreferrer" target="_blank" id="desktop-expanded-image-wrap-link">
-						<img loading="lazy" alt="expanded image" referrerpolicy="no-referrer" src="" class="img-fluid rounded" id="desktop-expanded-image" style="min-width: 250px;min-width: min(250px,50vw);max-height:90vh;border:5px white solid">
+						<img loading="lazy" alt="expanded image" referrerpolicy="no-referrer" src="" class="img-fluid rounded" id="desktop-expanded-image" style="min-width: 250px;min-width: min(250px,50vw);border:5px white solid">
 					</a>
 				</div>
 			</div>

seed-db.sql

@@ -1165,6 +1165,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseyantischizo',2,'rare meta schizocel scizocel skitzocel schizophrenic scitzocel',NULL),
 ('marseyantiwork',2,'lazy laze bum unemployed animated',NULL),
 ('marseyantiwork2',2,'lazy doreen unemployed slacker lazing laying welfare tired',NULL),
+('marseyanzu',2,'idolmaster anime animegirl neet',1667211793),
 ('marseyaoc',2,'latina latino hispanic cortez mexican puerto rican ocasio congress alexandria',NULL),
 ('marseyappicon',2,'iphone ios android application googleplay samsung',NULL),
 ('marseyappleseed',2,'american usa johnny history folk fruit food pot pan helmet legend',NULL),
@@ -2080,6 +2081,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseyloading',2,'animated loading spinner webdev rolling ball circle',NULL),
 ('marseyloadingneon',2,'animated loading spinner webdev rolling ball circle neon',NULL),
 ('marseyloaf',2,'marsey loaf bread lazy retard tard',1663803130),
+('marseylobotomy',2,'surgery retard braindead sad twitter',1667212108),
 ('marseylois',2,'familyguy familyman family guy family man peter griffin',NULL),
 ('marseylolcow',2,'reaction trolled lulz judgment',NULL),
 ('marseylong1',2,'top meme',NULL),
@@ -2130,6 +2132,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseymayo',2,'yt jakubian crying cracker reaction crackkka crakkka white sad tears',NULL),
 ('marseymayoface',2,'black blackface whiteface mayo mayocide mayonnaise racist racism',NULL),
 ('marseymayoparty',2,'bukakke bukkake mayonaise mayonnaise cum semen jizz spunk nut sperm messy sloppy lewd facial cumshot',NULL),
+('marseymayu',2,'idolmaster anime animegirl ribbon',1667211868),
 ('marseymeatwad',2,'cartoon athf aqua hamburger',NULL),
 ('marseymechanic',2,'wrench car diy fix repairman dipfuck',NULL),
 ('marseymeds',2,'mentally ill rightoid doctor psycho crazy mental illness reaction risperidone schizo nurse',NULL),
@@ -2148,6 +2151,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseymidsommarchristian',2,'sweden movie film cult a24 scandinavia man cinema bear death kill fire murder torture drug',1664220296),
 ('marseymidsommardani',2,'sweden movie film cult a24 scandinavia flowers dress happy tears joy woman cinema',1664220186),
 ('marseymike',2,'disney pixar monsters inc cyclops',NULL),
+('marseymiki',2,'idolmaster anime animegirl kiss blowkiss',1667211904),
 ('marseymiku',2,'hatsune miku pop star concert rave weeaboo music animated singing microphone',NULL),
 ('marseymilesdavis',2,'jazz saxophone bebop music trumpet brass black',NULL),
 ('marseymime',2,'mimesey facepaint black and white beret silent mute performer',NULL),
@@ -2193,6 +2197,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseymyspacetom',2,'carp friend carpathianflrost anderson',NULL),
 ('marseyn8',2,'nate redditor powermod powerjannie moderator',NULL),
 ('marseynails',2,'manicure emoji pedicure',NULL),
+('marseynana',2,'idolmaster anime animegirl ribbon',1667212013),
 ('marseynapoleon',2,'baguette soldier frenchman history',NULL),
 ('marseynapoleon2',2,'french france horse',NULL),
 ('marseyneat',2,'photo cringe compilation camera cringe collection pic',NULL),
@@ -2474,6 +2479,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseyrussiaglow',2,'animated russia red putin fsb kgb glow trump commie communist hat comrade',NULL),
 ('marseyrussian',2,'russian putin russia vodka adidas tracksuit vatnik ai alcohol beer drunk moscow',1664643821),
 ('marseyrustyventure',2,'dramamine venture bros brothers adult swim cartoon character glasses goattee goatee beard',NULL),
+('marseysachiko',2,'idolmaster anime animegirl niggy',1667212045),
 ('marseysad',2,'concerned worried waiting prepared reaction',NULL),
 ('marseysad2',2,'reaction disappointed disappointment upset',NULL),
 ('marseysadbox',2,'marsey sad sadge cry crying frown juicebox juice box ball',1666587468),

snappy_rDrama.txt

@@ -3144,4 +3144,12 @@ On top of that, you're going to have be very careful with what you do and how, b
 
 This is going to be interesting to put it mildly no matter how it goes. I mean you did fuck with a major court case that has eyes on it all over the country, and they've already getting cops involved and looks like the FBI is joining too.
 
-I'm just saying it won't be pleasant.
+I'm just saying it won't be pleasant.
+{[para]}
+Hi!
+
+This is libel, and harassment - a civil tort, and a violation of the rDrama Content Policies.
+
+The comment has been reported to rDrama administration. You have been banned from this site. I reserve the right to sue you to reclaim damages to my reputation, and to pursue criminal charges against you. rDrama is likely to suspend your account.
+
+Goodbye.