diff --git a/files/assets/css/orgy.css b/files/assets/css/orgy.css index 8c40ea6fb..ab33aaa00 100644 --- a/files/assets/css/orgy.css +++ b/files/assets/css/orgy.css @@ -1,9 +1,27 @@ .orgy-top-container { display: flex; - flex-flow: row nowrap; justify-content: space-around; } +@media all and (max-width: 900px) { + .orgy-top-container { + flex-flow: column wrap; + } + .orgy-info-window-item { + max-height: 20% !important; + height: 20% !important; + } + .orgy-chat-window-item { + max-height: 80% !important; + height: 80% !important; + } +} +@media all and (min-width: 900px) { + .orgy-top-container { + flex-flow: row nowrap; + } +} + .orgy-chat-window-item { flex-grow: 2; width: fit-content; @@ -12,3 +30,8 @@ max-width: 550px; width: 550px; } +.rumble-player { + aspect-ratio: 16/9; + max-width: min(70vw,500px) !important; + width: 500px; +} diff --git a/files/assets/events/birthgay/sidebar/1.webp b/files/assets/events/birthgay/images/sidebar/1.webp similarity index 100% rename from files/assets/events/birthgay/sidebar/1.webp rename to files/assets/events/birthgay/images/sidebar/1.webp diff --git a/files/assets/images/badges/291.webp b/files/assets/images/badges/291.webp new file mode 100644 index 000000000..94018e60e Binary files /dev/null and b/files/assets/images/badges/291.webp differ diff --git a/files/assets/images/emojis/blunderbuss.webp b/files/assets/images/emojis/blunderbuss.webp new file mode 100644 index 000000000..ba54357f8 Binary files /dev/null and b/files/assets/images/emojis/blunderbuss.webp differ diff --git a/files/assets/images/emojis/boomhauertalking.webp b/files/assets/images/emojis/boomhauertalking.webp new file mode 100644 index 000000000..1a23ccdf2 Binary files /dev/null and b/files/assets/images/emojis/boomhauertalking.webp differ diff --git a/files/assets/images/emojis/braincube.webp b/files/assets/images/emojis/braincube.webp new file mode 100644 index 000000000..2e90f4959 Binary files /dev/null and b/files/assets/images/emojis/braincube.webp differ diff --git a/files/assets/images/emojis/brainelephant.webp b/files/assets/images/emojis/brainelephant.webp new file mode 100644 index 000000000..065f3c742 Binary files /dev/null and b/files/assets/images/emojis/brainelephant.webp differ diff --git a/files/assets/images/emojis/bruhmad.webp b/files/assets/images/emojis/bruhmad.webp new file mode 100644 index 000000000..b4925123d Binary files /dev/null and b/files/assets/images/emojis/bruhmad.webp differ diff --git a/files/assets/images/emojis/carpamericanflag.webp b/files/assets/images/emojis/carpamericanflag.webp new file mode 100644 index 000000000..7be656f2e Binary files /dev/null and b/files/assets/images/emojis/carpamericanflag.webp differ diff --git a/files/assets/images/emojis/carpangel.webp b/files/assets/images/emojis/carpangel.webp new file mode 100644 index 000000000..6ddc3a188 Binary files /dev/null and b/files/assets/images/emojis/carpangel.webp differ diff --git a/files/assets/images/emojis/carpbigbrained.webp b/files/assets/images/emojis/carpbigbrained.webp new file mode 100644 index 000000000..375693aed Binary files /dev/null and b/files/assets/images/emojis/carpbigbrained.webp differ diff --git a/files/assets/images/emojis/carpboomer.webp b/files/assets/images/emojis/carpboomer.webp new file mode 100644 index 000000000..6c94a612d Binary files /dev/null and b/files/assets/images/emojis/carpboomer.webp differ diff --git a/files/assets/images/emojis/carpbow.webp b/files/assets/images/emojis/carpbow.webp new file mode 100644 index 000000000..aa623f6f6 Binary files /dev/null and b/files/assets/images/emojis/carpbow.webp differ diff --git a/files/assets/images/emojis/carpbride.webp b/files/assets/images/emojis/carpbride.webp new file mode 100644 index 000000000..16e1065c9 Binary files /dev/null and b/files/assets/images/emojis/carpbride.webp differ diff --git a/files/assets/images/emojis/carpchadmin.webp b/files/assets/images/emojis/carpchadmin.webp new file mode 100644 index 000000000..5dd696878 Binary files /dev/null and b/files/assets/images/emojis/carpchadmin.webp differ diff --git a/files/assets/images/emojis/carpconfused.webp b/files/assets/images/emojis/carpconfused.webp new file mode 100644 index 000000000..b4e83ecd5 Binary files /dev/null and b/files/assets/images/emojis/carpconfused.webp differ diff --git a/files/assets/images/emojis/carpcope.webp b/files/assets/images/emojis/carpcope.webp new file mode 100644 index 000000000..c33620b60 Binary files /dev/null and b/files/assets/images/emojis/carpcope.webp differ diff --git a/files/assets/images/emojis/carpcowboy.webp b/files/assets/images/emojis/carpcowboy.webp new file mode 100644 index 000000000..a4b288ad2 Binary files /dev/null and b/files/assets/images/emojis/carpcowboy.webp differ diff --git a/files/assets/images/emojis/carpcry.webp b/files/assets/images/emojis/carpcry.webp new file mode 100644 index 000000000..691d31a67 Binary files /dev/null and b/files/assets/images/emojis/carpcry.webp differ diff --git a/files/assets/images/emojis/carpfacepalm.webp b/files/assets/images/emojis/carpfacepalm.webp new file mode 100644 index 000000000..c314c9336 Binary files /dev/null and b/files/assets/images/emojis/carpfacepalm.webp differ diff --git a/files/assets/images/emojis/carpglow.webp b/files/assets/images/emojis/carpglow.webp new file mode 100644 index 000000000..ea541fc36 Binary files /dev/null and b/files/assets/images/emojis/carpglow.webp differ diff --git a/files/assets/images/emojis/carphacker.webp b/files/assets/images/emojis/carphacker.webp new file mode 100644 index 000000000..7b6d82fe2 Binary files /dev/null and b/files/assets/images/emojis/carphacker.webp differ diff --git a/files/assets/images/emojis/carphmm.webp b/files/assets/images/emojis/carphmm.webp new file mode 100644 index 000000000..9ee6d6037 Binary files /dev/null and b/files/assets/images/emojis/carphmm.webp differ diff --git a/files/assets/images/emojis/carphmmm.webp b/files/assets/images/emojis/carphmmm.webp new file mode 100644 index 000000000..2766edea4 Binary files /dev/null and b/files/assets/images/emojis/carphmmm.webp differ diff --git a/files/assets/images/emojis/carphope.webp b/files/assets/images/emojis/carphope.webp new file mode 100644 index 000000000..1e78fae11 Binary files /dev/null and b/files/assets/images/emojis/carphope.webp differ diff --git a/files/assets/images/emojis/carplaugh.webp b/files/assets/images/emojis/carplaugh.webp new file mode 100644 index 000000000..40435868c Binary files /dev/null and b/files/assets/images/emojis/carplaugh.webp differ diff --git a/files/assets/images/emojis/carpmad.webp b/files/assets/images/emojis/carpmad.webp new file mode 100644 index 000000000..dbecfaa28 Binary files /dev/null and b/files/assets/images/emojis/carpmad.webp differ diff --git a/files/assets/images/emojis/carpraging.webp b/files/assets/images/emojis/carpraging.webp new file mode 100644 index 000000000..7c5ee0acc Binary files /dev/null and b/files/assets/images/emojis/carpraging.webp differ diff --git a/files/assets/images/emojis/carprain.webp b/files/assets/images/emojis/carprain.webp new file mode 100644 index 000000000..5876f7339 Binary files /dev/null and b/files/assets/images/emojis/carprain.webp differ diff --git a/files/assets/images/emojis/carpsalat.webp b/files/assets/images/emojis/carpsalat.webp new file mode 100644 index 000000000..e8ff7dbb5 Binary files /dev/null and b/files/assets/images/emojis/carpsalat.webp differ diff --git a/files/assets/images/emojis/carpsouthernbelle.webp b/files/assets/images/emojis/carpsouthernbelle.webp new file mode 100644 index 000000000..0f38b8322 Binary files /dev/null and b/files/assets/images/emojis/carpsouthernbelle.webp differ diff --git a/files/assets/images/emojis/carpsoyjak.webp b/files/assets/images/emojis/carpsoyjak.webp new file mode 100644 index 000000000..e81536853 Binary files /dev/null and b/files/assets/images/emojis/carpsoyjak.webp differ diff --git a/files/assets/images/emojis/carpsper.webp b/files/assets/images/emojis/carpsper.webp new file mode 100644 index 000000000..b5371d098 Binary files /dev/null and b/files/assets/images/emojis/carpsper.webp differ diff --git a/files/assets/images/emojis/carpsurejan.webp b/files/assets/images/emojis/carpsurejan.webp new file mode 100644 index 000000000..634b8a275 Binary files /dev/null and b/files/assets/images/emojis/carpsurejan.webp differ diff --git a/files/assets/images/emojis/carpsurftheweb.webp b/files/assets/images/emojis/carpsurftheweb.webp new file mode 100644 index 000000000..cf98bd320 Binary files /dev/null and b/files/assets/images/emojis/carpsurftheweb.webp differ diff --git a/files/assets/images/emojis/carptrad.webp b/files/assets/images/emojis/carptrad.webp new file mode 100644 index 000000000..b30896cea Binary files /dev/null and b/files/assets/images/emojis/carptrad.webp differ diff --git a/files/assets/images/emojis/carptroll.webp b/files/assets/images/emojis/carptroll.webp new file mode 100644 index 000000000..a44a66214 Binary files /dev/null and b/files/assets/images/emojis/carptroll.webp differ diff --git a/files/assets/images/emojis/commiebrainlet.webp b/files/assets/images/emojis/commiebrainlet.webp new file mode 100644 index 000000000..f224d3bc7 Binary files /dev/null and b/files/assets/images/emojis/commiebrainlet.webp differ diff --git a/files/assets/images/emojis/donkeykongd.webp b/files/assets/images/emojis/donkeykongd.webp new file mode 100644 index 000000000..84457284f Binary files /dev/null and b/files/assets/images/emojis/donkeykongd.webp differ diff --git a/files/assets/images/emojis/donkeykongshrug.webp b/files/assets/images/emojis/donkeykongshrug.webp new file mode 100644 index 000000000..ba422ba4c Binary files /dev/null and b/files/assets/images/emojis/donkeykongshrug.webp differ diff --git a/files/assets/images/emojis/donkeykongt.webp b/files/assets/images/emojis/donkeykongt.webp new file mode 100644 index 000000000..8687aba73 Binary files /dev/null and b/files/assets/images/emojis/donkeykongt.webp differ diff --git a/files/assets/images/emojis/dramatard.webp b/files/assets/images/emojis/dramatard.webp new file mode 100644 index 000000000..3aab77db6 Binary files /dev/null and b/files/assets/images/emojis/dramatard.webp differ diff --git a/files/assets/images/emojis/fish.webp b/files/assets/images/emojis/fish.webp new file mode 100644 index 000000000..950ae0a47 Binary files /dev/null and b/files/assets/images/emojis/fish.webp differ diff --git a/files/assets/images/emojis/flex.webp b/files/assets/images/emojis/flex.webp new file mode 100644 index 000000000..cc5ab24c8 Binary files /dev/null and b/files/assets/images/emojis/flex.webp differ diff --git a/files/assets/images/emojis/goblinitsover.webp b/files/assets/images/emojis/goblinitsover.webp new file mode 100644 index 000000000..c712d93bb Binary files /dev/null and b/files/assets/images/emojis/goblinitsover.webp differ diff --git a/files/assets/images/emojis/goblinwereback.webp b/files/assets/images/emojis/goblinwereback.webp new file mode 100644 index 000000000..06fa467c5 Binary files /dev/null and b/files/assets/images/emojis/goblinwereback.webp differ diff --git a/files/assets/images/emojis/goblinwerebackitsover.webp b/files/assets/images/emojis/goblinwerebackitsover.webp new file mode 100644 index 000000000..db671a122 Binary files /dev/null and b/files/assets/images/emojis/goblinwerebackitsover.webp differ diff --git a/files/assets/images/emojis/incel.webp b/files/assets/images/emojis/incel.webp new file mode 100644 index 000000000..076b66b54 Binary files /dev/null and b/files/assets/images/emojis/incel.webp differ diff --git a/files/assets/images/emojis/jokerchad.webp b/files/assets/images/emojis/jokerchad.webp new file mode 100644 index 000000000..1e92fc2c2 Binary files /dev/null and b/files/assets/images/emojis/jokerchad.webp differ diff --git a/files/assets/images/emojis/killerjak.webp b/files/assets/images/emojis/killerjak.webp new file mode 100644 index 000000000..224262bf7 Binary files /dev/null and b/files/assets/images/emojis/killerjak.webp differ diff --git a/files/assets/images/emojis/marseyaisha.webp b/files/assets/images/emojis/marseyaisha.webp new file mode 100644 index 000000000..0aaeaafea Binary files /dev/null and b/files/assets/images/emojis/marseyaisha.webp differ diff --git a/files/assets/images/emojis/marseybonsai.webp b/files/assets/images/emojis/marseybonsai.webp new file mode 100644 index 000000000..b2346f033 Binary files /dev/null and b/files/assets/images/emojis/marseybonsai.webp differ diff --git a/files/assets/images/emojis/marseybowing.webp b/files/assets/images/emojis/marseybowing.webp new file mode 100644 index 000000000..f070b7041 Binary files /dev/null and b/files/assets/images/emojis/marseybowing.webp differ diff --git a/files/assets/images/emojis/marseycdm.webp b/files/assets/images/emojis/marseycdm.webp new file mode 100644 index 000000000..1f80d403a Binary files /dev/null and b/files/assets/images/emojis/marseycdm.webp differ diff --git a/files/assets/images/emojis/marseyelbows.webp b/files/assets/images/emojis/marseyelbows.webp new file mode 100644 index 000000000..09f26d550 Binary files /dev/null and b/files/assets/images/emojis/marseyelbows.webp differ diff --git a/files/assets/images/emojis/marseyjacknoir.webp b/files/assets/images/emojis/marseyjacknoir.webp new file mode 100644 index 000000000..7a2ab43ba Binary files /dev/null and b/files/assets/images/emojis/marseyjacknoir.webp differ diff --git a/files/assets/images/emojis/marseyjar.webp b/files/assets/images/emojis/marseyjar.webp new file mode 100644 index 000000000..4898e6272 Binary files /dev/null and b/files/assets/images/emojis/marseyjar.webp differ diff --git a/files/assets/images/emojis/marseymisatocheeky.webp b/files/assets/images/emojis/marseymisatocheeky.webp new file mode 100644 index 000000000..adf596f8d Binary files /dev/null and b/files/assets/images/emojis/marseymisatocheeky.webp differ diff --git a/files/assets/images/emojis/marseymisatolewd.webp b/files/assets/images/emojis/marseymisatolewd.webp new file mode 100644 index 000000000..a6d2c3d00 Binary files /dev/null and b/files/assets/images/emojis/marseymisatolewd.webp differ diff --git a/files/assets/images/emojis/marseymisatolewd1.webp b/files/assets/images/emojis/marseymisatolewd1.webp new file mode 100644 index 000000000..e5ae74ffc Binary files /dev/null and b/files/assets/images/emojis/marseymisatolewd1.webp differ diff --git a/files/assets/images/emojis/marseymisatolewd2.webp b/files/assets/images/emojis/marseymisatolewd2.webp new file mode 100644 index 000000000..78f7eab42 Binary files /dev/null and b/files/assets/images/emojis/marseymisatolewd2.webp differ diff --git a/files/assets/images/emojis/marseymochi.webp b/files/assets/images/emojis/marseymochi.webp new file mode 100644 index 000000000..efccbaa38 Binary files /dev/null and b/files/assets/images/emojis/marseymochi.webp differ diff --git a/files/assets/images/emojis/marseyperegrinemendicant.webp b/files/assets/images/emojis/marseyperegrinemendicant.webp new file mode 100644 index 000000000..4805b3b95 Binary files /dev/null and b/files/assets/images/emojis/marseyperegrinemendicant.webp differ diff --git a/files/assets/images/emojis/marseyraccoonhappy.webp b/files/assets/images/emojis/marseyraccoonhappy.webp new file mode 100644 index 000000000..9ffd907d8 Binary files /dev/null and b/files/assets/images/emojis/marseyraccoonhappy.webp differ diff --git a/files/assets/images/emojis/marseyraccoonlove.webp b/files/assets/images/emojis/marseyraccoonlove.webp new file mode 100644 index 000000000..6e1391085 Binary files /dev/null and b/files/assets/images/emojis/marseyraccoonlove.webp differ diff --git a/files/assets/images/emojis/marseyraccoonregular.webp b/files/assets/images/emojis/marseyraccoonregular.webp new file mode 100644 index 000000000..a63e1ff78 Binary files /dev/null and b/files/assets/images/emojis/marseyraccoonregular.webp differ diff --git a/files/assets/images/emojis/marseyraccoonshock.webp b/files/assets/images/emojis/marseyraccoonshock.webp new file mode 100644 index 000000000..79cde6235 Binary files /dev/null and b/files/assets/images/emojis/marseyraccoonshock.webp differ diff --git a/files/assets/images/emojis/marseyraccoontrouble.webp b/files/assets/images/emojis/marseyraccoontrouble.webp new file mode 100644 index 000000000..885cfbc62 Binary files /dev/null and b/files/assets/images/emojis/marseyraccoontrouble.webp differ diff --git a/files/assets/images/emojis/marseysal3.webp b/files/assets/images/emojis/marseysal3.webp new file mode 100644 index 000000000..c7e5e5ee9 Binary files /dev/null and b/files/assets/images/emojis/marseysal3.webp differ diff --git a/files/assets/images/emojis/marseysalmaid.webp b/files/assets/images/emojis/marseysalmaid.webp new file mode 100644 index 000000000..360396271 Binary files /dev/null and b/files/assets/images/emojis/marseysalmaid.webp differ diff --git a/files/assets/images/emojis/marseyshoe.webp b/files/assets/images/emojis/marseyshoe.webp new file mode 100644 index 000000000..ea0f058d2 Binary files /dev/null and b/files/assets/images/emojis/marseyshoe.webp differ diff --git a/files/assets/images/emojis/marseystar.webp b/files/assets/images/emojis/marseystar.webp new file mode 100644 index 000000000..53ab4798f Binary files /dev/null and b/files/assets/images/emojis/marseystar.webp differ diff --git a/files/assets/images/emojis/marseysurftheweb.webp b/files/assets/images/emojis/marseysurftheweb.webp new file mode 100644 index 000000000..b238073b4 Binary files /dev/null and b/files/assets/images/emojis/marseysurftheweb.webp differ diff --git a/files/assets/images/emojis/marseywillnever.webp b/files/assets/images/emojis/marseywillnever.webp new file mode 100644 index 000000000..fa07fb690 Binary files /dev/null and b/files/assets/images/emojis/marseywillnever.webp differ diff --git a/files/assets/images/emojis/meatcube.webp b/files/assets/images/emojis/meatcube.webp new file mode 100644 index 000000000..5701b5bad Binary files /dev/null and b/files/assets/images/emojis/meatcube.webp differ diff --git a/files/assets/images/emojis/nazimod.webp b/files/assets/images/emojis/nazimod.webp new file mode 100644 index 000000000..f843c7ea4 Binary files /dev/null and b/files/assets/images/emojis/nazimod.webp differ diff --git a/files/assets/images/emojis/owo.webp b/files/assets/images/emojis/owo.webp new file mode 100644 index 000000000..4e47a30ab Binary files /dev/null and b/files/assets/images/emojis/owo.webp differ diff --git a/files/assets/images/emojis/plank.webp b/files/assets/images/emojis/plank.webp new file mode 100644 index 000000000..2ab275d88 Binary files /dev/null and b/files/assets/images/emojis/plank.webp differ diff --git a/files/assets/images/emojis/praisethesun.webp b/files/assets/images/emojis/praisethesun.webp new file mode 100644 index 000000000..b9c109076 Binary files /dev/null and b/files/assets/images/emojis/praisethesun.webp differ diff --git a/files/assets/images/emojis/ragedeathjak.webp b/files/assets/images/emojis/ragedeathjak.webp new file mode 100644 index 000000000..6940aed87 Binary files /dev/null and b/files/assets/images/emojis/ragedeathjak.webp differ diff --git a/files/assets/images/emojis/shyduck.webp b/files/assets/images/emojis/shyduck.webp new file mode 100644 index 000000000..5471bc68f Binary files /dev/null and b/files/assets/images/emojis/shyduck.webp differ diff --git a/files/assets/images/emojis/sob.webp b/files/assets/images/emojis/sob.webp new file mode 100644 index 000000000..2b95014a3 Binary files /dev/null and b/files/assets/images/emojis/sob.webp differ diff --git a/files/assets/images/emojis/tank.webp b/files/assets/images/emojis/tank.webp new file mode 100644 index 000000000..c9ee299e0 Binary files /dev/null and b/files/assets/images/emojis/tank.webp differ diff --git a/files/assets/images/emojis/transheart.webp b/files/assets/images/emojis/transheart.webp new file mode 100644 index 000000000..265904b5a Binary files /dev/null and b/files/assets/images/emojis/transheart.webp differ diff --git a/files/assets/images/emojis/uwu.webp b/files/assets/images/emojis/uwu.webp new file mode 100644 index 000000000..ecd50b906 Binary files /dev/null and b/files/assets/images/emojis/uwu.webp differ diff --git a/files/assets/images/rDrama/sidebar/1182.webp b/files/assets/images/rDrama/sidebar/1182.webp new file mode 100644 index 000000000..38ff7e10e Binary files /dev/null and b/files/assets/images/rDrama/sidebar/1182.webp differ diff --git a/files/assets/images/rDrama/sidebar/1183.webp b/files/assets/images/rDrama/sidebar/1183.webp new file mode 100644 index 000000000..569beacf7 Binary files /dev/null and b/files/assets/images/rDrama/sidebar/1183.webp differ diff --git a/files/assets/images/rDrama/sidebar/1184.webp b/files/assets/images/rDrama/sidebar/1184.webp new file mode 100644 index 000000000..951fff4cf Binary files /dev/null and b/files/assets/images/rDrama/sidebar/1184.webp differ diff --git a/files/assets/images/rDrama/sidebar/1185.webp b/files/assets/images/rDrama/sidebar/1185.webp new file mode 100644 index 000000000..b41a60ec9 Binary files /dev/null and b/files/assets/images/rDrama/sidebar/1185.webp differ diff --git a/files/assets/images/rDrama/sidebar/1186.webp b/files/assets/images/rDrama/sidebar/1186.webp new file mode 100644 index 000000000..e6924befe Binary files /dev/null and b/files/assets/images/rDrama/sidebar/1186.webp differ diff --git a/files/assets/images/rDrama/sidebar/1187.webp b/files/assets/images/rDrama/sidebar/1187.webp new file mode 100644 index 000000000..04f89f155 Binary files /dev/null and b/files/assets/images/rDrama/sidebar/1187.webp differ diff --git a/files/assets/images/rDrama/sidebar/1188.webp b/files/assets/images/rDrama/sidebar/1188.webp new file mode 100644 index 000000000..644aa108c Binary files /dev/null and b/files/assets/images/rDrama/sidebar/1188.webp differ diff --git a/files/classes/orgy.py b/files/classes/orgy.py index 7b9d50990..7a7674142 100644 --- a/files/classes/orgy.py +++ b/files/classes/orgy.py @@ -15,29 +15,52 @@ from files.helpers.config.const import * from files.helpers.lazy import lazy from files.helpers.regex import * from files.helpers.sorting_and_time import * +from files.helpers.sanitize import normalize_url, get_youtube_id_and_t class Orgy(Base): __tablename__ = "orgies" - youtube_id = Column(String, primary_key=True) + id = Column(Integer, primary_key = True) + type = Column(Integer, primary_key = True) + data = Column(String) title = Column(String) def __init__(self, **kwargs): super().__init__(**kwargs) + def is_youtube(self): + return self.type == OrgyTypes.YOUTUBE + def is_rumble(self): + return self.type == OrgyTypes.RUMBLE + def is_twitch(self): + return self.type == OrgyTypes.TWITCH def __repr__(self): - return f"<{self.__class__.__name__}(id={self.youtube_id}, title={self.title})>" + return f"<{self.__class__.__name__}(id={self.id}, type={self.type}, data={self.data} title={self.title})>" def get_orgy(): orgy = g.db.query(Orgy).one_or_none() return orgy -def create_orgy(youtube_id, title): +def create_orgy(link, title): assert not get_orgy() - assert re.match(yt_id_regex, youtube_id) - orgy = Orgy(title=title, youtube_id=youtube_id) + normalized_link = normalize_url(link) + data = None + orgy_type = -1 + if re.match(bare_youtube_regex, normalized_link): + orgy_type = OrgyTypes.YOUTUBE + data, _ = get_youtube_id_and_t(normalized_link) + elif re.match(rumble_regex, normalized_link): + orgy_type = OrgyTypes.RUMBLE + data = normalized_link + elif re.match(twitch_regex, normalized_link): + orgy_type = OrgyTypes.TWITCH + data = re.search(twitch_regex, normalized_link).group(3) + else: + assert False + + orgy = Orgy(title=title, id=0, type = orgy_type, data = data) g.db.add(orgy) g.db.flush() g.db.commit() diff --git a/files/classes/user.py b/files/classes/user.py index d059c2263..a1d365da8 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -209,8 +209,6 @@ class User(Base): else: self.marseybux += amount - g.db.flush() - def charge_account(self, currency, amount, **kwargs): in_db = g.db.query(User).filter(User.id == self.id).with_for_update().one() diff --git a/files/helpers/actions.py b/files/helpers/actions.py index 0f6399162..58c6a7888 100644 --- a/files/helpers/actions.py +++ b/files/helpers/actions.py @@ -480,8 +480,9 @@ def execute_dylan(v:User): def execute_under_siege(v:User, target:Optional[Union[Post, Comment]], body, kind:str) -> bool: if v.shadowbanned: return - if SITE == 'watchpeopledie.tv' or True: + if SITE == 'watchpeopledie.tv': execute_dylan(v) + if v.shadowbanned: return if not get_setting("under_siege"): return if v.admin_level >= PERMS['SITE_BYPASS_UNDER_SIEGE_MODE']: return diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py index 22ab0fb60..f238d8c2b 100644 --- a/files/helpers/config/const.py +++ b/files/helpers/config/const.py @@ -325,6 +325,7 @@ if SITE_NAME == 'rDrama': 'retalk.com', 'talk.lol', 'lemmy.ml', + 'lemmy.world', 'lemmygrad.ml', 'exploding-heads.com', 'raddle.me', @@ -420,7 +421,7 @@ PROFANITIES = { '(?[^<]*)(https:\/\/youtube\.com\/watch\?[\w\-.#&/=?@%+]{7,})', flags=re.I|re.A) yt_id_regex = re.compile('[\w\-]{5,20}', flags=re.A) +rumble_regex = re.compile('https://rumble\.com/embed/([a-zA-Z0-9]*)/\?pub=([a-zA-Z0-9]*)',flags=re.I|re.A) +bare_youtube_regex = re.compile('https:\/\/youtube\.com\/watch\?([\w\-.#&/=?@%+]{7,})',flags=re.I|re.A) +twitch_regex = re.compile('(https:\/\/)?(www\.)?twitch.tv/(.*)',flags=re.I|re.A) + link_fix_regex = re.compile("(\[.*?\]\()(?!http|\/)(.*?\))" + NOT_IN_CODE_OR_LINKS, flags=re.A) css_url_regex = re.compile('url\(\s*[\'"]?(.*?)[\'"]?\s*\)', flags=re.I|re.A) diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index d617bdb1b..9ebb8316a 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -44,7 +44,7 @@ TLDS = ( # Original gTLDs and ccTLDs 'app','cleaning','club','dev','farm','florist','fun','gay','lgbt','life','lol', 'moe','mom','monster','new','news','online','pics','press','pub','site','blog', 'vip','win','world','wtf','xyz','video','host','art','media','wiki','tech', - 'cooking','network','party','goog','markets','today', + 'cooking','network','party','goog','markets','today','beauty','camp' ) allowed_tags = ('b','blockquote','br','code','del','em','h1','h2','h3','h4','h5','h6','hr','i', @@ -300,14 +300,12 @@ def sanitize_settings_text(sanitized:Optional[str], max_length:Optional[int]=Non if max_length: sanitized = sanitized[:max_length] return sanitized - -def handle_youtube_links(url): - html = None +def get_youtube_id_and_t(url): params = parse_qs(urlparse(url).query, keep_blank_values=True) id = params.get('v') - if not id: return None + if not id: return (None, None) id = id[0] @@ -318,7 +316,14 @@ def handle_youtube_links(url): t = split[1] id = id.split('?')[0] + + return (id, t) +def handle_youtube_links(url): + params = parse_qs(urlparse(url).query, keep_blank_values=True) + html = None + id, t = get_youtube_id_and_t(url) + if not id: return None if yt_id_regex.fullmatch(id): if not t: t = params.get('t', params.get('start', [0]))[0] diff --git a/files/helpers/stats.py b/files/helpers/stats.py index 09158e21d..d9168fee2 100644 --- a/files/helpers/stats.py +++ b/files/helpers/stats.py @@ -2,7 +2,7 @@ from flask import g import time import calendar import matplotlib.pyplot as plt -from sqlalchemy import * +from sqlalchemy.sql import func from files.classes.user import User from files.classes.post import Post diff --git a/files/routes/admin.py b/files/routes/admin.py index 8d37e8967..8b8ccd156 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -792,24 +792,24 @@ def admin_removed_comments(v): ) -@app.post("/unchud_user/") +@app.post("/unchud_user/") @limiter.limit('1/second', scope=rpath) @limiter.limit('1/second', scope=rpath, key_func=get_ID) @limiter.limit(DEFAULT_RATELIMIT) @limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID) @admin_level_required(PERMS['USER_CHUD']) -def unchud(id, v): +def unchud(fullname, v): - if id.startswith('p_'): - post_id = id.split('p_')[1] + if fullname.startswith('p_'): + post_id = fullname.split('p_')[1] post = g.db.get(Post, post_id) user = post.author - elif id.startswith('c_'): - comment_id = id.split('c_')[1] + elif fullname.startswith('c_'): + comment_id = fullname.split('c_')[1] comment = g.db.get(Comment, comment_id) user = comment.author else: - user = get_account(id) + user = get_account(fullname) if not user.chudded_by: abort(403, "Jannies can't undo chud awards anymore!") @@ -949,24 +949,24 @@ def admin_title_change(user_id, v): return {"message": f"@{user.username}'s flair has been changed!"} -@app.post("/ban_user/") +@app.post("/ban_user/") @limiter.limit('1/second', scope=rpath) @limiter.limit('1/second', scope=rpath, key_func=get_ID) @limiter.limit(DEFAULT_RATELIMIT) @limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID) @admin_level_required(PERMS['USER_BAN']) -def ban_user(id, v): +def ban_user(fullname, v): - if id.startswith('p_'): - post_id = id.split('p_')[1] + if fullname.startswith('p_'): + post_id = fullname.split('p_')[1] post = g.db.get(Post, post_id) user = post.author - elif id.startswith('c_'): - comment_id = id.split('c_')[1] + elif fullname.startswith('c_'): + comment_id = fullname.split('c_')[1] comment = g.db.get(Comment, comment_id) user = comment.author else: - user = get_account(id) + user = get_account(fullname) if user.admin_level > v.admin_level: abort(403) @@ -1044,26 +1044,26 @@ def ban_user(id, v): return {"message": f"@{user.username} has been banned {duration}!"} -@app.post("/chud_user/") +@app.post("/chud_user/") @limiter.limit('1/second', scope=rpath) @limiter.limit('1/second', scope=rpath, key_func=get_ID) @limiter.limit(DEFAULT_RATELIMIT) @limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID) @admin_level_required(PERMS['USER_CHUD']) -def chud(id, v): +def chud(fullname, v): - if id.startswith('p_'): - post_id = id.split('p_')[1] + if fullname.startswith('p_'): + post_id = fullname.split('p_')[1] post = g.db.get(Post, post_id) user = post.author - elif id.startswith('c_'): - comment_id = id.split('c_')[1] + elif fullname.startswith('c_'): + comment_id = fullname.split('c_')[1] comment = g.db.get(Comment, comment_id) comment.chudded = True g.db.add(comment) user = comment.author else: - user = get_account(id) + user = get_account(fullname) if user.admin_level > v.admin_level: abort(403) @@ -1149,24 +1149,24 @@ def chud(id, v): return {"message": f"@{user.username} has been chudded {duration}!"} -@app.post("/unban_user/") +@app.post("/unban_user/") @limiter.limit('1/second', scope=rpath) @limiter.limit('1/second', scope=rpath, key_func=get_ID) @limiter.limit(DEFAULT_RATELIMIT) @limiter.limit(DEFAULT_RATELIMIT, key_func=get_ID) @admin_level_required(PERMS['USER_BAN']) -def unban_user(id, v): +def unban_user(fullname, v): - if id.startswith('p_'): - post_id = id.split('p_')[1] + if fullname.startswith('p_'): + post_id = fullname.split('p_')[1] post = g.db.get(Post, post_id) user = post.author - elif id.startswith('c_'): - comment_id = id.split('c_')[1] + elif fullname.startswith('c_'): + comment_id = fullname.split('c_')[1] comment = g.db.get(Comment, comment_id) user = comment.author else: - user = get_account(id) + user = get_account(fullname) if not user.is_banned: abort(400) @@ -1917,13 +1917,13 @@ def orgy_control(v): @app.post("/admin/start_orgy") @admin_level_required(PERMS['ORGIES']) def start_orgy(v): - youtube_id = request.values.get("youtube_id") + link = request.values.get("link") title = request.values.get("title") - assert youtube_id + assert link assert title - create_orgy(youtube_id, title) + create_orgy(link, title) return redirect("/chat") diff --git a/files/routes/allroutes.py b/files/routes/allroutes.py index 43f54db5b..87adf4515 100644 --- a/files/routes/allroutes.py +++ b/files/routes/allroutes.py @@ -63,7 +63,7 @@ def after_request(response:Response): user_id = g.v.id _commit_and_close_db() - if request.method == "POST" and not request.path.startswith('/casino/twentyone/'): + if request.method == "POST": redis_instance.delete(f'LIMITER/{get_CF()}/{request.endpoint}:{request.path}/1/1/second') if user_id: redis_instance.delete(f'LIMITER/{SITE}-{user_id}/{request.endpoint}:{request.path}/1/1/second') diff --git a/files/routes/awards.py b/files/routes/awards.py index c9d10342b..612057c5f 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -218,7 +218,7 @@ def award_thing(v, thing_type, id): awarded_coins = 0 if kind == 'shit': - author.charge_account('coins', awarded_coins) + author.charge_account('coins', awarded_coins, should_check_balance=False) v.pay_account('coins', awarded_coins) elif AWARDS[kind]['cosmetic']: author.pay_account('coins', awarded_coins) diff --git a/files/routes/chat.py b/files/routes/chat.py index 5ecb6719e..b15e0cfe6 100644 --- a/files/routes/chat.py +++ b/files/routes/chat.py @@ -38,7 +38,7 @@ def chat(v): abort(403, f"Need at least {TRUESCORE_CHAT_MINIMUM} truescore for access to chat!") orgy = get_orgy() if orgy: - return render_template("orgy.html", v=v, messages=messages, orgy = orgy) + return render_template("orgy.html", v=v, messages=messages, orgy = orgy, site = SITE) else: return render_template("chat.html", v=v, messages=messages) diff --git a/files/routes/mail.py b/files/routes/mail.py index 2387c1ea7..62a1aa16c 100644 --- a/files/routes/mail.py +++ b/files/routes/mail.py @@ -6,7 +6,7 @@ from files.helpers.get import * from files.helpers.mail import * from files.helpers.useractions import * from files.routes.wrappers import * -from files.routes.users import claim_rewards +from files.routes.users import claim_rewards_all_users from files.__main__ import app, limiter @app.post("/verify_email") @@ -50,7 +50,7 @@ def activate(v:User): user.email = email user.is_activated = True - claim_rewards(user) + claim_rewards_all_users() badge_grant(user=user, badge_id=2) diff --git a/files/routes/search.py b/files/routes/search.py index 50ba080dc..e82420b3c 100644 --- a/files/routes/search.py +++ b/files/routes/search.py @@ -2,7 +2,6 @@ import re import time from calendar import timegm -from sqlalchemy import * from sqlalchemy.orm import load_only from files.helpers.regex import * diff --git a/files/routes/users.py b/files/routes/users.py index 9ff4d5d02..f654df84a 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -528,13 +528,17 @@ def unsubscribe(v, post_id): return {"message": "Unsubscribed from post successfully!"} @app.post("/@/message") +@app.post("/id//message") @limiter.limit('1/second', scope=rpath) @limiter.limit('1/second', scope=rpath, key_func=get_ID) @limiter.limit("10/minute;20/hour;50/day") @limiter.limit("10/minute;20/hour;50/day", key_func=get_ID) @is_not_permabanned -def message2(v:User, username:str): - user = get_user(username, v=v, include_blocks=True) +def message2(v, username=None, id=None): + if id: + user = get_account(id, v=v, include_blocks=True) + else: + user = get_user(username, v=v, include_blocks=True) if user.id == MODMAIL_ID: abort(403, "Please use /contact to contact the admins") @@ -733,11 +737,11 @@ def is_available(name:str): else: return {name: True} -@app.get("/id/") +@app.route("/id//") @limiter.limit(DEFAULT_RATELIMIT) -def user_id(id): +def user_id(id, path): user = get_account(id) - return redirect(user.url) + return redirect(f'/@{user.username}/{path}') @app.get("/u/") @limiter.limit(DEFAULT_RATELIMIT) @@ -1286,18 +1290,15 @@ def fp(v:User, fp): v.fp = fp users = g.db.query(User).filter(User.fp == fp, User.id != v.id).all() - if users: print(f'{v.username}: fp', flush=True) if v.email and v.is_activated: alts = g.db.query(User).filter(User.email == v.email, User.is_activated, User.id != v.id).all() if alts: - print(f'{v.username}: email', flush=True) users += alts for u in users: li = [v.id, u.id] existing = g.db.query(Alt).filter(Alt.user1.in_(li), Alt.user2.in_(li)).one_or_none() if existing: continue add_alt(user1=v.id, user2=u.id) - print(v.username + ' + ' + u.username, flush=True) check_for_alts(v, include_current_session=True) g.db.add(v) @@ -1343,71 +1344,65 @@ def bid_list(v:User, bid): ) - -def claim_rewards(v): - transactions = g.db.query(Transaction).filter_by(email=v.email, claimed=None).all() - - highest_tier = 0 - marseybux = 0 - - for transaction in transactions: - for t, money in TIER_TO_MONEY.items(): - tier = t - if transaction.amount <= money: break - - marseybux += TIER_TO_MBUX[tier] - if tier > highest_tier: - highest_tier = tier - transaction.claimed = True - g.db.add(transaction) - - if marseybux: - v.pay_account('marseybux', marseybux) - - send_repeatable_notification(v.id, f"You have received {marseybux} Marseybux! You can use them to buy awards or hats in the [shop](/shop/awards) or gamble them in the [casino](/casino).") - g.db.add(v) - - v.patron_utc = int(time.time()) + 2937600 - - if highest_tier > v.patron: - v.patron = highest_tier - badge_id = 20 + highest_tier - - badges_to_remove = g.db.query(Badge).filter( - Badge.user_id == v.id, - Badge.badge_id > badge_id, - Badge.badge_id < 29, - ).all() - for badge in badges_to_remove: - g.db.delete(badge) - - for x in range(22, badge_id+1): - badge_grant(badge_id=x, user=v) - - if v.lifetime_donated >= 100: - badge_grant(badge_id=257, user=v) - - if v.lifetime_donated >= 500: - badge_grant(badge_id=258, user=v) - - if v.lifetime_donated >= 2500: - badge_grant(badge_id=259, user=v) - - if v.lifetime_donated >= 5000: - badge_grant(badge_id=260, user=v) - - if v.lifetime_donated >= 10000: - badge_grant(badge_id=261, user=v) - - print(f'@{v.username} rewards claimed successfully!', flush=True) - - def claim_rewards_all_users(): emails = [x[0] for x in g.db.query(Transaction.email).filter_by(claimed=None).all()] users = g.db.query(User).filter(User.email.in_(emails)).order_by(User.truescore.desc()).all() for user in users: - claim_rewards(user) + transactions = g.db.query(Transaction).filter_by(email=user.email, claimed=None).all() + highest_tier = 0 + marseybux = 0 + + for transaction in transactions: + for t, money in TIER_TO_MONEY.items(): + tier = t + if transaction.amount <= money: break + + marseybux += TIER_TO_MBUX[tier] + if tier > highest_tier: + highest_tier = tier + transaction.claimed = True + g.db.add(transaction) + + if marseybux: + user.pay_account('marseybux', marseybux) + + send_repeatable_notification(user.id, f"You have received {marseybux} Marseybux! You can use them to buy awards or hats in the [shop](/shop/awards) or gamble them in the [casino](/casino).") + g.db.add(user) + + user.patron_utc = int(time.time()) + 2937600 + + if highest_tier > user.patron: + user.patron = highest_tier + badge_id = 20 + highest_tier + + badges_to_remove = g.db.query(Badge).filter( + Badge.user_id == user.id, + Badge.badge_id > badge_id, + Badge.badge_id < 29, + ).all() + for badge in badges_to_remove: + g.db.delete(badge) + + for x in range(22, badge_id+1): + badge_grant(badge_id=x, user=user) + + if user.lifetime_donated >= 100: + badge_grant(badge_id=257, user=user) + + if user.lifetime_donated >= 500: + badge_grant(badge_id=258, user=user) + + if user.lifetime_donated >= 2500: + badge_grant(badge_id=259, user=user) + + if user.lifetime_donated >= 5000: + badge_grant(badge_id=260, user=user) + + if user.lifetime_donated >= 10000: + badge_grant(badge_id=261, user=user) + + print(f'@{user.username} rewards claimed successfully!', flush=True) KOFI_TOKEN = environ.get("KOFI_TOKEN", "").strip() if KOFI_TOKEN: @@ -1501,7 +1496,7 @@ def settings_claim_rewards(v:User): if not transactions: abort(400, f"{patron} rewards already claimed!") - claim_rewards(v) + claim_rewards_all_users() return {"message": f"{patron} rewards claimed!"} diff --git a/files/templates/admin/orgy_control.html b/files/templates/admin/orgy_control.html index e45c0daa0..123085c70 100644 --- a/files/templates/admin/orgy_control.html +++ b/files/templates/admin/orgy_control.html @@ -25,10 +25,10 @@
- +
- +
diff --git a/files/templates/orgy.html b/files/templates/orgy.html index 2047f8dc7..9d6c6251d 100644 --- a/files/templates/orgy.html +++ b/files/templates/orgy.html @@ -11,11 +11,22 @@
-
+

{{orgy.title}}

- + {% if orgy.is_youtube() %} + + {% elif orgy.is_rumble() %} + + {% elif orgy.is_twitch() %} + + {%endif%}
+ Old Chat {{macros.chat_users_list()}}
diff --git a/files/templates/rules_rDrama.html b/files/templates/rules_rDrama.html index e48abbfa9..2f9fa90c5 100644 --- a/files/templates/rules_rDrama.html +++ b/files/templates/rules_rDrama.html @@ -1,7 +1,6 @@

CURRENT EVENTS:

The NICE Initiative

Spiritual enrichment, personal growth

Bing Bing Wahoo Pet Contest

Dramacoin prizes!
-

Independence Gay Grill-Off

BADGE
diff --git a/migrations/20230709-orgy-rumble.sql b/migrations/20230709-orgy-rumble.sql new file mode 100644 index 000000000..0b054f933 --- /dev/null +++ b/migrations/20230709-orgy-rumble.sql @@ -0,0 +1,7 @@ +DROP TABLE orgies; --Don't worry: Orgies should only have between 0 and 1 rows... +CREATE TABLE public.orgies ( + id integer NOT NULL, + type integer NOT NULL, + data character varying(200) NOT NULL, + title character varying(1000) NOT NULL +); diff --git a/nginx-headers.conf b/nginx-headers.conf index bca41f6b0..95699ea61 100644 --- a/nginx-headers.conf +++ b/nginx-headers.conf @@ -2,5 +2,5 @@ add_header Referrer-Policy "same-origin"; add_header Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"; add_header X-Frame-Options "deny"; add_header X-Content-Type-Options "nosniff"; -add_header Content-Security-Policy "default-src 'none'; frame-ancestors 'none'; form-action 'self'; manifest-src 'self'; worker-src 'self'; base-uri 'self'; font-src 'self'; style-src-elem 'self'; style-src-attr 'unsafe-inline'; style-src 'self' 'unsafe-inline'; script-src-elem 'self' challenges.cloudflare.com; script-src-attr 'none'; script-src 'self' challenges.cloudflare.com; media-src 'self' https:; img-src 'self' https: data:; frame-src challenges.cloudflare.com www.youtube-nocookie.com platform.twitter.com; connect-src 'self' tls-use1.fpapi.io api.fpjs.io;"; +add_header Content-Security-Policy "default-src 'none'; frame-ancestors 'none'; form-action 'self'; manifest-src 'self'; worker-src 'self'; base-uri 'self'; font-src 'self'; style-src-elem 'self'; style-src-attr 'unsafe-inline'; style-src 'self' 'unsafe-inline'; script-src-elem 'self' challenges.cloudflare.com; script-src-attr 'none'; script-src 'self' challenges.cloudflare.com; media-src 'self' https:; img-src 'self' https: data:; frame-src challenges.cloudflare.com www.youtube-nocookie.com platform.twitter.com rumble.com player.twitch.tv; connect-src 'self' tls-use1.fpapi.io api.fpjs.io;"; add_header Cross-Origin-Opener-Policy "same-origin"; diff --git a/schema.sql b/schema.sql index d87128608..957f9ed95 100644 --- a/schema.sql +++ b/schema.sql @@ -816,7 +816,9 @@ ALTER SEQUENCE public.oauth_apps_id_seq OWNED BY public.oauth_apps.id; -- CREATE TABLE public.orgies ( - youtube_id character varying(12) NOT NULL, + id integer NOT NULL, + type integer NOT NULL, + data character varying(200) NOT NULL, title character varying(1000) NOT NULL ); diff --git a/seed-db.sql b/seed-db.sql index d93eddc93..7e6d047cb 100644 --- a/seed-db.sql +++ b/seed-db.sql @@ -248,13 +248,14 @@ INSERT INTO public.badge_defs VALUES (288, 'Carp Master', 'Contributed 10 (or mo INSERT INTO public.badge_defs VALUES (289, 'Sharpened', 'No one understand this user.', 1687725417); INSERT INTO public.badge_defs VALUES (290, 'Smartest Fish Award', 'Awarded for outstanding achievement in the field of QA, signed by Aevann Himself. The highest honor that can be bestowed upon a codecel.', 1687901922); INSERT INTO public.badge_defs VALUES (94, 'Progressive Stack', 'Upvotes/downvotes on this user''s posts and comments have double the ranking effect', NULL); +INSERT INTO public.badge_defs VALUES (291, 'Griller', 'Enough about trans rights! Enough about trans wrongs! I just wanna grill for God''s sake!', 1689087935); -- -- Name: badge_defs_id_seq; Type: SEQUENCE SET; Schema: public; Owner: - -- -SELECT pg_catalog.setval('public.badge_defs_id_seq', 290, true); +SELECT pg_catalog.setval('public.badge_defs_id_seq', 291, true); -- @@ -1487,6 +1488,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('bluehelmet','Rage',2,'freeze surrounded un meme'), ('bluelight','Misc',2,'blue light flashing police cops emergency alert'), ('blueline','Misc',2,'police cops bootlicker flag'), +('blunderbuss','Misc',2,'gun pirate die shoot bang bangbang hand'), ('blush','Classic',2,'blush animated emoticon embarrassed shy'), ('bobateagirl','Wojak',2,'asian woman boba'), ('bogged','Misc',2,'bogdanoff'), @@ -1496,6 +1498,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('boomerjam','Wojak',2,'jamming'), ('boomermonster','Wojak',2,'boomer old sunglasses energy drink monster'), ('boomerportrait','Wojak',2,'boomer'), +('boomhauertalking','Misc',2,'king of the hill dang ol'), ('boosterwalking','Misc',2,'game nintendo mario smrpg g stroll jaunt scary retro'), ('bork','Misc',2,'bork bark dog anger rage seethe'), ('bork2','Misc',2,'dog bork bark whistle'), @@ -1505,6 +1508,8 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('box','Marsey Alphabet',2,'☐ qed halmos tombstone square'), ('boxdog','Misc',2,'dog shakethat dancing dance'), ('brace','Marsey Alphabet',2,'{ } curly bracket'), +('braincube','Wojak',2,'wojak iq smart amazing'), +('brainelephant','Wojak',2,'smart iq wojak elephant technology'), ('brainletbush','Wojak',2,'brainlet bush 911 twin towers retard retarded'), ('brainletcaved','Wojak',2,'brainlet cave retard retarded'), ('brainletchadmask','Wojak',2,'brainlet chad mask cope'), @@ -1525,6 +1530,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('broom','Classic',2,'jannie mop sweep cleanitup'), ('bruce','Wojak',2,'aussie australian'), ('bruh','Misc',2,'emoticon'), +('bruhmad','Misc',2,'mandm angry'), ('bs','Classic',2,'bs emoticon animated bull shit bullshit disbelief flag'), ('bubbles','Misc',2,'tpb bubs'), ('buenpost','Classic',2,'spanish good approving great'), @@ -1593,6 +1599,8 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('carpagree','Carp',2,'yes nod'), ('carpagreefast','Carp',2,'yes correct right nod'), ('carpamerica','Carp',2,'flag pride murica usa'), +('carpamericanflag','Carp',2,'carp america usa burgers guns apple pie shooting'), +('carpangel','Carp',2,'sweet innocent cute'), ('carpasian','Carp',2,'carpathianflorist fish azn racist hat paddy gook nip ching chong chink'), ('carpautism','Carp',2,'carpathianflorist special assburgers aspergers retarded janitor jannie'), ('carpbackstab','Carp',2,'marseybackstab fuckcarp fish carpathianflorist'), @@ -1601,21 +1609,30 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('carpbean','Carp',2,'cute carpathianflorist'), ('carpbeannpc','Carp',2,'sheep follower'), ('carpbeannpcmad','Carp',2,'sheep follower angry rage upset'), +('carpbigbrained','Carp',2,'smart genius'), ('carpblush','Carp',2,'happy shy fish blushing carpathianflorist janitor moderator flushed'), ('carpblush2','Carp',2,'shy embarrassed carpathianflorist fish'), ('carpboobs','Carp',2,'carpathianflorist boobs booba titties tiddies tits boobs breasts censored fish administrator jannie janny janitor'), +('carpboomer','Carp',2,'monster sunglasses'), ('carpbounce','Carp',2,'fish admin jannie moderator carpathianflorist animated excited eager hopping'), +('carpbow','Carp',2,'pretty cute'), ('carpbowler','Carp',2,'british bong english umbrella tea gentleman'), ('carpbrainlet','Carp',2,'retarded stupid'), +('carpbride','Carp',2,'dress wedding wife pretty tiara blush'), ('carpbritish','Carp',2,'carp british bong teeth tea union uk britain gb flag'), ('carpbuff','Carp',2,'muscles tough strong carpathianflorist admin mod jannie'), ('carpburger','Carp',2,'american fat obese overweight food hungry'), ('carpcarphug','Carp',2,'selflove narcissism carpathianflorist fish'), +('carpchadmin','Misc',2,'gigachad chadmin admin swole jannie janny janitor boss muscular huge jacked'), ('carpchonker','Carp',2,'fatty obesity obese'), ('carpchud','Carp',2,'smug carpathianflorist poljak fish glasses soyjak'), ('carpclapping','Carp',2,'applaud'), ('carpclapping2','Carp',2,'applause applaud yay cheering goodjob'), ('carpclueless','Carp',2,'oblivious stupid'), +('carpconfused','Carp',2,'think question'), +('carpcope','Carp',2,'cry sneed'), +('carpcowboy','Carp',2,'hat western'), +('carpcry','Carp',2,'sad depressed'), ('carpcrying','Carp',2,'tear reaction carpathianflorist fish sob tears sad'), ('carpdead','Carp',2,'fish janny kill'), ('carpdead2','Carp',2,'carp rope suicide carpathianflorist admin moderator jannie kaj ajab lynch fish'), @@ -1630,6 +1647,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('carpemo','Carp',2,'goth teen scene'), ('carperman','Carp',2,'slenderman horror stalk tentacles creepypasta'), ('carpexcited','Carp',2,'animated happy flap stim dance squee'), +('carpfacepalm','Carp',2,'realize frustrate'), ('carpfans','Carp',2,'fish fussy onlyfans porn whore thot carpathianflorist fish admin moderator jannie prostitute'), ('carpfisherman','Carp',2,'admin janny bait caught mod sardine srdine carpathianflorist jannie'), ('carpflirt','Carp',2,'flirt zoom eyelashes shy miring admiring'), @@ -1637,10 +1655,15 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('carpfood','Carp',2,'chopsticks chinese cook cantonese'), ('carpghost','Carp',2,'halloween ethereal spooky scary janny pale mop fish carpathianflorist horror'), ('carpgigatetard','Carp',2,'dumb stupid drool'), +('carpglow','Carp',2,'animated fed cia fbi agent'), ('carpgossip','Carp',2,'tea talk phone besties'), +('carphacker','Carp',2,'computer laptop code'), ('carphearts','Carp',2,'love carpathianflorist fish'), ('carphesright','Carp',2,'agree validate'), +('carphmm','Carp',2,'think notice confused'), +('carphmmm','Carp',2,'think notice confused'), ('carpholyspirit','Carp',2,'ghost priest pope cadaversynod'), +('carphope','Carp',2,'cry'), ('carphotep','Carp',2,'black kang pharaoh'), ('carphug','Carp',2,'love squish squeeze hug squeeze fish carpathianflorist'), ('carphug2','Carp',2,'fish love bottomfeeder carpathianflorist heart blow admin cute'), @@ -1653,11 +1676,13 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('carpjannynumba1','Carp',2,'jannie admin mod based doitforfree mop autism'), ('carpjoebiden','Carp',2,'president america suit'), ('carpkys','Carp',2,'killyourself suicide sign spin'), +('carplaugh','Carp',2,'point lol funny'), ('carplazy','Carp',2,'carpathianflorist fish couch sleeping slacker idc antiwork janitor'), ('carpler','Carp',2,'carpathianflorist administrator fascist mustache fish salute jannie nazi armband swastika'), ('carplgbtflag','Carp',2,'gay pride'), ('carplgbtflag2','Carp',2,'gay pride'), ('carplove','Carp',2,'heart'), +('carpmad','Carp',2,'angry rage'), ('carpmeatgrinder','Carp',2,'kill death dead seafood fish mince woodchipper'), ('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'), @@ -1676,9 +1701,12 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('carpprotest','Carp',2,'sign fish mad carpathianflorist sign admin jannie'), ('carpprotestno','Carp',2,'sign'), ('carpprotestyes','Carp',2,'sign'), +('carpraging','Carp',2,'animated mad angry'), +('carprain','Carp',2,'cloud sad depressed'), ('carprentfree','Carp',2,'fish bard stochiastic moderator jannie carpathianflorist fish'), ('carprobot','Carp',2,'metal bot android scifi electric'), ('carpsad','Carp',2,'depressed'), +('carpsalat','Carp',2,'prayer muslim islam rug'), ('carpsalute','Carp',2,'fish army military uniform rank navy marines parade soldier carpathianfloriist'), ('carpsaluteusa','Carp',2,'patriot soldier army america fish flag free liberty eagle burgers brave'), ('carpscared','Carp',2,'sweat worried panic'), @@ -1691,13 +1719,20 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('carpsmuggler','Misc',2,'smuggler psst contraband bootleg rigged bribe cheating conspiracy fed corrupt entrapment trenchcoat fedora'), ('carpsneed','Carp',2,'simpsons'), ('carpsnipe','Carp',2,'shooter shooting gun sniper rifle scope crosshairs carpathianflorist kill murder bullet crosshair ajab'), +('carpsouthernbelle','Carp',2,'dress female foid cute pretty parasol'), +('carpsoyjak','Carp',2,'wojak janny janitor'), +('carpsper','Misc',2,'carp yokai yokaiwatch whisper ghost'), ('carpsquirtle','Carp',2,'pokemon gaming pixel nintendo carpathian'), ('carpssflag','Carp',2,'super straight pride'), ('carpstack','Carp',2,'repeat comments hidden fast speed'), ('carpstake','Carp',2,'vampire kill heart blood'), +('carpsurejan','Carp',2,'doubt'), +('carpsurftheweb','Carp',2,'computer internet mouse screen mod janny'), ('carpthong','Carp',2,'bussy butt ass sexy sad'), ('carpthumbsup','Carp',2,'fish carpathianflorist goodjob approval'), +('carptrad','Carp',2,'wife foid female woman dress'), ('carptransflag','Carp',2,'train pride'), +('carptroll','Carp',2,'mad laugh'), ('carptrollgun','Carp',2,'crazy mad shoot carpathianflorist fish angry antichrist'), ('carptrophy','Carp',2,'carp head decapitated anticarp trophy defeat dead teaparty'), ('carptroublemaker','Carp',2,'evil'), @@ -1839,6 +1874,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('colon','Marsey Alphabet',2,':'), ('comfyslime','Classic',2,'slime blue sitting blanket chair happy'), ('comma','Marsey Alphabet',2,'letter'), +('commiebrainlet','Wojak',2,'russia ukrain dumb idiot wojak brainlet'), ('conflictedgaysounds','Misc',2,'ferris felix trans gay gaysounds eggirl'), ('confused','Classic',2,'confused animated emoticon perplexed'), ('confused2','Classic',2,'confusion'), @@ -1970,6 +2006,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('donkeykongchestbeat3','Donkey Kong',2,'dk thumping'), ('donkeykongclimbing','Donkey Kong',2,'monkeybars dk'), ('donkeykongconfused','Donkey Kong',2,'head scratch dk'), +('donkeykongd','Donkey Kong',2,'alphabet letter'), ('donkeykongdance','Donkey Kong',2,'grooving game nintendo dk dk dancing happy celebrate dk dancing celebrate'), ('donkeykongdance2','Donkey Kong',2,'dancing grooving happy dk'), ('donkeykongdance3','Donkey Kong',2,'dk64 dancing celebrate'), @@ -2010,7 +2047,9 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('donkeykongsad2','Donkey Kong',2,'dk upset disappointed'), ('donkeykongsadvibing','Donkey Kong',2,'rainbow dk'), ('donkeykongsaystransrights','Donkey Kong',2,'transrights humanrights rights sign dk'), +('donkeykongshrug','Donkey Kong',2,'idk'), ('donkeykongsquawks','Donkey Kong',2,'dk flying bird'), +('donkeykongt','Donkey Kong',2,'alphabet letter'), ('donkeykongtiedup','Donkey Kong',2,'restrained bondage gorilla scared struggling resisting'), ('donkeykongtoboggan','Donkey Kong',2,'ride cart roller coaster dk'), ('donkeykongtransrights','Donkey Kong',2,'dk'), @@ -2037,6 +2076,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('drafts','Misc',2,'that shouldve have stayed in the boo thathoeoverthere thot girl cringe reaction gif animated'), ('dragonvore','Classic',2,'wizard eating'), ('dramacake2nd','Misc',2,'food candle rainbow trans'), +('dramatard','Misc',2,'incel rdrama hood loser'), ('dreamgender','Misc',2,'mogai dream flag'), ('drink','Classic',2,'drink animated emoticon beer alcohol bottoms up imbibe'), ('drool','Classic',2,'drool emoticon retard retarded stupid idiot'), @@ -2092,10 +2132,12 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('fetish','Misc',2,'animated'), ('fffffffuuuuuuuuuuuu','Rage',2,'fuck angry enraged mad screaming yelling'), ('firecat','Marsey',2,'firefox browser marsey'), +('fish','Misc',2,'fish dance music jam vibe'), ('fishing','Classic',2,'rod'), ('flairlessmong','Misc',2,'flairless mong reddit'), ('flamethrower','Classic',2,'animated emoticon flamethrower fire kill'), ('flamethrower2','Classic',2,'flammenwerfer burn fire'), +('flex','Misc',2,'nice w peak top awesome cool great flex flexing emoji hot nice good nice'), ('flipbird','Classic',2,'animated emoticon fuck off middle finger'), ('flipthetable','Rage',2,'table table flip angry mad enraged'), ('flirt','Classic',2,'flirt animated emoticon'), @@ -2144,6 +2186,9 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('gmasmoke','Misc',2,'grandma bong marijuana weed'), ('go','Classic',2,'go animated emoticon leave'), ('goblina','Misc',2,'amerimutt'), +('goblinitsover','Misc',2,'goblin its over amby orc'), +('goblinwereback','Misc',2,'goblin wereback amby orc'), +('goblinwerebackitsover','Misc',2,'goblin were back its over amby orc'), ('gogetter','Wojak',2,'motivated'), ('gokulaugh','Misc',2,'goku dbz dragonball laughing'), ('goldenbanana','Donkey Kong',2,'donkeykong dk64 fruit'), @@ -2236,6 +2281,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('imsogay','Misc',2,'gay gays lgbt fag faggot bussy twink hun gaaaaay ha hah rainbow woke love gaylove homo homosexual homosexuality homos imgay imsogay'), ('imtoogayforthis','Misc',2,'gay gays lgbt fag faggot bussy twink hun gaaaaay ha hah rainbow woke love gaylove homo homosexual homosexuality homos'), ('in','Marsey Alphabet',2,'∈ ∋ membership set'), +('incel','Misc',2,'virgin rage murderer looksism lookism diesexhaver'), ('incelpride','Misc',2,'incel misogynist tranny flag'), ('indiandoomergirl','Wojak',2,'woman indian doomer depressed'), ('indianeye','Misc',2,'look into stare feather'), @@ -2262,6 +2308,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('jinxthinkerhesapedo','Misc',2,'jinxthinker hes pedo know'), ('jinxthinkerhesright','Misc',2,'jinxthinker hes right know'), ('joanmarsey','Marsey',2,'joan gay clown gacy wayne'), +('jokerchad','Wojak',2,'joker wojak meme joke chad'), ('jokeryouwouldntgetit','Misc',2,'damaged jokerpilled doomer'), ('julian','Misc',2,'tbp trailerparkboys'), ('k','Marsey Alphabet',2,'letter'), @@ -2280,6 +2327,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('kiddykongfall','Donkey Kong',2,'stupid dumb bored dk donkeykong'), ('kiddykongrunning','Donkey Kong',2,'donkeykong dk'), ('kiddykongscared','Donkey Kong',2,'eyes dk donkeykong'), +('killerjak','Wojak',2,'killer murder dead kill wojak'), ('killherkillher','Rage',2,'troll crazy'), ('kimjojongjak','Wojak',2,'woman korean asian'), ('kimonogirl','Wojak',2,'woman asian japanese japan kimono'), @@ -2430,6 +2478,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseyahs','Marsey',2,'bardfinn dubteedub againsthatesubreddits redditor groomer pedophile libertarian chomo antifa animated'), ('marseyaimlessrenegade','Marsey',2,'aimless renegade homestuck'), ('marseyairquotes','Marsey',2,'reaction patronizing animated uh huh'), +('marseyaisha','Marsey',2,'aisha ban banned judge hammertime'), ('marseyakbar','Marsey',2,'suicide bomber explosion boom explode die kms animated'), ('marseyakshually','Marsey',2,'contrarian false disagree meme neckbeard nerd wrong correction actually weeb'), ('marseyakumu','Marsey',2,'simp love loving weebshit'), @@ -2708,6 +2757,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseybongosnoo','Marsey',2,'bongo drums music meme jam reddit snoo'), ('marseybongosrdine','Marsey',2,'bongo drums music meme jam srdine'), ('marseybongoukraine','Marsey',2,'bongo ukraine russia war azov nazi happening animated'), +('marseybonsai','Marsey',2,'tree nature marsey cat gore wpd dongleygoop dp'), ('marseybooba','Marsey',2,'awooga tits titties boobs eyes animated tiddies'), ('marseyboomarch','Marsey',2,'ghost boo march'), ('marseyboomer','Marsey',2,'sipping shades sunglasses old yup vape'), @@ -2717,6 +2767,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseybottom','Marsey',2,'submissive gay useragent13 weak'), ('marseybountyhunter','Marsey',2,'abortion leather vest cowboy gunslinger texas revolver'), ('marseybow','Marsey',2,'bow ribbon happy cute adorable accessory gift present'), +('marseybowing','Marsey',2,'bowing karate respect kneel sensei senpai teacher student learn humble wise'), ('marseybowl','Marsey',2,'marijuana weed dude weed lmao ganja drugs reaction pot pipe'), ('marseybowler','Marsey',2,'british bong english umbrella tea gentleman'), ('marseybrainlet','Marsey',2,'idiot imbecile smoothbrain crushed head retard caved in head sped dumb stupid drooling moron'), @@ -2796,6 +2847,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseycatgirljanny','Marsey',2,'anime maid weebshit'), ('marseycatpanties','Marsey',2,'cute valentine dirty panties naughty horny rapey'), ('marseycaveman','Marsey',2,'caveman prehistoric neanderthal primitive tribal'), +('marseycdm','Marsey',2,'curseddankmemes'), ('marseyceiling','Marsey',2,'spy masturbate watching peeping'), ('marseycensored','Marsey',2,'1984 memory hole censorship repressed'), ('marseycenter','Marsey',2,'reaction grilling boomer centrist'), @@ -3168,6 +3220,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseyeggirl','Marsey',2,'troomer tranny transgender lgbt groomer troid transsexual'), ('marseyeggless','Marsey',2,'postwall foid woman barren menopause old hag childfree fds'), ('marseyeh','Marsey',2,'canada canadian leafistan trudeau rake south park '), +('marseyelbows','Marsey',2,'marsey johnny elbows'), ('marseyeldritch','Marsey',2,'lovecraft horror halloween tentacles holiday scary monster'), ('marseyeldritchcarp','Marsey',2,'eldritch carpathianflorist fish cthulhu hplovecraft horror ghost'), ('marseyelephant','Marsey',2,'oliphant dumbo'), @@ -3676,6 +3729,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseyitsoveryall','Marsey',2,'buck south over sad sneed hat'), ('marseyitsrigged','Marsey',2,'its rigged rig goomble gamble lottershe election dating test blackjack roulette'), ('marseyjackmormon','Marsey',2,'mormon beer cigarette sin booze alcohol smoke'), +('marseyjacknoir','Marsey',2,'homestuck'), ('marseyjackskellington','Marsey',2,'skeleton nightmarebeforechristmas halloween horror burton'), ('marseyjackson','Marsey',2,'music king pop mayo whiteface michael'), ('marseyjacksparrow','Marsey',2,'johnny depp amber heard abuse violence punch beat feminist Jack sparrow'), @@ -3694,6 +3748,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseyjannyrentfree','Marsey',2,'soycry mop admin moderator jannie'), ('marseyjannywereback','Marsey',2,'moderator sweep clean volunteer'), ('marseyjapanese','Marsey',2,'nippon rising sun weeb japan animated'), +('marseyjar','Marsey',2,'marsey jar wpd glass container squished gore blush cute'), ('marseyjason','Marsey',2,'hockey mask horror halloween kill fridaythe13th knife stab voorheys friday the 13th evil monster holiday'), ('marseyjavelin','Marsey',2,'ukraine russia missile rocket rpg grenade launcher kyiv kiev kiyv zelensky putin tank'), ('marseyjcdenton','Marsey',2,'sunglasses shades vidya video game deusex deus ex'), @@ -3998,9 +4053,13 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseyminipixel','Marsey',2,'miniature small smol place 8bit mouse'), ('marseymisato','Marsey',2,'misato anime mommy alcoholic kiss blowkiss milf evangelion'), ('marseymisatoannoyed','Marsey',2,'misato evangelion nge mommy milf anime weeb'), +('marseymisatocheeky','Marsey',2,'nge evangelion raspberry anime weeb'), ('marseymisatodress','Marsey',2,'misato anime mommy alcoholic kiss blowkiss milf evangelion'), ('marseymisatogoggles','Marsey',2,'misato anime mommy alcoholic kiss blowkiss milf evangelion'), ('marseymisatohat','Marsey',2,'misato anime mommy alcoholic kiss blowkiss milf evangelion'), +('marseymisatolewd','Marsey',2,'nge evangelion blowkiss anime weeb'), +('marseymisatolewd1','Marsey',2,'nge evangelion blowkiss anime weeb'), +('marseymisatolewd2','Marsey',2,'misato nge evangelion mommy milf anime waifu blush blowkiss japan weeb katsuragi butt lewd ass naked'), ('marseymischevious','Marsey',2,'trickster mischevious troublesome plan scheme schemer evil clever think bad naughty prankish delinquet'), ('marseymischief','Marsey',2,'interface clown'), ('marseymisinformation','Marsey',2,'marsey meme sphere ball text misinformation internet purposefully spread'), @@ -4010,6 +4069,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseymissingno','Marsey',2,'missing no missingno error marsey pokemon'), ('marseymlg','Marsey',2,'glasses moutaindew hat'), ('marseymobster2','Marsey',2,'bat gangster mafia kneecapper'), +('marseymochi','Marsey',2,'cat marsey mochi grey gray cute adorable pet kitty kitten'), ('marseymocking','Marsey',2,'mocking spongebob meme alternating studly caps retard'), ('marseymodelo','Marsey',2,'cheers alcohol drinking beer'), ('marseymodelo2','Marsey',2,'cheers alcohol beer drinking'), @@ -4228,6 +4288,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseypepe2','Marsey',2,'reaction frog mellokind'), ('marseypepe3','Marsey',2,'smug peepo frog'), ('marseypepsi','Marsey',2,'cola coke soda soft drink pop red white blue usa america'), +('marseyperegrinemendicant','Marsey',2,'homestuck'), ('marseypeterson','Marsey',2,'jordan b peterson professor intellectual chud rightoid incel twelve rules for life zoloft depressed antidepressant depression tired old smart'), ('marseypharaoh','Marsey',2,'egyptian aevann pyramids'), ('marseypharaoh2','Marsey',2,'gods egyptian aevann animated'), @@ -4368,6 +4429,11 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseyrabbitnewyear3','Marsey',2,'chinese cny chink chong lunar holiday coin money fortune huat bunny 2023 festive orient hat asian'), ('marseyrabbitnewyear4','Marsey',2,'chinese cny chink chong lunar holiday red packet envelope money fortune huat bunny 2023 festive orient dress flowers asian'), ('marseyraccoon','Marsey',2,'trashpanda trash panda'), +('marseyraccoonhappy','Marsey',2,'raccoon coon wootfatigue garbage trash panda happy content vibing'), +('marseyraccoonlove','Marsey',2,'raccoon coon wootfatigue love hug cute animal trash panda garbage'), +('marseyraccoonregular','Marsey',2,'raccoon coon wootfatigue garbage trash panda happy default'), +('marseyraccoonshock','Marsey',2,'raccoon coon wootfatigue trash panda garbage shock surprise'), +('marseyraccoontrouble','Marsey',2,'raccoon coon wootfatigue trouble smug garbage panda trash'), ('marseyracist','Marsey',2,'racing vroom racecar bigot reaction'), ('marseyracistgrandpa','Marsey',2,'thanksgiving fuck nigger holiday'), ('marseyradfem','Marsey',2,'chonker feminist radical radfem sjw terf fat obese blue hair bluehair feminism'), @@ -4504,12 +4570,14 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseysaint2','Marsey',2,'angelic halo holy animated wings happy'), ('marseysal','Marsey',2,'2 weeks two weeks sallie white shark'), ('marseysal2','Marsey',2,'shark 2 weeks two weeks go nowhere going nowhere watch go nowhere'), +('marseysal3','Marsey',2,'sal wadanohara white suit smug going nowhere in two weeks game shark'), ('marseysalad','Marsey',2,'vegan cabbage vegetarian lettuce vegetable'), ('marseysaladfingers','Marsey',2,'salad fingers meme internet creepy apocalypse depraved'), ('marseysalat','Marsey',2,'prayer islam muslim rug'), ('marseysalendofherstory','Marsey',2,'book read end of history fukuyuma sal 2 weeks smug neoliberal liberal'), ('marseysalitsnowhere','Marsey',2,'its over sal shark watch this go nowhere in 2 weeks mogeko wadanohara'), ('marseysalitssomewhere','Marsey',2,'sal shark its somewhere over watch this go nowhere in 2 weeks two'), +('marseysalmaid','Marsey',2,'sal wadanohara maid femboy apron headband smug going nowhere in two weeks game shark'), ('marseysalmuhammad','Marsey',2,'muslim sal muhammad twoweeks'), ('marseysaltlicking','Marsey',2,'salt lick rock'), ('marseysalty','Marsey',2,'sodium saltshaker seethe salt shaker nacl animated'), @@ -4602,6 +4670,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseyshitpipe','Marsey',2,'sewer sewage shit pipe marsey'), ('marseyshiva','Marsey',2,'shiva india god neel hindu pajeet diwali curry streetshitter goddess'), ('marseyshock','Marsey',2,'shock fear afraid terror scared horrified'), +('marseyshoe','Marsey',2,'swf penis shoe size bbc bwc mog manlet footlet'), ('marseyshook','Marsey',2,'reaction surprised shocked gasp astonished'), ('marseyshooting','Marsey',2,'blam blatt shotgun kill pow murder'), ('marseyshortbus','Marsey',2,'bussy animated mrpenny carpathianflorist schizocel retard special short schoolbus classroom teacher wheels window rosa parks mlk'), @@ -4770,6 +4839,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseystamp','Marsey',2,'letter envelope fed postal collect snail mail'), ('marseystamp2','Marsey',2,'letter envelope fed postal collect snail mail toll paid'), ('marseystamp3','Marsey',2,'realistic mail armenian'), +('marseystar','Marsey',2,'starsey star space sky light bright award trophy'), ('marseystarbucks','Marsey',2,'coffee latte barista marbucks scone'), ('marseystare','Marsey',2,'staring bruh disapproval'), ('marseystars','Marsey',2,'stareyes reaction star eyes starry eyed stareyed'), @@ -4810,6 +4880,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseysupersorensoarin','Marsey',2,'soren super hero superhero batman superman marsey41'), ('marseysurejan','Marsey',2,'bradybunch smug smile happy indignant eyebrows ears squint smirk'), ('marseysurfing','Marsey',2,'surfer surfing pikachu water wave meme'), +('marseysurftheweb','Marsey',2,'computer internet rdrama mouse screen'), ('marseysurprised','Marsey',2,'reaction shocked shook unexpected'), ('marseysurprisedpikachu','Marsey',2,'surprise surprised pikachu shock shocked gasp'), ('marseysus','Marsey',2,'amogus among us stonetoss sussy baka amongus'), @@ -5089,6 +5160,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marseywigglertail','Marsey',2,'keffals animated'), ('marseywilber','Marsey',2,'gimp wilber'), ('marseywilberface','Marsey',2,'gimp wilber icon'), +('marseywillnever','Marsey',2,'cereal eating casual disbelief'), ('marseywindmill','Marsey',2,'headbang metal hair spinny brootal animated brutal kvlt'), ('marseywindows','Marsey',2,'marsey windows windows10 proprietary software os'), ('marseywinemom','Marsey',2,'drunk wine aunt flirt cigarette drunk lush elfbinn fartbinn cougar'), @@ -5213,6 +5285,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('marstolfo','Marsey',2,'astolfo anime femboy cute blowkiss love heart justcool393 trap warrior'), ('mcbealdancingbaby','Misc',2,'dance dancing baby aly mcbeal groovy'), ('mcmarsey','Marsey',2,'wageslave poor mcdonalds wagecuck maccas antiwork college wagie'), +('meatcube','Misc',2,'meat cube meatcube'), ('medal','Classic',2,'medal animated emoticon award winner'), ('megaman','Classic',2,'megaman animated vidya nintendo'), ('megamanguitar','Classic',2,'megaman animated vidya nintendo guitar music rock'), @@ -5253,6 +5326,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('nauseous','Classic',2,'nauseous emoticon sick ill green'), ('naziack','Wojak',2,'chud chuds chuddy nazi nazis racist racism right rightoid hang hanging kys ack acking kill yourself killyourself suicide rope roped roping wingcuck agendaposter incel incels virgin manlet cry crying'), ('nazijak','Wojak',2,'nazi fascist'), +('nazimod','Misc',2,'jannie janitor nazi mod moderator impact font'), ('naziseethe','Wojak',2,'nazi seethe fascist upset angry mad enraged'), ('necky','Donkey Kong',2,'donkeykong dk bird vulture'), ('neg','Marsey Alphabet',2,'¬ not negation logical'), @@ -5301,6 +5375,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('orly','Classic',2,'orly seagull meme'), ('otimes','Marsey Alphabet',2,'⊗ tensor circled product'), ('owlsey','Marsey',2,'bird hoot feathers'), +('owo','Misc',2,'owo cringe weird weeb emote anime'), ('p','Marsey Alphabet',2,'letter'), ('paddle','Classic',2,'paddle animated emoticon spank bdsm'), ('palestenianshroomjak','Wojak',2,'palestine mushroom'), @@ -5395,6 +5470,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('pimp','Classic',2,'pimp animated emoticon hat cigar smoking'), ('pinkgirlblackjak','Wojak',2,'black woman hoops pink'), ('pissedoff','Classic',2,'angry mad'), +('plank','Misc',2,'eddy cartoonnetwork'), ('plarsy','Platy',2,'platypus marsey mutt inbred doodle ugly'), ('platyaboriginal','Platy',2,'platypus boomerang indigenous native gascan'), ('platyabused','Platy',2,'platypus domestic scared flinching beaten fight'), @@ -5485,6 +5561,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('postalsmiley','Classic',2,'postal game devil evil smiley'), ('pound','Marsey Alphabet',2,'# hashtag octothorpe'), ('pout','Classic',2,'pout animated emoticon lip'), +('praisethesun','Misc',2,'praise worship pray prayed sun solair sun the praisethesun dark souls darksouls darksouls1 darksouls3'), ('pray','Classic',2,'prayer praying'), ('pride2022','Misc',2,'bait lgbt flag'), ('prigozhinsoypoint','Wojak',2,'vagner wagner russia war'), @@ -5511,6 +5588,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('quote','Classic',2,'quote animated emoticon fingers'), ('r','Marsey Alphabet',2,'letter'), ('raccoon','Classic',2,'raccoon animated'), +('ragedeathjak','Wojak',2,'ragedeath rage death wojak red'), ('ragejak','Wojak',2,'mad'), ('ragemask','Wojak',2,'mad'), ('ragestrangle','Rage',2,'strangle'), @@ -5597,6 +5675,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('shrug2','Classic',2,'shrugging idk idc'), ('shutupmale','Misc',2,'stfu anime moidmoment guns'), ('shutupwhite','Misc',2,'spongebob yelling mayo stfu'), +('shyduck','Misc',2,'owo uwu shy hehe duck'), ('shyyt','Misc',2,'coli thecoli black laugh smile happy grin excite surprise damn'), ('sigma','Marsey Alphabet',2,'σ'), ('sigmacap','Marsey Alphabet',2,'Σ'), @@ -5648,6 +5727,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('snootrollface','Misc',2,'snoo reddit trollface'), ('snooupvote','Misc',2,'snoo reddit upvote animated'), ('snooze','Classic',2,'sleeping zzz boring bored'), +('sob','Misc',2,'cry sad sob bad notgood negative'), ('society','Misc',2,'broadcast anonymous'), ('sonic','Classic',2,'sonic animated vidya sega hedgehog cwc'), ('soren','Misc',2,'soren assimilation'), @@ -5738,6 +5818,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('takethat','Misc',2,'take that ace attorney lawyer'), ('talk2hand','Classic',2,'hand animated emoticon ignore disagree'), ('talking','Misc',2,'speaking talking talk text bubble speech dialogue'), +('tank','Misc',2,'bang boom nuke die diedie death tank shoot kaboooom'), ('tantrum','Classic',2,'tantrum animated emoticon fit crying'), ('tau','Marsey Alphabet',2,'τ'), ('tayaaa','Tay',2,'aaa'), @@ -5830,6 +5911,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('tradboy','Wojak',2,'trad man blonde femboy'), ('tradwife','Wojak',2,'trad wife blonde'), ('trans','Misc',2,'tranny troon train flag'), +('transheart','Misc',2,'trans heart wholesome'), ('translord','Misc',2,'tranny troon flag'), ('transracial','Misc',2,'bait race flag'), ('trianglelefteq','Marsey Alphabet',2,'⊴'), @@ -5858,6 +5940,7 @@ INSERT INTO public.emojis (name, kind, author_id, tags) VALUES ('uracunt','Misc',2,'disney snowwhite point'), ('usa','Misc',2,'america'), ('usarentfree','Wojak',2,'wojack america seethe cope'), +('uwu','Misc',2,'uwu cringe weird weeb emote anime'), ('uwueyes','Misc',2,'owo cute blushing shy'), ('uwueyesblink','Misc',2,'cute shy flirting forme blush'), ('uzi','Classic',2,'gun shooting kill'), diff --git a/snappy_rDrama.txt b/snappy_rDrama.txt index 0eaf0a629..4658e243a 100644 --- a/snappy_rDrama.txt +++ b/snappy_rDrama.txt @@ -3894,4 +3894,8 @@ This is your fate. This is what you chose. There is no turning back. {[para]} Kill moids. Behead moids. Roundhouse kick a moid into the concrete. Slam dunk a moid baby into the trashcan. Crucify filthy moids. Defecate in a moids food. Launch moids into the sun. Stir fry moids in a wok. Toss moids into active volcanoes. Urinate into a moids gas tank. Judo throw moids into a wood chipper. Twist moids heads off. Report moids to the IRS. Karate chop moids in half. Curb stomp pregnant white moids. Trap moids in quicksand. Crush moids in the trash compactor. Liquefy moids in a vat of acid. Eat moids. Dissect moids. Exterminate moids in the gas chamber. Stomp moid skulls with steel toed boots. Cremate moids in the oven. Lobotomize moids. Mandatory abortions for moids. Grind moid fetuses in the garbage disposal. Drown moids in fried chicken grease. Vaporize moids with a ray gun. Kick old moids down the stairs. Feed moids to alligators. Slice moids with a katana. {[para]} -https://i.rdrama.net/images/16888215299820666.webp \ No newline at end of file +https://i.rdrama.net/images/16888215299820666.webp +{[para]} +There is a cock sized hole in your brain where your ability to create original thoughts used to be. It has rotted out of your head and dribbles out your ears, you have then taken said goo and smeared it across your computer monitor. You have been so thoroughly skullfucked all e-drama looks like a 90's sitcom with 2 directionless plot lines recycled ad infinitum. +{[para]} +https://i.rdrama.net/images/16890293613211384.webp \ No newline at end of file diff --git a/startup.sh b/startup.sh deleted file mode 100644 index 1680c605b..000000000 --- a/startup.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -cd /rDrama -. ./.env -gunicorn files.__main__:app -w 3 diff --git a/startup_chat.sh b/startup_chat.sh deleted file mode 100644 index 5ba7c02e6..000000000 --- a/startup_chat.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -cd /rDrama -. ./.env -gunicorn files.__main__:app load_chat -k geventwebsocket.gunicorn.workers.GeventWebSocketWorker -w 1 -b 0.0.0.0:5001