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

schema.sql

@@ -1704,13 +1704,6 @@ CREATE INDEX comments_created_utc_desc_idx ON public.comments USING btree (creat
 CREATE INDEX comments_user_index ON public.comments USING btree (author_id);
 
 
---
--- Name: commentvotes_commentid_userid_votetype_idx; Type: INDEX; Schema: public; Owner: -
---
-
-CREATE INDEX commentvotes_commentid_userid_votetype_idx ON public.commentvotes USING btree (comment_id, user_id, vote_type);
-
-
 --
 -- Name: commentvotes_comments_type_index; Type: INDEX; Schema: public; Owner: -
 --

seed-db.sql

@@ -1331,6 +1331,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseyauthleft',2,'marxist ussr marxism ccp communist khmer rouge leftoid communism juche',NULL),
 ('marseyauthright',2,'rightoid national socialism ss national socialist nazi wehrmacht hitler fascist',NULL),
 ('marseyautism',2,'retarded neurodivergent hat sped aspergers',NULL),
+('marseyautismcap',2,'retard sperg blue hat king dropped',1675771506),
 ('marseyautismchonker',2,'fat obese retarded hat autistic neurodivergent',NULL),
 ('marseyautistattentionseeker',2,'neurodivergent retard special brainlet annoying krayon sperg',1670864965),
 ('marseyautumn',2,'fall season leaf leaves pumpkin spice latte wind scarf animated',1663109340),
@@ -1362,6 +1363,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseybaited',2,'laser pointer trolled gullible reaction animated',NULL),
 ('marseybaitretard',2,'foid dumb trick drool idiot fool',1672768619),
 ('marseyballerina',2,'dress ballet tutu dancer dancing',NULL),
+('marseyballoon',2,'balloon air festive festival carnival',1675626986),
 ('marseyban',2,'jannie janitor banhammer moderator banned',NULL),
 ('marseybane',2,'soy mask batman capeshit',NULL),
 ('marseybang',2,'head wall bang schizo psycho selfharm deranged gif animated',NULL),
@@ -1659,6 +1661,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseychinchilla',2,'pet rodent capy cute hamster south american andes',NULL),
 ('marseychinchilla2',2,'pet rodent cute bipoc black fur animal friend',1664466896),
 ('marseychinchillalove',2,'pet rodent capy cute hamster south american andes',NULL),
+('marseychineseballoon',2,'chink chinx chinese balloon military spy air aircraft airship',1675627032),
 ('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),
@@ -1910,6 +1913,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseyelephantcumjar1',2,'semen jizz sperm bukkake cumjar elephant',NULL),
 ('marseyelephantcumjar2',2,'semen jizz sperm bukkake cumjar elephant',NULL),
 ('marseyelephantcumjar3',2,'semen jizz sperm bukkake cumjar elephant animated',NULL),
+('marseyelli',2,'marsey elli doki literature club poem sayori wpd suicide',1675792252),
 ('marseyelliotrodger',2,'er rogers azn asian saint incel hapa shooter killer little king gun shooting',NULL),
 ('marseyelliotrodger2',2,'saint er rodgers rogers shooter killer incel hapa little king azn asian supremegentleman supreme gentleman',NULL),
 ('marseyelliotrodger3',2,'saint er rodgers rogers shooter killer incel hapa little king azn asian supremegentleman supreme gentleman',NULL),
@@ -1996,6 +2000,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseyflamethrower',2,'vietname soldier fire',NULL),
 ('marseyflamewar',2,'troll fight fire reaction gasoline',NULL),
 ('marseyflareon',2,'trick or treat pokemon halloween eevee costume holiday',NULL),
+('marseyfloch',2,'floch forster anime manga gun shoot shhhh aot attack on titan racist nazi hitler smile shush quiet scout nationalist ginger snk shingeki no kyojin uniform scout yeagerist mischief troublemaker troll',1675742450),
 ('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),
@@ -2806,6 +2811,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseyretard3',2,'drooling stupid idiot sped moron imbecile dolt',NULL),
 ('marseyretard4',2,'moron dummy idiot buffoon drooling sped retarded',1670514701),
 ('marseyretardchad',2,'stupid moron idiot retard chad based monobrow chin stubble drool',NULL),
+('marseyretardpearlclutch',2,'special autist brainlet handicap ableist cry sob stupid',1675717446),
 ('marseyretro',2,'cardboard retro gameboy green nerd gamer',NULL),
 ('marseyrevolution',2,'marxist ussr marxism ccp hammer communist sickle communism proletariat juche kgb',NULL),
 ('marseyreze',2,'reze chainsaw man anime communist spy russian cute kiss heart manga tatsuki fujimoto devil hybrid bomb denji choker',1674906544),
@@ -3094,6 +3100,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseysteaming',2,'steaming exhale emoji unamused annoyed',NULL),
 ('marseysteer',2,'car drive nervous driving animated',NULL),
 ('marseystein',2,'undead frankenstein abomination halloween holiday monster',NULL),
+('marseystewie',2,'stewie family guy man griffin',1675723135),
 ('marseystims',2,'stim drug meth tweak geese_suck ted_simp pat crazy schizophrenia',NULL),
 ('marseysting',2,'drum badumtiss ba dum tiss bad dum tiss baddumtiss comedy humor punchline animated standup joke',NULL),
 ('marseystinky',2,'smelly homeless stank poor ew yuck',NULL),
@@ -3117,6 +3124,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES
 ('marseysupersorensoarin',2,'soren super hero superhero batman superman marsey41',1668289194),
 ('marseysurfing',2,'surfer surfing pikachu water wave meme',NULL),
 ('marseysurprised',2,'reaction shocked shook unexpected',NULL),
+('marseysurprisedpikachu',2,'surprise surprised pikachu shock shocked gasp',1675710005),
 ('marseysus',2,'amogus among us stonetoss sussy baka amongus',NULL),
 ('marseysuspicious',2,'sus stare look glance hmm thonk raise eyebrow curious',1663549267),
 ('marseysvengoolie',2,'horror halloween reviewer tophat suit chicken makeup mustache goatee comedy',1666302271),