diff --git a/files/assets/images/emojis/carpmedal.webp b/files/assets/images/emojis/carpmedal.webp new file mode 100644 index 000000000..3e10734a0 Binary files /dev/null and b/files/assets/images/emojis/carpmedal.webp differ diff --git a/files/assets/images/emojis/carpwholesome.webp b/files/assets/images/emojis/carpwholesome.webp new file mode 100644 index 000000000..1b4c19c62 Binary files /dev/null and b/files/assets/images/emojis/carpwholesome.webp differ diff --git a/files/assets/images/emojis/marseyfallout.webp b/files/assets/images/emojis/marseyfallout.webp new file mode 100644 index 000000000..3e1185b20 Binary files /dev/null and b/files/assets/images/emojis/marseyfallout.webp differ diff --git a/files/assets/images/emojis/marseyflagcambodia.webp b/files/assets/images/emojis/marseyflagcambodia.webp new file mode 100644 index 000000000..e6faddeb9 Binary files /dev/null and b/files/assets/images/emojis/marseyflagcambodia.webp differ diff --git a/files/assets/images/emojis/marseyflagmalaysia.webp b/files/assets/images/emojis/marseyflagmalaysia.webp new file mode 100644 index 000000000..f7b00fda6 Binary files /dev/null and b/files/assets/images/emojis/marseyflagmalaysia.webp differ diff --git a/files/assets/images/emojis/marseyflagmyanmar.webp b/files/assets/images/emojis/marseyflagmyanmar.webp new file mode 100644 index 000000000..bfb52b6f6 Binary files /dev/null and b/files/assets/images/emojis/marseyflagmyanmar.webp differ diff --git a/files/assets/images/emojis/plsnope.webp b/files/assets/images/emojis/plsnope.webp new file mode 100644 index 000000000..d349ff847 Binary files /dev/null and b/files/assets/images/emojis/plsnope.webp differ diff --git a/files/assets/images/emojis/skadilick.webp b/files/assets/images/emojis/skadilick.webp new file mode 100644 index 000000000..3bfa73b36 Binary files /dev/null and b/files/assets/images/emojis/skadilick.webp differ diff --git a/files/assets/images/rDrama/sidebar/1193.webp b/files/assets/images/rDrama/sidebar/1193.webp new file mode 100644 index 000000000..6fa9e53ce Binary files /dev/null and b/files/assets/images/rDrama/sidebar/1193.webp differ diff --git a/files/assets/images/rDrama/sidebar/1194.webp b/files/assets/images/rDrama/sidebar/1194.webp new file mode 100644 index 000000000..0cc4a59cc Binary files /dev/null and b/files/assets/images/rDrama/sidebar/1194.webp differ diff --git a/schema.sql b/schema.sql index e62eba4bf..6b9afa4aa 100644 --- a/schema.sql +++ b/schema.sql @@ -1640,7 +1640,7 @@ ALTER TABLE ONLY public.users -- ALTER TABLE ONLY public.users - ADD CONSTRAINT users_pkey PRIMARY KEY (username); + ADD CONSTRAINT users_pkey PRIMARY KEY (id); -- @@ -1652,11 +1652,11 @@ ALTER TABLE ONLY public.users -- --- Name: users users_username_key; Type: CONSTRAINT; Schema: public; Owner: - +-- Name: users users_username_unique; Type: CONSTRAINT; Schema: public; Owner: - -- ALTER TABLE ONLY public.users - ADD CONSTRAINT users_username_key UNIQUE (username); + ADD CONSTRAINT users_username_unique UNIQUE (username); -- @@ -1682,13 +1682,6 @@ ALTER TABLE ONLY public.votes CREATE UNIQUE INDEX alts_unique_combination ON public.alts USING btree (GREATEST(user1, user2), LEAST(user1, user2)); --- --- Name: alts_user1_idx; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX alts_user1_idx ON public.alts USING btree (user1); - - -- -- Name: alts_user2_idx; Type: INDEX; Schema: public; Owner: - -- @@ -1710,13 +1703,6 @@ CREATE INDEX award_comment_idx ON public.award_relationships USING btree (commen CREATE INDEX award_post_idx ON public.award_relationships USING btree (post_id); --- --- Name: award_user_idx; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX award_user_idx ON public.award_relationships USING btree (user_id); - - -- -- Name: badges_badge_id_idx; Type: INDEX; Schema: public; Owner: - -- @@ -1759,13 +1745,6 @@ CREATE INDEX casino_games_user_id_winnings_idx ON public.casino_games USING btre CREATE INDEX casino_games_winnings_idx ON public.casino_games USING btree (winnings); --- --- Name: comment_is_banned_idx; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX comment_is_banned_idx ON public.comments USING btree (is_banned); - - -- -- Name: comment_new_sort_idx; Type: INDEX; Schema: public; Owner: - -- @@ -1836,13 +1815,6 @@ CREATE INDEX comments_deleted_utc_idx ON public.comments USING btree (deleted_ut CREATE INDEX comments_top_comment_id_idx ON public.comments USING btree (top_comment_id); --- --- Name: comments_user_index; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX comments_user_index ON public.comments USING btree (author_id); - - -- -- Name: commentvotes_commentid_userid_votetype_idx; Type: INDEX; Schema: public; Owner: - -- @@ -1871,13 +1843,6 @@ CREATE INDEX commentvotes_user_id_vote_type_idx ON public.commentvotes USING btr CREATE INDEX creport_user_idx ON public.commentreports USING btree (user_id); --- --- Name: cvote_user_index; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX cvote_user_index ON public.commentvotes USING btree (user_id); - - -- -- Name: emoji_kind; Type: INDEX; Schema: public; Owner: - -- @@ -1885,13 +1850,6 @@ CREATE INDEX cvote_user_index ON public.commentvotes USING btree (user_id); CREATE INDEX emoji_kind ON public.emojis USING btree (kind); --- --- Name: emojis_idx; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX emojis_idx ON public.emojis USING btree (name); - - -- -- Name: emojis_idx2; Type: INDEX; Schema: public; Owner: - -- @@ -2179,13 +2137,6 @@ CREATE INDEX post_created_utc_desc_idx ON public.posts USING btree (created_utc CREATE INDEX post_deleted_utc_idx ON public.posts USING btree (deleted_utc); --- --- Name: post_is_banned_idx; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX post_is_banned_idx ON public.posts USING btree (is_banned); - - -- -- Name: post_is_pinned_idx; Type: INDEX; Schema: public; Owner: - -- @@ -2228,13 +2179,6 @@ CREATE INDEX report_user_idx ON public.reports USING btree (user_id); CREATE INDEX subimssion_binary_group_idx ON public.posts USING btree (is_banned, deleted_utc, over_18); --- --- Name: subs_idx; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX subs_idx ON public.subs USING btree (name); - - -- -- Name: subscription_user_index; Type: INDEX; Schema: public; Owner: - -- @@ -2417,13 +2361,6 @@ CREATE INDEX users_spider_idx ON public.users USING btree (spider); CREATE INDEX users_subs_idx ON public.users USING btree (stored_subscriber_count); --- --- Name: users_unban_utc_idx; Type: INDEX; Schema: public; Owner: - --- - -CREATE INDEX users_unban_utc_idx ON public.users USING btree (unban_utc); - - -- -- Name: users_unbanutc_idx; Type: INDEX; Schema: public; Owner: - -- diff --git a/seed-db.sql b/seed-db.sql index 7dea8422d..324ffe4a0 100644 --- a/seed-db.sql +++ b/seed-db.sql @@ -1690,6 +1690,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('carpmad','Carp',2,'angry rage'), ('carpmagikarp','Carp',2,'pokemon'), ('carpmeatgrinder','Carp',2,'kill death dead seafood fish mince woodchipper'), +('carpmedal','Carp',2,'marsey blush award reward winner congratulations celebrate'), ('carpmerchant','Carp',2,'jewish money redbubble merch carpathianflorist money yid heeb sheeny sheenie greedy handrubbery rubbing hands kike israeli'), ('carpmerchant2','Carp',2,'jew fish greedy'), ('carpmermaid','Carp',2,'carp mermaid merman mercarp siren sexy legs temptress'), @@ -1749,6 +1750,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('carpwave','Carp',2,'waving fish moderator administrator jannie fish hi bye animated carpathianflorist'), ('carpwereback','Carp',2,'smug win victory win victory pendulum'), ('carpwhip','Carp',2,'kink punish bdsm naughty chad muscle sexy fish yellow'), +('carpwholesome','Carp',2,'tene seal'), ('carpwitch','Carp',2,'witch broomstick carpathianflorist fish admin moderator jannie magic'), ('carpwitch2','Carp',2,'carpathianflorist fish admin moderator jannie magic hairy transgender hat pentagram'), ('carpwitchtrans','Carp',2,'witch broomstick carpathianflorist fish admin moderator jannie magic hairy transgender'), @@ -3298,6 +3300,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseyface','Marsey',2,'mask psycho face horror halloween kill killer stab knife holiday evil murder scary murderer'), ('marseyfacepalm','Marsey',2,'reaction omfg judgment'), ('marseyfacepeel','Marsey',2,'watchpeopledie kitti gore face psycho horror flay'), +('marseyfallout','Marsey',2,'fallout vault pipboy thumbsup'), ('marseyfamily','Marsey',2,'family guy family man peter griffin griffin peter'), ('marseyfans','Marsey',2,'of thot taxpayer slut onlyfans whore'), ('marseyfart','Marsey',2,'brap gas flatulent flatulence farting braphog toot animated'), @@ -3362,6 +3365,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseyflagbrazil','Marsey Flags',2,'brazil south america numbero uno'), ('marseyflagbulgaria','Marsey Flags',2,'bulgeria eastern europe'), ('marseyflagcalifornia','Marsey Flags',2,'california'), +('marseyflagcambodia','Marsey Flags',2,'cambodian khmer'), ('marseyflagcanada','Marsey Flags',2,'canada rake canuck north america leaf'), ('marseyflagchile','Marsey Flags',2,'chile south america'), ('marseyflagchina','Marsey Flags',2,'china asia'), @@ -3390,9 +3394,11 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseyflagkazakhstan','Marsey Flags',2,'kazakhstan central asia cool flag'), ('marseyflagkenya','Marsey Flags',2,'kenya africa'), ('marseyflaglebanon','Marsey Flags',2,'lebanon hezbollah middle east muslim'), +('marseyflagmalaysia','Marsey Flags',2,'malaysian'), ('marseyflagmaryland','Marsey Flags',2,'maryland crab bad driver'), ('marseyflagmexico','Marsey Flags',2,'mexico north america taco ole'), ('marseyflagmorocco','Marsey Flags',2,'morocco africa'), +('marseyflagmyanmar','Marsey Flags',2,'myanmaran'), ('marseyflagnetherlands','Marsey Flags',2,'netherlands dyke europe'), ('marseyflagnewzealand','Marsey Flags',2,'new zealand oceania kiwi'), ('marseyflagniger','Marsey Flags',2,'niger africa BIPOC'), @@ -5575,6 +5581,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('platytrans','Platy',2,'platypus :marseytrain: train :marseytrain: rights flag valid'), ('platytuxedomask','Platy',2,'platypus sailor moon mamoru chiba roses cape'), ('platywave','Platy',2,'platypus hello hi bye waving'), +('plsnope','Misc',2,'attention attnwhore ordered'), ('plus','Marsey Alphabet',2,'+'), ('plus2','Marsey Alphabet',2,'+'), ('plzdie','Classic',2,'die emoticon disagree sign'), @@ -5717,6 +5724,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('signwelcome','Classic',2,'hi wave waving'), ('simeq','Marsey Alphabet',2,'≃ similar approx'), ('singaporeansoldierjak','Wojak',2,'singapore solider gas mask military'), +('skadilick','Misc',2,'tongue anime screen arknights'), ('skull','Classic',2,'skull animated bones skeleton pirate'), ('slap','Classic',2,'slap animated emoticon hit fight'), ('slapfight','Classic',2,'fight animated emoticon slap hit'), diff --git a/snappy_rDrama.txt b/snappy_rDrama.txt index f77b65b21..061305606 100644 --- a/snappy_rDrama.txt +++ b/snappy_rDrama.txt @@ -3910,3 +3910,12 @@ You will never be happy. You wrench out a fake smile every single morning and te Eventually it'll be too much to bear. You'll stop making these "jokes" make a new account, and continue to pursue an even unfunnier "gag". Your fellow dramanauts will find you, heartbroken but relieved that they no longer have to live with the incessant schizoposts. They'll let your account fade into irrelevancy, and every passerby for the rest of eternity will know there is an unfunny bandwagon hopper buried there. Your account will decay and go back to dust, and all that will remain of your legacy is a (last active 12 years ago) that is unmistakably cringe. This is your fate. This is what you chose. There is no turning back. + +{[para]} +If I could ban you I would. + +This screed is a bunch of nonsense, I assume. + +I didn’t read any of it, but the amount of words is unacceptable. +{[para]} +https://i.rdrama.net/images/1689540520487252.webp \ No newline at end of file