diff --git a/.gitignore b/.gitignore index 560f817d7..ce4ac958b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,9 @@ -image.* -video.mp4 -unsanitized.mp4 -cache/ +.* __pycache__/ -.idea/ -**/.pytest_cache/ -venv/ -.vscode/ -.sass-cache/ -flask_session/ -.DS_Store -site_settings.json -/files/test.py -tags # Chat environment chat/node_modules chat/build -chat/.env # Chat artefacts files/assets/css/chat_done.css diff --git a/chat/src/features/chat/ChatMessage.css b/chat/src/features/chat/ChatMessage.css index 13b1be018..d338ad70f 100644 --- a/chat/src/features/chat/ChatMessage.css +++ b/chat/src/features/chat/ChatMessage.css @@ -1,7 +1,6 @@ .ChatMessage { position: relative; padding-right: 1.5rem; - overflow: hidden; max-height: 300px; } @@ -39,6 +38,7 @@ align-items: center; justify-content: space-between; padding-left: 30px; + overflow: hidden; } .ChatMessage-content { diff --git a/docker-compose.yml b/docker-compose.yml index ea8351575..7d8da39ca 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,17 +15,26 @@ services: depends_on: - redis - postgres + logging: + options: + max-size: "100k" + max-file: "1" + redis: container_name: "redis" image: redis ports: - "6379:6379" + logging: + options: + max-size: "100k" + max-file: "1" postgres: container_name: "postgres" image: postgres - command: ["postgres", "-c", "log_statement=all"] + #command: ["postgres", "-c", "log_statement=all"] volumes: - "./schema.sql:/docker-entrypoint-initdb.d/00-schema.sql" - "./seed-db.sql:/docker-entrypoint-initdb.d/10-seed-db.sql" @@ -33,9 +42,17 @@ services: - POSTGRES_HOST_AUTH_METHOD=trust ports: - "5432:5432" + logging: + options: + max-size: "100k" + max-file: "1" opera-proxy: container_name: "opera-proxy" image: yarmak/opera-proxy ports: - "18080:18080" + logging: + options: + max-size: "100k" + max-file: "1" diff --git a/files/assets/css/awards.css b/files/assets/css/awards.css index 56e7b4a45..a7ac4e538 100644 --- a/files/assets/css/awards.css +++ b/files/assets/css/awards.css @@ -1,219 +1,159 @@ +#awards-container { +position:fixed; +pointer-events: none; +z-index:9999; +} + +#awards-container > div { +position: absolute; +} + +/*seal*/ +.wholesome img { + width: 100px !important; + height: 89.5px !important; +} +@media (max-width: 992px) { + .wholesome img { + width: 40px !important; + height: 27px !important; + } +} + +.wholesome {animation: sealX 9s linear infinite} +.wholesome img {animation: sealY 10s linear infinite} + +.wholesome1 {animation-direction: alternate} +.wholesome1 img {animation-direction: alternate} +.wholesome2 {animation-direction: alternate-reverse} +.wholesome2 img {animation-direction: alternate-reverse} +.wholesome3 {animation-direction: alternate} +.wholesome3 img {animation-direction: alternate-reverse} +.wholesome4 {animation-direction: alternate-reverse} +.wholesome4 img {animation-direction: alternate} + +@keyframes sealX { + from {} to {transform: translateX(98vw)} +} +@keyframes sealY { + from {} to {transform: translateY(85vh)} +} + +/*train common*/ +.train1, .scooter1 {top:2%} +.train2, .scooter2 {top:27%} +.train3, .scooter3 {top:52%} +.train4, .scooter4 {top:77%} + +@keyframes train { + from {transform: translateX(-3vw)} + to {transform: translateX(99vw)} +} + +/*train*/ +.train img { + width: 100px !important; + height: 51px !important; +} +@media (max-width: 992px) { + .train img { + width: 40px !important; + height: 20px !important; + } +} + +.train{animation: train 11s linear infinite;} +.train:nth-of-type(odd) {animation-direction: reverse;} +.train:nth-of-type(odd) img {transform: scaleX(-1);} + +/*scooter*/ +.scooter img { + width: 100px !important; + height: 135px !important; +} +@media (max-width: 992px) { + .scooter img { + width: 40px !important; + height: 54px !important; + } +} + +.scooter {animation: train 11s linear infinite;} +.scooter:nth-of-type(even) {animation-direction: reverse;} +.scooter:nth-of-type(even) img {transform: scaleX(-1);} + /*confetti*/ -#post-award-confetti { - position: fixed; - z-index: 9998; - width: 100%; - height: 100%; - pointer-events: none !important; +.confetti { background-image: url(/assets/images/confetti2.webp); background-repeat: repeat; } /*fireworks*/ -.firework { - position:fixed; - z-index:9999; - pointer-events: none; - width: 100% !important; - height: 100% !important; - pointer-events: none !important; -} - .firework img { max-width: 15rem; } /*ricardo*/ .ricardo { - position: fixed; - z-index: 9997; - pointer-events: none !important; + position: fixed !important; + bottom: 0; } - .ricardo img { - max-height: 15rem !important; - max-height: min(30vw,15rem) !important; + max-height: min(30vw,15rem); } -.ricardoleft { - animation: ricardoleft 2.9s 2 alternate !important; +.ricardo1 {animation: ricardo1Xa 5.8s linear infinite, ricardo1Xb 11.6s linear infinite, ricardo1Y 23.2s linear infinite;} +.ricardo2 {animation: ricardo2 8.5s linear infinite;} +.ricardo3 {animation: ricardo3 10s linear infinite;} + +@keyframes ricardo1Xa { + 0% {right: -200px} + 50% {right: 200px} + 100% {right: -200px} } -.ricardoright { - animation: ricardoright 2.9s 2 alternate !important; +@keyframes ricardo1Xb { + 0%{left:unset} + 49% {left: unset} + 50% {left: -200px} + 75% {left:200px} + 100% {left: -200px} } -@keyframes ricardoleft { - from {} - to {transform: translateX(200px);} +@keyframes ricardo1Y { + 0% {bottom:20vh} + 24% {bottom: 20vh} + 25% {bottom: 60vh} + 49% {bottom: 60vh} + 50% {bottom: 10vh} + 74% {bottom: 10vh} + 75% {bottom: 50vh} + 99% {bottom: 50vh} + 100% {bottom: 20vh} } -@keyframes ricardoright { - from {transform: translateX(110vw);} - to {transform: translateX(95vw);} -} - -#ricardo1 { - top:70%; - left:-10%; -} - -#ricardo2 { - top:80%; - left:50%; - animation: ricardo2 1.7s linear infinite !important; - max-height:200px; -} - -#ricardo3 { - top:85%; - animation: ricardo3 10s linear infinite !important; - max-height:150px; -} @keyframes ricardo2 { - 0% {opacity:20%} - 50% {opacity:100%} - 100% {opacity:0%} + 0% { opacity: 1; left: 0; right: unset;} + 18% {opacity: 0; left: 0; right: unset;} + 19% {opacity: 0; left: unset; right: 20vw;} + 20% {opacity: 1; left: unset; right: 20vw;} + 38% {opacity: 0; left: unset; right: 20vw;} + 39% {opacity: 0; left: 20vw; right: unset;} + 40% {opacity: 1; left: 20vw; right: unset;} + 58% {opacity: 0; left: 20vw; right: unset;} + 59% {opacity: 0; left: unset;right: 60vw;} + 60% {opacity: 1; left: unset; right: 60vw;} + 78% {opacity: 0; left: unset; right: 60vw;} + 79% {opacity: 0; left: 80vw; right: unset;} + 80% {opacity: 1; left: 80vw; right: unset;} + 98% {opacity: 0; left: 80vw; right: unset;} + 99% {opacity: 0; left: 0; right: unset;} + 100% {opacity: 1; left: 0; right: unset;} } @keyframes ricardo3 { - 50% {transform: translateX(105vw);} - 51% {transform: translate(105vw,-86vh) rotate(180deg);} - 100% {transform: translate(-15vw,-86vh) rotate(180deg);} -} - -@media (max-width: 768px) { - @keyframes ricardo3 { - 50% {transform: translateX(105vw);} - 51% {transform: translate(105vw,-86vh) rotate(180deg);} - 100% {transform: translate(-70vw,-86vh) rotate(180deg);} - } -} - -/*glow*/ -.glow .post-title, .glow a, .glow .post-meta *, .glow .user-info *, .glow .comment-text, .glow .comment-actions *, .glow { - color:lightgreen !important; - text-shadow:1px 1px 1px darkgreen, 0 0 5px green; -} - -.glow .score-up, .glow .active.arrow-up::before, .glow .arrow-up::after, .glow .arrow-up:hover::before { - color: lime !important; -} - -.glow .score-down, .glow .active.arrow-down::before, .glow .arrow-down::after, .glow .arrow-down:hover::before { - color: lime !important; -} - -.glow .arrow-up::before, .glow .arrow-down::before, .glow .score { - color: lightgreen; -} - -.glow .post-body a, .glow .comment-text a { - text-decoration: underline; -} - -/*train*/ -.train { - position:fixed; - z-index:9999; - pointer-events: none; -} - -.trainimg { - width: 100px !important; - height: 51px !important; -} - -@media (max-width: 992px) { - .trainimg { - width: 40px !important; - height: 20px !important; - } -} - -.train1 { - top: 10% -} - -.train2 { - top: 35% -} - -.train3 { - top: 60% -} - -.train4 { - top: 85% -} - -/*scooter*/ -.scooterimg { - width: 100px !important; - height: 135px !important; -} -@media (max-width: 992px) { - .scooterimg { - width: 40px !important; - height: 54px !important; - } -} - -/*seal*/ -.seal { - position:fixed; - z-index:9999; - pointer-events: none; - width: 100% !important; - height: 100% !important; -} - -.sealimg { - width: 100px !important; - height: 89.5px !important; -} -@media (max-width: 992px) { - .sealimg { - width: 30px !important; - height: 27px !important; - } -} - -@keyframes moveX { - from {} to {transform: translateX(98vw)} -} - -@keyframes moveY { - from {} to {transform: translateY(90vh)} -} - -.seal1 { - animation: moveX 4s linear 0s infinite alternate !important; -} - -.seal1 > img { - animation: moveY 6.8s linear 0s infinite alternate !important; -} - -.seal2 { - animation: moveX 5s linear 0s infinite alternate-reverse !important; -} - -.seal2 > img { - animation: moveY 8s linear 0s infinite alternate-reverse !important; -} - -.seal3 { - animation: moveX 4s linear 0s infinite alternate !important; -} -.seal3 > img { - animation: moveY 5s linear 0s infinite alternate-reverse !important; -} - -.seal4 { - animation: moveX 5s linear 0s infinite alternate-reverse !important; -} -.seal4 > img { - animation: moveY 6.8s linear 0s infinite alternate !important; + 50% {transform: translateX(100vw); top: unset; bottom: 0;} + 51% {transform: translateX(100vw) rotate(180deg); top: 0; bottom: unset;} + 100% {transform: translateX(-15vw) rotate(180deg); top: 0; bottom: unset;} } diff --git a/files/assets/css/main.css b/files/assets/css/main.css index 959ff605c..d1b8ed168 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -1853,7 +1853,7 @@ button.close { color: #fff; text-align: center; background-color: #000; - border-radius: 0.35rem; + border-radius: 0.2rem; } .popover { position: absolute; @@ -3528,6 +3528,11 @@ small, .small { .post-meta::-webkit-scrollbar { display: none; } + +.ghost-post .post-meta { + height: 30px; +} + .sub-flair { padding: 3px 5px 2px 5px; border-radius: 5px; @@ -5022,6 +5027,23 @@ img[src="/i/hand.webp"]+img[glow]:not([data-src]) { pat-pfp-anim .3s infinite; } +.glow .post-title, .glow a, .glow .post-meta *, .glow .user-info *, .glow .comment-text, .glow .comment-actions *, .glow { + color:lightgreen !important; + text-shadow:1px 1px 1px darkgreen, 0 0 5px green; +} +.glow .score-up, .glow .active.arrow-up::before, .glow .arrow-up::after, .glow .arrow-up:hover::before { + color: lime !important; +} +.glow .score-down, .glow .active.arrow-down::before, .glow .arrow-down::after, .glow .arrow-down:hover::before { + color: lime !important; +} +.glow .arrow-up::before, .glow .arrow-down::before, .glow .score { + color: lightgreen; +} +.glow .post-body a, .glow .comment-text a { + text-decoration: underline; +} + @keyframes rb { 10% { color: red; } 20% { color: orange; } @@ -6379,3 +6401,18 @@ div.markdown { object-fit: cover; max-height: min(42vh,30vw) !important; } + +.modlog-action { + display: flex; + flex-wrap: wrap; + background: var(--gray-600) !important; + position: relative; + align-items: center; + justify-content: space-between; + overflow-wrap: anywhere; + padding: 1rem 1rem 1rem 1rem; +} + +.modlog-action:not(:first-of-type) { + border-top: 1px solid var(--gray-400) !important; +} diff --git a/files/assets/images/emojis/brookscringe.webp b/files/assets/images/emojis/brookscringe.webp index 47b5b481b..220acd55e 100644 Binary files a/files/assets/images/emojis/brookscringe.webp and b/files/assets/images/emojis/brookscringe.webp differ diff --git a/files/assets/images/rDrama/banners/147.webp b/files/assets/images/rDrama/banners/147.webp new file mode 100644 index 000000000..8e74343eb Binary files /dev/null and b/files/assets/images/rDrama/banners/147.webp differ diff --git a/files/assets/images/rDrama/banners/148.webp b/files/assets/images/rDrama/banners/148.webp new file mode 100644 index 000000000..928acd625 Binary files /dev/null and b/files/assets/images/rDrama/banners/148.webp differ diff --git a/files/assets/images/rDrama/banners/149.webp b/files/assets/images/rDrama/banners/149.webp new file mode 100644 index 000000000..3ce6f6d16 Binary files /dev/null and b/files/assets/images/rDrama/banners/149.webp differ diff --git a/files/assets/images/rDrama/sidebar/866.webp b/files/assets/images/rDrama/sidebar/866.webp new file mode 100644 index 000000000..3fc64c898 Binary files /dev/null and b/files/assets/images/rDrama/sidebar/866.webp differ diff --git a/files/assets/js/core.js b/files/assets/js/core.js index 228fbaa0b..c65401dcb 100644 --- a/files/assets/js/core.js +++ b/files/assets/js/core.js @@ -180,14 +180,18 @@ function smoothScrollTop() } // Click navbar to scroll back to top -document.getElementsByTagName('nav')[0].addEventListener('click', (e) => { - if (e.target.id === "navbar" || - e.target.classList.contains("container-fluid") || - e.target.id == "navbarResponsive" || - e.target.id == "logo-container" || - e.target.classList.contains("srd")) - smoothScrollTop(); -}, false); +const nav = document.getElementsByTagName('nav') + +if (nav) { + nav[0].addEventListener('click', (e) => { + if (e.target.id === "navbar" || + e.target.classList.contains("container-fluid") || + e.target.id == "navbarResponsive" || + e.target.id == "logo-container" || + e.target.classList.contains("srd")) + smoothScrollTop(); + }, false); +} // Dynamic shadow when the user scrolls document.addEventListener('scroll',function (event) { @@ -324,13 +328,12 @@ function formatDate(d) { const timestamps = document.querySelectorAll('[data-time]'); for (const e of timestamps) { - const date = new Date(e.dataset.time*1000); - e.innerHTML = formatDate(date); + e.innerHTML = formatDate(new Date(e.dataset.time*1000)); }; function timestamp(str, ti) { - const date = new Date(ti*1000); - document.getElementById(str).setAttribute("data-bs-original-title", formatDate(date)); + const date = formatDate(new Date(ti*1000)); + document.getElementById(str).setAttribute("data-bs-original-title", date); }; function areyousure(t) { @@ -404,9 +407,3 @@ function sendFormXHRSwitch(e) { } ) } - -if ("serviceWorker" in navigator) { - navigator.serviceWorker.register("/service-worker.js?v=3") - .then((registration) => registration.update()) - .catch((e) => console.log("Service worker update failed with error", e)); -} diff --git a/files/assets/offline.html b/files/assets/offline.html index d586c1cd0..e6067c4a4 100644 --- a/files/assets/offline.html +++ b/files/assets/offline.html @@ -1,71 +1,72 @@ No Internet Connection +
- +

No Internet

You need an internet connection to browse this site

diff --git a/files/assets/sitemap.xml b/files/assets/sitemap.xml deleted file mode 100644 index 956da5b3d..000000000 --- a/files/assets/sitemap.xml +++ /dev/null @@ -1,2013 +0,0 @@ - - - - - https://rdrama.net - 2022-06-10T23:42:26+00:00 - 1.00 - - - https://rdrama.net/post/19236/ - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/contact - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/signup - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fmarseys%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fbadges%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Flog%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Ftransfers%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Frandom_user%2F%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Frandom_post%2F%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fcomments%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/holes - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/16583 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/18459 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75878 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/33652 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/35835 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/37677 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/39413 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/19711/a-short-guide-on-how-to - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=hot&t=hour - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=hot&t=week - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=hot&t=month - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=hot&t=year - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=hot&t=all - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=bump&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=top&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=bottom&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=new&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=old&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=controversial&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=comments&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75837/dramafitness-megathread-9-the-biggining-of - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75837 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fsearch%2Fposts%2F%3Fq%3Ddomain%253Atwitter.com%26sort%3Dnew%26t%3Dall - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75977/india-is-currently-feuding-with-the - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75977 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fsearch%2Fposts%2F%3Fq%3Ddomain%253Awsj.com%26sort%3Dnew%26t%3Dall - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75950/grift-zero-of-the-adderall-epidemic - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75950 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75959/twitter-marseytrain-activates-the-nuclear-option - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75959 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75968/marseylove-love-for-metadrama-marseylove - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75968 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/6345 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/5800 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/2663 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/8494 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fsearch%2Fposts%2F%3Fq%3Ddomain%253Areddit.com%26sort%3Dnew%26t%3Dall - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75957/they-hated-her-because-she-told - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75957 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75945/who-factchecks-the-factchecker - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75945 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/76001/scrotes-are-so-fucking-pathetic-omg - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_76001 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fsearch%2Fposts%2F%3Fq%3Ddomain%253Ardrama.net%26sort%3Dnew%26t%3Dall - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75914/gentlemen-ladies-after-a-month-of - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75914 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/58808/alright-dramatards-time-to-vote-marseyridin - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/5526 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75921/this-schizosorenspam-shit-is-annoying-and - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75921 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/h/schizocel/post/75609/replace-soren-with-schizocel-and-this - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/1376 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/2546 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/10092 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/3511 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/560 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/636 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/541 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/4003 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/9334 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/5188 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/h/schizocel/post/75884/the-magnitude-of-convoluted-inside-jokes - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/h/schizocel - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75884 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75989/foid-refused-mandatory-sympathy-while-posting - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75989 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75987/tw-i-need-to-get-a - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75987 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75976/internal-server-error - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75976 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/h/braincels - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75897/jokers-2-is-confirmed - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75994/i-really-love-marseyismywaifu - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75994 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75931/marseyklennyclap - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75931 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75899/do-not-forgive-do-not-forget - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75899 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75913/just-found-out-that-im-trans - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75913 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75981/you-dont-want-to-try-anything - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75981 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75820/what-do-most-people-not-realize - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75820 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fsearch%2Fposts%2F%3Fq%3Ddomain%253Abbc.co.uk%26sort%3Dnew%26t%3Dall - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75819/terf-islanders-decide-theyd-rather-die - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75819 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75815/trans-allies-get-what-they-asked - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75815 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/h/anime - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/h/anime/post/75831/this-is-cirno - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75831 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/7813 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/296 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/1994 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/9397 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/1357 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/8654 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/1203 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/7466 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/7580 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/3016 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/9755 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/5099 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/7615 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/10272 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/9287 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/10881 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/1378 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/1387 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fsearch%2Fposts%2F%3Fq%3Ddomain%253Adailymail.co.uk%26sort%3Dnew%26t%3Dall - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75847/terf-island-people-study-disturbing-moment - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75847 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/75943/serious-question-is-russia-winning-the - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75943 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/id/30 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/post/76000/marseymuhammad-pbuh - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_76000 - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=hot&page=2&t=day - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/?sort=new&t=all - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=%2Fleaderboard%3F - 2022-06-10T23:42:26+00:00 - 0.80 - - - https://rdrama.net/login?redirect=/post/19236/ - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_19236 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/?sort=bottom - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/?sort=new - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/?sort=old - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/?sort=controversial - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_477392 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/477392?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fformatting%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_477413 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/477413?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_478434 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478434?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475015 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475015?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475051 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475051?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475057 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475057?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475105 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475105?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475734 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475734?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475737 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475737?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475766 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475766?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475773 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475773?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475949 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475949?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_476002 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/476002?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/476002 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475919 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_478275 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478275?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_478149 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478149?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_478992 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478992?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_479126 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/479126?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_479546 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/479546?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_478895 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/478895?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475025 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475025?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475043 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475043?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475068 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475068?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475084 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475084?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475089 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475089?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475097 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475097?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475112 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475112?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475220 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475220?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475026 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475026?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475027 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475028 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475028?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475035 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475035?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475085 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475085?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475044 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475044?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475081 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475081?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475140 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475140?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475215 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475215?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_1892325 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/1892325?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_1892423 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/1892423?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_1894344 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/1894344?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475036 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475036?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475134 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475134?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475717 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475717?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_479427 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/479427?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_476009 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/476009?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475038 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475118 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475118?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475159 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475159?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475304 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475304?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475082 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475082?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_475325 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/475325?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_476597 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/19236/marseylaugh-marseylaugh-marseylaugh/476597?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/60443/ - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=hot&t=hour - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=hot&t=week - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=hot&t=month - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=hot&t=year - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=hot&t=all - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=bump&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=top&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=bottom&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=new&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=old&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=controversial&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=comments&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/?sort=hot&page=2&t=day - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/forgot - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/contact? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/marseys? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/badges? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/log? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/transfers? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/random_user/? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/random_post/? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/signup?redirect=/comments? - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/64305/ - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=/holes - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/furry - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Ffurry%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Ffurry%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/moemorphism - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fmoemorphism%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fmoemorphism%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/music - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fmusic%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fmusic%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/random - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Frandom%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Frandom%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fschizocel%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fschizocel%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fanime%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fanime%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/dankchristianmemes - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fdankchristianmemes%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fdankchristianmemes%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/slackernews - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fslackernews%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fslackernews%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/ducks - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fducks%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fducks%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/eevee - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Feevee%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Feevee%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/borgar - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fborgar%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fborgar%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/shrek_dick_dimension - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fshrek_dick_dimension%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fshrek_dick_dimension%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/h/carpathianflorist - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fcarpathianflorist%2Ffollowers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fh%2Fcarpathianflorist%2Fblockers%3F - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_16583 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583?sort=top - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583?sort=bottom - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583?sort=old - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583?sort=controversial - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2099220 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2099220?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2098425 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2098425?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2099170 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2099170?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2098186 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2098186?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097709 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2097709?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2096229 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2096229?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2094034 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2094034?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2093551 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2093551?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2087416 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2087416?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2086725 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2086725?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2084709 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/16583/megathread-posts-here-marseys-or-other/2084709?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=/post/18459 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_18459 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459?sort=top - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459?sort=bottom - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459?sort=old - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459?sort=controversial - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2099175 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2099175?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75637/changelog-hole-improvements-follow-holes-for/2091847?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2093336 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2093336?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2090949 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2090949?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2091000 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2091000?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2089369 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2089369?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2089221 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2089221?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2088542 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2088542?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2088023 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2088023?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2086651 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2086651?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2086711 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2086711?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2091665 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2091665?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2091794 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/18459/marseycapywalking-megathread-for-bugs-and-suggestions/2091794?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2080052 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=/post/75878 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dp_75878 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878?sort=top - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878?sort=bottom - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878?sort=old - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878?sort=controversial - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097292 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097292?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097440 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097440?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097510 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097510?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097560 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097560?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097768 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097768?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097794 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097794?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097830 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097830?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/id/4284 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097659 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097659?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/login?redirect=%2Fvotes%3Flink%3Dc_2097668 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097668?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097707?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097783?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2098316?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2098333?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2099121?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2099067?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097681?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - - https://rdrama.net/post/75878/megathread-post-your-favourite-rdramathemed-oc/2097537?context=8 - 2022-06-10T23:42:26+00:00 - 0.64 - - diff --git a/files/classes/clients.py b/files/classes/clients.py index 86f2e93ba..3e6a5ab2e 100644 --- a/files/classes/clients.py +++ b/files/classes/clients.py @@ -35,7 +35,7 @@ class OauthApp(Base): @property @lazy def permalink(self): - return f"{SITE_FULL}/admin/app/{self.id}/posts" + return f"{SITE_FULL}/admin/app/{self.id}" @lazy def idlist(self, db:scoped_session, page=1): diff --git a/files/classes/comment.py b/files/classes/comment.py index 5972622d3..b1cfa23bd 100644 --- a/files/classes/comment.py +++ b/files/classes/comment.py @@ -49,6 +49,7 @@ class Comment(Base): is_bot = Column(Boolean, default=False) stickied = Column(String) stickied_utc = Column(Integer) + stickied_child_id = Column(Integer) sentto = Column(Integer, ForeignKey("users.id")) app_id = Column(Integer, ForeignKey("oauth_apps.id")) upvotes = Column(Integer, default=1) @@ -139,7 +140,7 @@ class Comment(Base): if self.replies2 != None: return self.replies2 - replies = db.query(Comment).filter_by(parent_comment_id=self.id).order_by(Comment.stickied) + replies = db.query(Comment).filter_by(parent_comment_id=self.id).order_by(Comment.stickied, Comment.stickied_child_id) if not self.parent_submission: sort='old' return sort_objects(sort, replies, Comment, include_shadowbanned=(v and v.can_see_shadowbanned)).all() @@ -242,7 +243,7 @@ class Comment(Base): @lazy def realbody(self, v): - if self.post and self.post.club and not (v and (v.paid_dues or v.id in [self.author_id, self.post.author_id] or (self.parent_comment and v.id == self.parent_comment.author_id))): + if self.post and self.post.club and not (v and (v.paid_dues or v.id in {self.author_id, self.post.author_id} or (self.parent_comment and v.id == self.parent_comment.author_id))): return f"

{CC} ONLY

" if self.deleted_utc != 0 and not (v and (v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or v.id == self.author.id)): return "[Deleted by user]" if self.is_banned and not (v and v.admin_level >= PERMS['POST_COMMENT_MODERATION']) and not (v and v.id == self.author.id): return "" @@ -293,11 +294,14 @@ class Comment(Base): if not self.ghost and self.author.show_sig(v): body += f"
{self.author.sig_html}" + if v: + body = body.replace("!YOU!", v.username) + return body @lazy def plainbody(self, v): - if self.post and self.post.club and not (v and (v.paid_dues or v.id in [self.author_id, self.post.author_id] or (self.parent_comment and v.id == self.parent_comment.author_id))): + if self.post and self.post.club and not (v and (v.paid_dues or v.id in {self.author_id, self.post.author_id} or (self.parent_comment and v.id == self.parent_comment.author_id))): return f"{CC} ONLY" if self.deleted_utc != 0 and not (v and (v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or v.id == self.author.id)): return "[Deleted by user]" if self.is_banned and not (v and v.admin_level >= PERMS['POST_COMMENT_MODERATION']) and not (v and v.id == self.author.id): return "" @@ -308,6 +312,9 @@ class Comment(Base): body = censor_slurs(body, v).replace(':marseytrain:', ':marseytrain:') + if v: + body = body.replace("!YOU!", v.username) + return body @lazy diff --git a/files/classes/submission.py b/files/classes/submission.py index 655ef47ee..526f8112f 100644 --- a/files/classes/submission.py +++ b/files/classes/submission.py @@ -324,6 +324,9 @@ class Submission(Base): if not listing and not self.ghost and self.author.show_sig(v): body += f"
{self.author.sig_html}" + if v: + body = body.replace("!YOU!", v.username) + return body @lazy @@ -337,6 +340,10 @@ class Submission(Base): body = censor_slurs(body, v).replace(':marseytrain:', ':marseytrain:') body = normalize_urls_runtime(body, v) + + if v: + body = body.replace("!YOU!", v.username) + return body @lazy @@ -350,6 +357,9 @@ class Submission(Base): title = censor_slurs(title, v) + if v: + title = title.replace("!YOU!", v.username) + return title @lazy @@ -361,6 +371,9 @@ class Submission(Base): title = censor_slurs(title, v).replace(':marseytrain:', ':marseytrain:') + if v: + title = title.replace("!YOU!", v.username) + return title @property diff --git a/files/classes/user.py b/files/classes/user.py index 71d4fc5fb..468de4f69 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -141,7 +141,6 @@ class User(Base): subscriptions = relationship("Subscription", back_populates="user") following = relationship("Follow", primaryjoin="Follow.user_id==User.id", back_populates="user") followers = relationship("Follow", primaryjoin="Follow.target_id==User.id", back_populates="target") - viewers = relationship("ViewerRelationship", primaryjoin="User.id == ViewerRelationship.user_id") blocking = relationship("UserBlock", lazy="dynamic", primaryjoin="User.id==UserBlock.user_id", back_populates="user") blocked = relationship("UserBlock", lazy="dynamic", primaryjoin="User.id==UserBlock.target_id", back_populates="target") authorizations = relationship("ClientAuth", back_populates="user") @@ -248,7 +247,10 @@ class User(Base): if self.marsify > 1: user_forced_hats.append(val) elif getattr(self, k): - user_forced_hats.append(val) + if k == 'agendaposter': + user_forced_hats.append(random.choice(val)) + else: + user_forced_hats.append(val) if user_forced_hats: return random.choice(user_forced_hats) else: return None @@ -261,7 +263,7 @@ class User(Base): if self.is_cakeday: return '/i/hats/Cakeday.webp' - if self.age < 86400 * 7: + if self.age < NEW_USER_HAT_AGE: return '/i/new-user.webp' if self.forced_hat: @@ -873,6 +875,24 @@ class User(Base): def userblocks(self): return [x[0] for x in g.db.query(UserBlock.target_id).filter_by(user_id=self.id).all()] + def get_relationship_count(self, relationship_cls): + # TODO: deduplicate (see routes/users.py) + if relationship_cls in {SaveRelationship, Subscription}: + query = relationship_cls.submission_id + join = relationship_cls.post + cls = Submission + elif relationship_cls is CommentSaveRelationship: + query = relationship_cls.comment_id + join = relationship_cls.comment + cls = Comment + else: + raise TypeError("Relationships supported is SaveRelationship, Subscription, CommentSaveRelationship") + + query = g.db.query(query).join(join).filter(relationship_cls.user_id == self.id) + if not self.admin_level >= PERMS['POST_COMMENT_MODERATION']: + query = query.filter(cls.is_banned == False, cls.deleted_utc == 0) + return query.count() + @property @lazy def saved_idlist(self): @@ -895,17 +915,17 @@ class User(Base): @property @lazy def saved_count(self): - return g.db.query(SaveRelationship).filter_by(user_id=self.id).count() + return self.get_relationship_count(SaveRelationship) @property @lazy def saved_comment_count(self): - return g.db.query(CommentSaveRelationship).filter_by(user_id=self.id).count() + return self.get_relationship_count(CommentSaveRelationship) @property @lazy def subscribed_count(self): - return g.db.query(Subscription).filter_by(user_id=self.id).count() + return self.get_relationship_count(Subscription) @property @lazy @@ -924,17 +944,6 @@ class User(Base): def can_create_hole(self): return self.admin_level >= PERMS['HOLE_CREATE'] - @property - @lazy - def viewers_recorded(self): - if SITE_NAME == 'WPD': # WPD gets profile views - return True - elif self.admin_level >= PERMS['VIEW_PROFILE_VIEWS']: # Admins get profile views - return True - elif self.patron: # Patrons get profile views as a perk - return True - return False - @property @lazy def patron_tooltip(self): @@ -982,6 +991,7 @@ class User(Base): if not cls.can_see(user, other.author): return False if user and user.id == other.author_id: return True if isinstance(other, Submission): + if "!YOU!" in other.title and not user: return False if other.sub and not cls.can_see(user, other.subr): return False else: if not other.parent_submission: @@ -997,7 +1007,6 @@ class User(Base): return (user and user.id == other.id) or (user and user.can_see_shadowbanned) or not other.shadowbanned return True - @property @lazy def can_see_chudrama(self): @@ -1011,10 +1020,10 @@ class User(Base): @property @lazy def can_post_in_ghost_threads(self): - if not TRUESCORE_GHOST_LIMIT: return True + if not TRUESCORE_GHOST_MINIMUM: return True if self.admin_level >= PERMS['POST_IN_GHOST_THREADS']: return True if self.club_allowed: return True - if self.truescore >= TRUESCORE_GHOST_LIMIT: return True + if self.truescore >= TRUESCORE_GHOST_MINIMUM: return True if self.patron: return True return False diff --git a/files/helpers/actions.py b/files/helpers/actions.py index 472e938e2..092fab7bf 100644 --- a/files/helpers/actions.py +++ b/files/helpers/actions.py @@ -394,14 +394,15 @@ def execute_antispam_duplicate_comment_check(v:User, body_html:str): ''' Sanity check for newfriends ''' + ANTISPAM_DUPLICATE_THRESHOLD = 3 if v.id in ANTISPAM_BYPASS_IDS or v.admin_level: return if v.age >= NOTIFICATION_SPAM_AGE_THRESHOLD: return if len(body_html) < 16: return if body_html == '!wordle': return # wordle compare_time = int(time.time()) - 60 * 60 * 24 - comment = g.db.query(Comment.id).filter(Comment.body_html == body_html, - Comment.created_utc >= compare_time).first() - if not comment: return + count = g.db.query(Comment.id).filter(Comment.body_html == body_html, + Comment.created_utc >= compare_time).count() + if count <= ANTISPAM_DUPLICATE_THRESHOLD: return v.ban(reason="Spamming.", days=0.0) send_repeatable_notification(v.id, "Your account has been banned **permanently** for the following reason:\n\n> Too much spam!") g.db.add(v) @@ -456,18 +457,18 @@ def execute_lawlz_actions(v:User, p:Submission): pin_time = 'for 1 day' ma_1=ModAction( kind="pin_post", - user_id=v.id, + user_id=AUTOJANNY_ID, target_submission_id=p.id, _note=pin_time ) ma_2=ModAction( kind="distinguish_post", - user_id=v.id, + user_id=AUTOJANNY_ID, target_submission_id=p.id ) ma_3=ModAction( kind="flair_post", - user_id=v.id, + user_id=AUTOJANNY_ID, target_submission_id=p.id, _note=f'"{p.flair}"' ) diff --git a/files/helpers/const.py b/files/helpers/const.py index d85d5d025..a3cb980d7 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -95,6 +95,7 @@ AJ_REPLACEMENTS = { SLURS = { "nigger": "BIPOC", + "negroid": "BIPOC", "niglet": 'BIPOClet', "negress": "BIPOC woman", 'nigga': 'neighbor', @@ -145,6 +146,8 @@ if SITE_NAME == 'rDrama': "kys ": "keep yourself safe ", "republican": 'republiKKKan', "america": 'ameriKKKa', + "it's almost as if": "I'm a retard but", + "my brother in christ": "my brother in Allah", } SLURS.update(RDRAMA_SLURS) @@ -153,7 +156,6 @@ PROFANITIES = { 'fuck': 'frick', ' ass ': ' butt ', 'shitting': 'pooping', - 'lmao': 'lmbo', 'damn': 'darn', 'bastard': 'fatherless child', 'bitch': 'b-word', @@ -252,8 +254,6 @@ PERMS = { # Minimum admin_level to perform action. 'VIEW_CHUDRAMA': 1, 'VIEW_PRIVATE_PROFILES': 2, 'VIEW_ALTS': 2, - 'VIEW_PROFILE_VIEWS': 2, - 'VIEW_SORTED_ADMIN_LIST': 3, 'VIEW_ACTIVE_USERS': 2, 'VIEW_ALL_USERS': 2, 'VIEW_ALT_VOTES': 2, @@ -387,13 +387,14 @@ COMMENT_MAX_DEPTH = 200 TRANSFER_MESSAGE_LENGTH_LIMIT = 200 # do not make larger than 10000 characters (comment limit) without altering the table MIN_REPOST_CHECK_URL_LENGTH = 9 # also change the constant in checkRepost() of submit.js CHAT_LENGTH_LIMIT = 1000 -TRUESCORE_DONATE_LIMIT = 100 COSMETIC_AWARD_COIN_AWARD_PCT = 0.10 -TRUESCORE_CHAT_LIMIT = 0 -TRUESCORE_GHOST_LIMIT = 0 +TRUESCORE_CHAT_MINIMUM = 0 +TRUESCORE_DONATE_MINIMUM = 100 +TRUESCORE_GHOST_MINIMUM = 0 LOGGEDIN_ACTIVE_TIME = 15 * 60 PFP_DEFAULT_MARSEY = True +NEW_USER_HAT_AGE = 0 # seconds of age to show new-user forced hat NOTIFICATION_SPAM_AGE_THRESHOLD = 0.5 * 86400 COMMENT_SPAM_LENGTH_THRESHOLD = 50 @@ -435,6 +436,7 @@ MODMAIL_ID = 2 POLL_THREAD = 0 POLL_BET_COINS = 200 +POLL_MAX_OPTIONS = 10 WELCOME_MSG = f"Welcome to {SITE_NAME}!" LOTTERY_TICKET_COST = 12 @@ -456,7 +458,8 @@ MAX_VIDEO_SIZE_MB = 32 MAX_VIDEO_SIZE_MB_PATRON = 64 MAX_IMAGE_CONVERSION_TIMEOUT = 15 # seconds -ANTISPAM_BYPASS_IDS = () +ANTISPAM_BYPASS_IDS = set() +BOOSTED_USERS_EXCLUDED = set() PAGE_SIZE = 25 LEADERBOARD_LIMIT = PAGE_SIZE @@ -490,9 +493,9 @@ if SITE == 'rdrama.net': NOTIFICATION_THREAD = 6489 CHAT_LENGTH_LIMIT = 200 - - TRUESCORE_CHAT_LIMIT = 10 - TRUESCORE_GHOST_LIMIT = 10 + TRUESCORE_CHAT_MINIMUM = 10 + TRUESCORE_GHOST_MINIMUM = 10 + NEW_USER_HAT_AGE = 7 * 86400 HOLE_COST = 50000 HOLE_INACTIVITY_DELETION = True @@ -525,7 +528,34 @@ if SITE == 'rdrama.net': GEESE_ID = 1710 BLACKJACKBTZ_ID = 12732 - ANTISPAM_BYPASS_IDS = (1703, 13427) + ANTISPAM_BYPASS_IDS = {1703, 13427} + + BOOSTED_HOLES = { + 'furry', + 'femboy', + 'anime', + 'gaybros', + 'againsthateholes', + 'masterbaiters', + 'changelog', + } + + BOOSTED_USERS = { + IMPASSIONATA_ID, + PIZZASHILL_ID, + SNAKES_ID, + JUSTCOOL_ID, + 2008, #TransGirlTradWife + 29, #QuadNarca + JOAN_ID, + } + + BOOSTED_USERS_EXCLUDED = { + 8768, + 3402, + 5214, + 12719 + } GIFT_NOTIF_ID = CARP_ID @@ -556,7 +586,7 @@ elif SITE == 'pcmemes.net': AEVANN_ID = 1 SNAKES_ID = 2279 - WELCOME_MSG = "Welcome to pcmemes.net! Don't forget to turn off the slur filter [here](/settings/content#slurreplacer)!" + WELCOME_MSG = "Welcome to pcmemes.net! Don't forget to turn off the slur filter [here](/settings/content#slurreplacer)" LOTTERY_TICKET_COST = 12 LOTTERY_SINK_RATE = -8 @@ -564,42 +594,47 @@ elif SITE == 'pcmemes.net': BANNER_THREAD = 28307 elif SITE == 'watchpeopledie.tv': PIN_LIMIT = 4 - WELCOME_MSG = """Hi, you! Welcome to WatchPeopleDie.tv, this really cool site where you can go to watch people die. I'm @CLiTPEELER! If you have any questions about how things work here, or suggestions on how to make them work better than they already do, definitely slide on into my DMs (no fat chicks).\nThere's an enormously robust suite of fun features we have here and we're always looking for more to add. Way, way too many to go over in an automated welcome message. And you're probably here for the videos of people dying more than any sort of weird, paradoxical digital community aspect anyway, so I won't bore you with a tedious overview of them. Just head on over to [your settings page](https://watchpeopledie.tv/settings/profile) and have a look at some of the basic profile stuff, at least. You can change your profile picture, username, flair, colors, banners, bio, profile anthem (autoplaying song on your page, like it's MySpace or some shit, hell yeah), CSS, all sorts of things.\nOr you can just go back to the main feed and carry on with watching people die. That's what the site is for, after all. Have fun!\nAnyway, in closing, WPD is entirely open source. We don't really need new full-time coders or anything, but if you'd like to take a look at our repo - or even submit a PR to change, fix, or add some things - go right ahead! We are on [GitHub](https://github.com/Aevann1/rDrama).\nWell, that's all. Thanks again for signing up. It's an automated message and all, but I really do mean that. Thank you, specifically. I love you. Romantically. Deeply. Passionately.\nHave fun!""" + WELCOME_MSG = """Hi, you! Welcome to WatchPeopleDie.tv, this really cool site where you can go to watch people die. I'm @CLiTPEELER! If you have any questions about how things work here, or suggestions on how to make them work better than they already do, definitely slide on into my DMs (no fat chicks).\nThere's an enormously robust suite of fun features we have here and we're always looking for more to add. Way, way too many to go over in an automated welcome message. And you're probably here for the videos of people dying more than any sort of weird, paradoxical digital community aspect anyway, so I won't bore you with a tedious overview of them. Just head on over to [your settings page](https://watchpeopledie.tv/settings/profile) and have a look at some of the basic profile stuff, at least. You can change your profile picture, username, flair, colors, banners, bio, profile anthem (autoplaying song on your page, like it's MySpace or some shit, hell yeah), CSS, all sorts of things.\nOr you can just go back to the main feed and carry on with watching people die. That's what the site is for, after all. Have fun!\nAnyway, in closing, WPD is entirely open source. We don't really need new full-time coders or anything, but if you'd like to take a look at our repo - or even submit a PR to change, fix, or add some things - go right ahead! Our codebase lives at [git.rdrama.net](https://git.rdrama.net/).\nWell, that's all. Thanks again for signing up. It's an automated message and all, but I really do mean that. Thank you, specifically. I love you. Romantically. Deeply. Passionately.\nHave fun!""" FEATURES['PATRON_ICONS'] = True PERMS['HOLE_CREATE'] = 2 PERMS['POST_EDITING'] = 2 PERMS['ADMIN_ADD'] = 4 - - ERROR_TITLES[400] = "Bad Request" - ERROR_TITLES[401] = "Unauthorized" - ERROR_TITLES[403] = "Forbidden" - ERROR_TITLES[404] = "Not Found" - ERROR_TITLES[405] = "Method Not Allowed" - ERROR_TITLES[406] = "Too Many Pings" - ERROR_TITLES[409] = "Mortal Conflict" - ERROR_TITLES[410] = "Dead" - ERROR_TITLES[413] = "Payload Too Large" - ERROR_TITLES[415] = "Unsupported Media Type" - ERROR_TITLES[500] = "Internal Server Error" - ERROR_MSGS[400] = "That request is invalid" - ERROR_MSGS[401] = "You need to login or sign up to do that" - ERROR_MSGS[403] = "You're not allowed to do that" - ERROR_MSGS[404] = "That wasn't found" - ERROR_MSGS[405] = "You can't use this method here... if you keep getting this error tell us it's prolly something borked" - ERROR_MSGS[409] = "There's a conflict between what you're trying to do and what you or someone else has done and because of that you can't do what you're trying to do." - ERROR_MSGS[410] = "This link is dead. Request a new one to try again" - ERROR_MSGS[413] = "You need to upload a smaller file please" - ERROR_MSGS[429] = "Please wait a bit before doing that" + + ERROR_TITLES.update({ + 400: "Bad Request", + 401: "Unauthorized", + 403: "Forbidden", + 404: "Not Found", + 405: "Method Not Allowed", + 406: "Too Many Pings", + 409: "Mortal Conflict", + 410: "Dead", + 413: "Payload Too Large", + 415: "Unsupported Media Type", + 500: "Internal Server Error", + }) + + ERROR_MSGS.update({ + 400: "That request is invalid", + 401: "You need to login or sign up to do that", + 403: "You're not allowed to do that", + 404: "That wasn't found", + 405: "You can't use this method here... if you keep getting this error tell us it's prolly something borked", + 409: "There's a conflict between what you're trying to do and what you or someone else has done and because of that you can't do what you're trying to do.", + 410: "This link is dead. Request a new one to try again", + 413: "You need to upload a smaller file please", + 429: "Please wait a bit before doing that", + }) POLL_THREAD = 13225 SIDEBAR_THREAD = 5403 BANNER_THREAD = 9869 - TRUESCORE_CHAT_LIMIT = 10 - TRUESCORE_GHOST_LIMIT = 10 + TRUESCORE_CHAT_MINIMUM = 10 + TRUESCORE_GHOST_MINIMUM = 10 HOLE_NAME = 'flair' HOLE_STYLE_FLAIR = True @@ -1397,6 +1432,7 @@ NOTIFIED_USERS = { 'snakes': SNAKES_ID, 'sneks': SNAKES_ID, 'snekky': SNAKES_ID, + 'snekchad': SNAKES_ID, 'jc': JUSTCOOL_ID, 'justcool': JUSTCOOL_ID, 'geese': GEESE_ID, @@ -1413,9 +1449,7 @@ NOTIFIED_USERS = { } FORTUNE_REPLIES = ('Your fortune: Allah Wills It','Your fortune: Inshallah, Only Good Things Shall Come To Pass','Your fortune: Allah Smiles At You This Day','Your fortune: Your Bussy Is In For A Blasting','Your fortune: You Will Be Propositioned By A High-Tier Twink','Your fortune: Repent, You Have Displeased Allah And His Vengeance Is Nigh','Your fortune: Reply Hazy, Try Again','Your fortune: lmao you just lost 100 coins','Your fortune: Yikes 😬','Your fortune: You Will Be Blessed With Many Black Bulls','Your fortune: NEETmax, The Day Is Lost If You Venture Outside','Your fortune: A Taste Of Jannah Awaits You Today','Your fortune: Watch Your Back','Your fortune: Outlook good','Your fortune: Godly Luck','Your fortune: Good Luck','Your fortune: Bad Luck','Your fortune: Good news will come to you by mail','Your fortune: Very Bad Luck','Your fortune: ｷﾀ━━━━━━(ﾟ∀ﾟ)━━━━━━ !!!!','Your fortune: Better not tell you now','Your fortune: You will meet a dark handsome stranger','Your fortune: （　´_ゝ`）ﾌｰﾝ','Your fortune: Excellent Luck','Your fortune: Average Luck') - FACTCHECK_REPLIES = ('Factcheck: This claim has been confirmed as correct by experts. ','Factcheck: This claim has been classified as misogynistic.','Factcheck: This claim is currently being debunked.','Factcheck: This claim is 100% true.','Factcheck: This claim hurts trans lives.','Factcheck: [REDACTED].','Factcheck: This claim is both true and false.','Factcheck: You really believe that shit? Lmao dumbass nigga 🤣','Factcheck: None of this is real.','Factcheck: Yes.','Factcheck: This claim has not been approved by experts.','Factcheck: This claim is a gross exageration of reality.','Factcheck: WARNING! THIS CLAIM HAS BEEN CLASSIFIED AS DANGEROUS. PLEASE REMAIN STILL, AN AGENT WILL COME TO MEET YOU SHORTLY.') - EIGHTBALL_REPLIES = ('The 8-Ball Says: It is certain.', 'The 8-Ball Says: It is decidedly so.', 'The 8-Ball Says: Without a doubt.', 'The 8-Ball Says: Yes definitely.', 'The 8-Ball Says: You may rely on it.', 'The 8-Ball Says: As I see it, yes.', 'The 8-Ball Says: Most likely.', 'The 8-Ball Says: Outlook good.', 'The 8-Ball Says: Yes.', 'The 8-Ball Says: Signs point to yes.', 'The 8-Ball Says: Reply hazy, try again.', 'The 8-Ball Says: Ask again later.', 'The 8-Ball Says: Better not tell you now.', 'The 8-Ball Says: Cannot predict now.', 'The 8-Ball Says: Concentrate and ask again.', 'The 8-Ball Says: Don\'t count on it.', 'The 8-Ball Says: My reply is no.', 'The 8-Ball Says: My sources say no.', 'The 8-Ball Says: Outlook not so good.', 'The 8-Ball Says: Very doubtful.') REDDIT_NOTIFS_SITE = set() @@ -1582,7 +1616,12 @@ forced_hats = { "earlylife": ("The Merchant", "SHUT IT DOWN, the goys know!"), "marsify": ("Marsified", "I can't pick my own Marseys, help!"), "is_suspended": ("Behind Bars", "This user is banned and needs to do better!"), - "agendaposter": ("Egg_irl", "This user is getting in touch with xir identity!") + "agendaposter": (("Egg_irl", "This user is getting in touch with xir identity!"), + ("Trans Flag", "Just in case you forgot, trans lives matter."), + ("Trans Flag II", "Your egg is cracked; wear it with pride!"), + ("Pride Flag", "Never forget that this is a primarily gay community. Dude bussy lmao."), + ("Pride Flag II", "This user is a proud supporter of LGBTQ+ rights.")) + } EMAIL_REGEX_PATTERN = '[A-Za-z0-9._%+-]{1,64}@[A-Za-z0-9.-]{2,63}\.[A-Za-z]{2,63}' @@ -1656,6 +1695,7 @@ if SITE_NAME == 'rDrama': 'backloggd.com', 'tildes.net', 'blacktwitterapp.com', + 'dailystormer.in', #fediverse 'rdrama.cc', @@ -1670,26 +1710,6 @@ if SITE_NAME == 'rDrama': 'seal.cafe', } - BOOSTED_HOLES = { - 'furry', - 'femboy', - 'anime', - 'gaybros', - 'againsthateholes', - 'masterbaiters', - 'changelog', - } - - BOOSTED_USERS = { - IMPASSIONATA_ID, - PIZZASHILL_ID, - SNAKES_ID, - JUSTCOOL_ID, - 2008, #TransGirlTradWife - } - - BOOSTED_USERS_EXCLUDED = {8768, 5214, 12719, 3402} - IMAGE_FORMATS = ['png','gif','jpg','jpeg','webp'] VIDEO_FORMATS = ['mp4','webm','mov','avi','mkv','flv','m4v','3gp'] AUDIO_FORMATS = ['mp3','wav','ogg','aac','m4a','flac'] diff --git a/files/helpers/get.py b/files/helpers/get.py index 33ec03736..a84bd5be4 100644 --- a/files/helpers/get.py +++ b/files/helpers/get.py @@ -2,7 +2,7 @@ from typing import Callable, Iterable, List, Optional, Union from flask import * from sqlalchemy import and_, any_, or_ -from sqlalchemy.orm import joinedload, selectinload +from sqlalchemy.orm import joinedload, selectinload, Query from files.classes import Comment, CommentVote, Hat, Sub, Submission, User, UserBlock, Vote from files.helpers.const import AUTOJANNY_ID @@ -145,7 +145,7 @@ def get_post(i:Union[str, int], v:Optional[User]=None, graceful=False) -> Option return x -def get_posts(pids:Iterable[int], v:Optional[User]=None, eager:bool=False) -> List[Submission]: +def get_posts(pids:Iterable[int], v:Optional[User]=None, eager:bool=False, extra:Optional[Callable[[Query], Query]]=None) -> List[Submission]: if not pids: return [] if v: @@ -178,6 +178,8 @@ def get_posts(pids:Iterable[int], v:Optional[User]=None, eager:bool=False) -> Li else: query = g.db.query(Submission).filter(Submission.id.in_(pids)) + if extra: query = extra(query) + if eager: query = query.options( selectinload(Submission.author).options( @@ -226,7 +228,7 @@ def add_block_props(target:Union[Submission, Comment, User], v:Optional[User]): if not v: return target id = None - if any(isinstance(target, cls) for cls in [Submission, Comment]): + if any(isinstance(target, cls) for cls in {Submission, Comment}): id = target.author_id elif isinstance(target, User): id = target.id @@ -276,12 +278,14 @@ def add_vote_and_block_props(target:Union[Submission, Comment], v:Optional[User] target = add_block_props(target, v) return add_vote_props(target, v, vote_cls) -def get_comments(cids:Iterable[int], v:Optional[User]=None) -> List[Comment]: +def get_comments(cids:Iterable[int], v:Optional[User]=None, extra:Optional[Callable[[Query], Query]]=None) -> List[Comment]: if not cids: return [] if v: - output = get_comments_v_properties(v, True, None, Comment.id.in_(cids))[1] + output = get_comments_v_properties(v, True, None, Comment.id.in_(cids))[1] # TODO: support 'extra' for get_comments_v_properties else: - output = g.db.query(Comment).join(Comment.author).filter(User.shadowbanned == None, Comment.id.in_(cids)).all() + output = g.db.query(Comment).join(Comment.author) + if extra: output = extra(output) + output = output.filter(User.shadowbanned == None, Comment.id.in_(cids)).all() return sorted(output, key=lambda x: cids.index(x.id)) def get_comments_v_properties(v:User, include_shadowbanned=True, should_keep_func:Optional[Callable[[Comment], bool]]=None, *criterion): diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py index 21b3315f5..6a156e486 100644 --- a/files/helpers/sanitize.py +++ b/files/helpers/sanitize.py @@ -52,7 +52,7 @@ def allowed_attributes(tag, name, value): if name == 'style': return True if tag == 'marquee': - if name in ['direction', 'behavior', 'scrollamount']: return True + if name in {'direction', 'behavior', 'scrollamount'}: return True if name in {'height', 'width'}: try: value = int(value.replace('px', '')) except: return False @@ -67,11 +67,11 @@ def allowed_attributes(tag, name, value): return False if tag == 'img': - if name in ['src','data-src']: return is_safe_url(value) + if name in {'src','data-src'}: return is_safe_url(value) if name == 'loading' and value == 'lazy': return True if name == 'data-bs-toggle' and value == 'tooltip': return True - if name in ['g','b','glow'] and not value: return True - if name in ['alt','title']: return True + if name in {'g','b','glow'} and not value: return True + if name in {'alt','title'}: return True return False if tag == 'lite-youtube': @@ -426,8 +426,8 @@ def allowed_attributes_emojis(tag, name, value): if name == 'src' and value.startswith('/') and '\\' not in value: return True if name == 'loading' and value == 'lazy': return True if name == 'data-bs-toggle' and value == 'tooltip': return True - if name in ['g','glow'] and not value: return True - if name in ['alt','title']: return True + if name in {'g','glow'} and not value: return True + if name in {'alt','title'}: return True if tag == 'span': if name == 'data-bs-toggle' and value == 'tooltip': return True diff --git a/files/routes/admin.py b/files/routes/admin.py index 3be5fb03e..6bd254d10 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -546,9 +546,11 @@ def badge_grant_post(v): if desc: new_badge.description = desc url = request.values.get("url") - if '\\' in url: abort(400) - - if url: new_badge.url = url + if url: + if '\\' in url: abort(400) + if url.startswith(SITE_FULL): + url = url.split(SITE_FULL, 1)[1] + new_badge.url = url g.db.add(new_badge) g.db.flush() @@ -829,7 +831,7 @@ def admin_removed_comments(v): try: page = int(request.values.get("page", 1)) except: page = 1 - ids = g.db.query(Comment.id).join(Comment.author).filter(or_(Comment.is_banned==True, User.shadowbanned != None)).order_by(Comment.id.desc()).offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE).all() + ids = g.db.query(Comment.id).join(Comment.author).filter(or_(Comment.is_banned==True, User.shadowbanned != None)).order_by(Comment.id.desc()).offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE + 1).all() ids=[x[0] for x in ids] next_exists = len(ids) > PAGE_SIZE ids = ids[:PAGE_SIZE] @@ -1262,7 +1264,7 @@ def sticky_post(post_id, v): pin_time = 'for 1 hour' code = 200 if v.id != post.author_id: - send_repeatable_notification(post.author_id, f"@{v.username} (Admin) has pinned [{post.title}](/post/{post_id})!") + send_repeatable_notification(post.author_id, f"@{v.username} (Admin) has pinned [{post.title}](/post/{post_id})") else: if pins >= PIN_LIMIT + 1: abort(403, f"Can't exceed {PIN_LIMIT} pinned posts limit!") @@ -1307,7 +1309,7 @@ def unsticky_post(post_id, v): g.db.add(ma) if v.id != post.author_id: - send_repeatable_notification(post.author_id, f"@{v.username} (Admin) has unpinned [{post.title}](/post/{post_id})!") + send_repeatable_notification(post.author_id, f"@{v.username} (Admin) has unpinned [{post.title}](/post/{post_id})") cache.delete_memoized(frontlist) return {"message": "Post unpinned!"} @@ -1329,9 +1331,15 @@ def sticky_comment(cid, v): g.db.add(ma) if v.id != comment.author_id: - message = f"@{v.username} (Admin) has pinned your [comment]({comment.shortlink})!" + message = f"@{v.username} (Admin) has pinned your [comment]({comment.shortlink})" send_repeatable_notification(comment.author_id, message) + c = comment + while c.level > 2: + c = c.parent_comment + c.stickied_child_id = comment.id + g.db.add(c) + return {"message": "Comment pinned!"} @@ -1354,9 +1362,14 @@ def unsticky_comment(cid, v): g.db.add(ma) if v.id != comment.author_id: - message = f"@{v.username} (Admin) has unpinned your [comment]({comment.shortlink})!" + message = f"@{v.username} (Admin) has unpinned your [comment]({comment.shortlink})" send_repeatable_notification(comment.author_id, message) + cleanup = g.db.query(Comment).filter_by(stickied_child_id=comment.id).all() + for c in cleanup: + c.stickied_child_id = None + g.db.add(c) + return {"message": "Comment unpinned!"} diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py index 620cf1348..ef3506564 100644 --- a/files/routes/asset_submissions.py +++ b/files/routes/asset_submissions.py @@ -29,7 +29,7 @@ def asset_submissions(path): @app.get("/submit/marseys") @auth_required -def submit_marseys(v): +def submit_marseys(v:User): if v.admin_level >= PERMS['VIEW_PENDING_SUBMITTED_MARSEYS']: marseys = g.db.query(Marsey).filter(Marsey.submitter_id != None).all() else: @@ -44,7 +44,7 @@ def submit_marseys(v): @app.post("/submit/marseys") @auth_required -def submit_marsey(v): +def submit_marsey(v:User): file = request.files["image"] name = request.values.get('name', '').lower().strip() tags = request.values.get('tags', '').lower().strip() @@ -195,12 +195,12 @@ def remove_asset(cls, type_name:str, v:User, name:str) -> dict[str, str]: @app.post("/remove/marsey/") @auth_required -def remove_marsey(v, name): +def remove_marsey(v:User, name): return remove_asset(Marsey, "marsey", v, name) @app.get("/submit/hats") @auth_required -def submit_hats(v): +def submit_hats(v:User): if v.admin_level >= PERMS['VIEW_PENDING_SUBMITTED_HATS']: hats = g.db.query(HatDef).filter(HatDef.submitter_id != None).all() else: hats = g.db.query(HatDef).filter(HatDef.submitter_id == v.id).all() return render_template("submit_hats.html", v=v, hats=hats) @@ -208,7 +208,7 @@ def submit_hats(v): @app.post("/submit/hats") @auth_required -def submit_hat(v): +def submit_hat(v:User): name = request.values.get('name', '').strip() description = request.values.get('description', '').strip() username = request.values.get('author', '').strip() @@ -328,7 +328,7 @@ def approve_hat(v, name): @app.post("/remove/hat/") @auth_required -def remove_hat(v, name): +def remove_hat(v:User, name): return remove_asset(HatDef, 'hat', v, name) @app.get("/admin/update/marseys") diff --git a/files/routes/awards.py b/files/routes/awards.py index 6b3a18d9f..ee584f8c5 100644 --- a/files/routes/awards.py +++ b/files/routes/awards.py @@ -22,7 +22,7 @@ from .front import frontlist @app.get("/shop") @app.get("/settings/shop") @auth_required -def shop(v): +def shop(v:User): AWARDS = deepcopy(AWARDS2) if v.house: @@ -46,7 +46,7 @@ def shop(v): @app.post("/buy/") @limiter.limit("100/minute;200/hour;1000/day") @auth_required -def buy(v, award): +def buy(v:User, award): if award == 'benefactor' and not request.values.get("mb"): abort(403, "You can only buy the Benefactor award with marseybux.") @@ -200,7 +200,7 @@ def award_thing(v, thing_type, id): author = v elif kind != 'spider': awarded_coins = int(AWARDS[kind]['price'] * COSMETIC_AWARD_COIN_AWARD_PCT) if AWARDS[kind]['cosmetic'] else 0 - if AWARDS[kind]['cosmetic']: + if AWARDS[kind]['cosmetic'] and kind != 'shit': author.pay_account('coins', awarded_coins) msg = f"@{v.username} has given your [{thing_type}]({thing.shortlink}) the {AWARDS[kind]['title']} Award" diff --git a/files/routes/casino.py b/files/routes/casino.py index 93e1a830e..a55f39874 100644 --- a/files/routes/casino.py +++ b/files/routes/casino.py @@ -14,7 +14,7 @@ from files.__main__ import app, limiter @app.get("/casino") @limiter.limit("100/minute;2000/hour;12000/day") @auth_required -def casino(v): +def casino(v:User): if v.rehab: return render_template("casino/rehab.html", v=v), 403 @@ -24,7 +24,7 @@ def casino(v): @app.get("/casino/") @limiter.limit("100/minute;2000/hour;12000/day") @auth_required -def casino_game_page(v, game): +def casino_game_page(v:User, game): if v.rehab: return render_template("casino/rehab.html", v=v), 403 elif game not in CASINO_GAME_KINDS: @@ -53,7 +53,7 @@ def casino_game_page(v, game): @app.get("/casino//feed") @limiter.limit("100/minute;2000/hour;12000/day") @auth_required -def casino_game_feed(v, game): +def casino_game_feed(v:User, game): if v.rehab: abort(403, "You are under Rehab award effect!") elif game not in CASINO_GAME_KINDS: @@ -67,7 +67,7 @@ def casino_game_feed(v, game): @app.get("/lottershe") @limiter.limit("100/minute;2000/hour;12000/day") @auth_required -def lottershe(v): +def lottershe(v:User): if v.rehab: return render_template("casino/rehab.html", v=v) @@ -78,7 +78,7 @@ def lottershe(v): @app.post("/casino/slots") @limiter.limit("100/minute;2000/hour;12000/day") @auth_required -def pull_slots(v): +def pull_slots(v:User): if v.rehab: abort(403, "You are under Rehab award effect!") @@ -109,7 +109,7 @@ def pull_slots(v): @app.post("/casino/twentyone/deal") @limiter.limit("1/second;100/minute;2000/hour;12000/day") @auth_required -def blackjack_deal_to_player(v): +def blackjack_deal_to_player(v:User): if v.rehab: abort(403, "You are under Rehab award effect!") @@ -128,7 +128,7 @@ def blackjack_deal_to_player(v): @app.post("/casino/twentyone/hit") @limiter.limit("1/second;100/minute;2000/hour;12000/day") @auth_required -def blackjack_player_hit(v): +def blackjack_player_hit(v:User): if v.rehab: abort(403, "You are under Rehab award effect!") @@ -143,7 +143,7 @@ def blackjack_player_hit(v): @app.post("/casino/twentyone/stay") @limiter.limit("1/second;100/minute;2000/hour;12000/day") @auth_required -def blackjack_player_stay(v): +def blackjack_player_stay(v:User): if v.rehab: abort(403, "You are under Rehab award effect!") @@ -158,7 +158,7 @@ def blackjack_player_stay(v): @app.post("/casino/twentyone/double-down") @limiter.limit("1/second;100/minute;2000/hour;12000/day") @auth_required -def blackjack_player_doubled_down(v): +def blackjack_player_doubled_down(v:User): if v.rehab: abort(403, "You are under Rehab award effect!") @@ -173,7 +173,7 @@ def blackjack_player_doubled_down(v): @app.post("/casino/twentyone/buy-insurance") @limiter.limit("1/second;100/minute;2000/hour;12000/day") @auth_required -def blackjack_player_bought_insurance(v): +def blackjack_player_bought_insurance(v:User): if v.rehab: abort(403, "You are under Rehab award effect!") @@ -188,7 +188,7 @@ def blackjack_player_bought_insurance(v): @app.get("/casino/roulette/bets") @limiter.limit("100/minute;2000/hour;12000/day") @auth_required -def roulette_get_bets(v): +def roulette_get_bets(v:User): if v.rehab: abort(403, "You are under Rehab award effect!") @@ -200,7 +200,7 @@ def roulette_get_bets(v): @app.post("/casino/roulette/place-bet") @limiter.limit("100/minute;2000/hour;12000/day") @auth_required -def roulette_player_placed_bet(v): +def roulette_player_placed_bet(v:User): if v.rehab: abort(403, "You are under Rehab award effect!") diff --git a/files/routes/chat.py b/files/routes/chat.py index 1fe22bd89..0a0cc3fdc 100644 --- a/files/routes/chat.py +++ b/files/routes/chat.py @@ -39,8 +39,8 @@ user_ids_to_socket_ids = {} @app.get("/chat") @is_not_permabanned def chat(v): - if TRUESCORE_CHAT_LIMIT and v.truescore < TRUESCORE_CHAT_LIMIT and not v.club_allowed: - abort(403, f"Need at least {TRUESCORE_CHAT_LIMIT} truescore for access to chat.") + if TRUESCORE_CHAT_MINIMUM and v.truescore < TRUESCORE_CHAT_MINIMUM and not v.club_allowed: + abort(403, f"Need at least {TRUESCORE_CHAT_MINIMUM} truescore for access to chat.") return render_template("chat.html", v=v, messages=messages) @@ -50,7 +50,7 @@ def chat(v): @ratelimit_user("3/second;10/minute") def speak(data, v): if v.is_banned: return '', 403 - if TRUESCORE_CHAT_LIMIT and v.truescore < TRUESCORE_CHAT_LIMIT and not v.club_allowed: return '', 403 + if TRUESCORE_CHAT_MINIMUM and v.truescore < TRUESCORE_CHAT_MINIMUM and not v.club_allowed: return '', 403 vname = v.username.lower() if vname in muted and not v.admin_level >= PERMS['CHAT_BYPASS_MUTE']: diff --git a/files/routes/comments.py b/files/routes/comments.py index 5dc148383..108fed507 100644 --- a/files/routes/comments.py +++ b/files/routes/comments.py @@ -79,10 +79,11 @@ def post_pid_comment_cid(cid, pid=None, anything=None, v=None, sub=None): else: template = "submission.html" return render_template(template, v=v, p=post, sort=sort, comment_info=comment_info, render_replies=True, sub=post.subr) +#- API @app.post("/comment") @limiter.limit("1/second;20/minute;200/hour;1000/day") -@ratelimit_user("1/second;20/minute;200/hour;1000/day") @auth_required +@ratelimit_user("1/second;20/minute;200/hour;1000/day") def comment(v): if v.is_suspended: abort(403, "You can't perform this action while banned.") @@ -91,7 +92,7 @@ def comment(v): id = parent_fullname[2:] parent_comment_id = None rts = False - + if parent_fullname.startswith("p_"): parent = get_post(id, v=v) parent_post = parent @@ -101,7 +102,7 @@ def comment(v): parent_post = get_post(parent.parent_submission, v=v) parent_comment_id = parent.id if parent.author_id == v.id: rts = True - if not v.can_post_in_ghost_threads and parent_post.ghost: abort(403, f"You need {TRUESCORE_GHOST_LIMIT} truescore to post in ghost threads") + if not v.can_post_in_ghost_threads and parent_post.ghost: abort(403, f"You need {TRUESCORE_GHOST_MINIMUM} truescore to post in ghost threads") else: abort(400) level = 1 if isinstance(parent, Submission) else parent.level + 1 @@ -132,12 +133,12 @@ def comment(v): abort(403, "You can't reply to users who have blocked you or users that you have blocked.") options = [] - for i in poll_regex.finditer(body): + for i in list(poll_regex.finditer(body))[:POLL_MAX_OPTIONS]: options.append(i.group(1)) body = body.replace(i.group(0), "") choices = [] - for i in choice_regex.finditer(body): + for i in list(choice_regex.finditer(body))[:POLL_MAX_OPTIONS]: choices.append(i.group(1)) body = body.replace(i.group(0), "") @@ -359,6 +360,13 @@ def comment(v): check_slots_command(v, v, c) + if c.level > 5: + n = g.db.query(Notification).filter_by( + comment_id=c.parent_comment.parent_comment.parent_comment.parent_comment_id, + user_id=c.parent_comment.author_id, + ).one_or_none() + if n: g.db.delete(n) + g.db.flush() if v.client: return c.json(db=g.db) @@ -368,8 +376,8 @@ def comment(v): @app.post("/edit_comment/") @limiter.limit("1/second;10/minute;100/hour;200/day") -@ratelimit_user("1/second;10/minute;100/hour;200/day") @is_not_permabanned +@ratelimit_user("1/second;10/minute;100/hour;200/day") def edit_comment(cid, v): c = get_comment(cid, v=v) @@ -390,7 +398,7 @@ def edit_comment(cid, v): elif v.bird and len(body) > 140: abort(403, "You have to type less than 140 characters!") - for i in poll_regex.finditer(body): + for i in list(poll_regex.finditer(body))[:POLL_MAX_OPTIONS]: body = body.replace(i.group(0), "") body_html = filter_emojis_only(i.group(1)) if len(body_html) > 500: abort(400, "Poll option too long!") @@ -401,7 +409,7 @@ def edit_comment(cid, v): ) g.db.add(option) - for i in choice_regex.finditer(body): + for i in list(choice_regex.finditer(body))[:POLL_MAX_OPTIONS]: body = body.replace(i.group(0), "") body_html = filter_emojis_only(i.group(1)) if len(body_html) > 500: abort(400, "Poll option too long!") @@ -514,8 +522,8 @@ def pin_comment(cid, v): g.db.add(comment) if v.id != comment.author_id: - if comment.post.ghost: message = f"OP has pinned your [comment]({comment.shortlink})!" - else: message = f"@{v.username} (OP) has pinned your [comment]({comment.shortlink})!" + if comment.post.ghost: message = f"OP has pinned your [comment]({comment.shortlink})" + else: message = f"@{v.username} (OP) has pinned your [comment]({comment.shortlink})" send_repeatable_notification(comment.author_id, message) return {"message": "Comment pinned!"} @@ -537,7 +545,7 @@ def unpin_comment(cid, v): g.db.add(comment) if v.id != comment.author_id: - message = f"@{v.username} (OP) has unpinned your [comment]({comment.shortlink})!" + message = f"@{v.username} (OP) has unpinned your [comment]({comment.shortlink})" send_repeatable_notification(comment.author_id, message) return {"message": "Comment unpinned!"} diff --git a/files/routes/front.py b/files/routes/front.py index 2ed383775..11d8b7109 100644 --- a/files/routes/front.py +++ b/files/routes/front.py @@ -43,7 +43,7 @@ def front_all(v, sub=None, subdomain=None): #### WPD TEMP #### end special front logic if sub: sub = get_sub_by_name(sub, graceful=True) - if sub and not User.can_see(v, sub): abort(403) + if sub and not User.can_see(v, sub): abort(403, "You need 5000 truescore to be able to see /h/chudrama") if (request.path.startswith('/h/') or request.path.startswith('/s/')) and not sub: abort(404) @@ -179,7 +179,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, filter_words=' @app.get("/random_post") @auth_required -def random_post(v): +def random_post(v:User): p = g.db.query(Submission.id).filter(Submission.deleted_utc == 0, Submission.is_banned == False, Submission.private == False).order_by(func.random()).first() @@ -191,7 +191,7 @@ def random_post(v): @app.get("/random_user") @auth_required -def random_user(v): +def random_user(v:User): u = g.db.query(User.username).filter(User.song != None, User.shadowbanned == None).order_by(func.random()).first() if u: u = u[0] @@ -202,7 +202,7 @@ def random_user(v): @app.get("/comments") @auth_required -def all_comments(v): +def all_comments(v:User): try: page = max(int(request.values.get("page", 1)), 1) except: page = 1 diff --git a/files/routes/hats.py b/files/routes/hats.py index 0641efb73..fe7a4b7f8 100644 --- a/files/routes/hats.py +++ b/files/routes/hats.py @@ -9,7 +9,7 @@ from files.__main__ import app, limiter @app.get("/hats") @auth_required -def hats(v): +def hats(v:User): owned_hat_ids = [x.hat_id for x in v.owned_hats] if request.values.get("sort") == 'author_asc': @@ -34,7 +34,7 @@ def hats(v): @app.post("/buy_hat/") @limiter.limit('100/minute;1000/3 days') @auth_required -def buy_hat(v, hat_id): +def buy_hat(v:User, hat_id): try: hat_id = int(hat_id) except: abort(404, "Hat not found!") @@ -84,7 +84,7 @@ def buy_hat(v, hat_id): @app.post("/equip_hat/") @auth_required -def equip_hat(v, hat_id): +def equip_hat(v:User, hat_id): try: hat_id = int(hat_id) except: abort(404, "Hat not found!") @@ -98,7 +98,7 @@ def equip_hat(v, hat_id): @app.post("/unequip_hat/") @auth_required -def unequip_hat(v, hat_id): +def unequip_hat(v:User, hat_id): try: hat_id = int(hat_id) except: abort(404, "Hat not found!") @@ -112,7 +112,7 @@ def unequip_hat(v, hat_id): @app.get("/hat_owners/") @auth_required -def hat_owners(v, hat_id): +def hat_owners(v:User, hat_id): try: hat_id = int(hat_id) except: abort(404, "Hat not found!") diff --git a/files/routes/jinja2.py b/files/routes/jinja2.py index 5017cc3c4..7decd1154 100644 --- a/files/routes/jinja2.py +++ b/files/routes/jinja2.py @@ -61,7 +61,7 @@ def inject_constants(): "TELEGRAM_LINK":TELEGRAM_LINK, "EMAIL_REGEX_PATTERN":EMAIL_REGEX_PATTERN, "CONTENT_SECURITY_POLICY_DEFAULT":CONTENT_SECURITY_POLICY_DEFAULT, "CONTENT_SECURITY_POLICY_HOME":CONTENT_SECURITY_POLICY_HOME, - "TRUESCORE_DONATE_LIMIT":TRUESCORE_DONATE_LIMIT, + "TRUESCORE_DONATE_MINIMUM":TRUESCORE_DONATE_MINIMUM, "DONATE_LINK":DONATE_LINK, "DONATE_SERVICE":DONATE_SERVICE, "BAN_EVASION_DOMAIN":BAN_EVASION_DOMAIN, "HOUSE_JOIN_COST":HOUSE_JOIN_COST, "HOUSE_SWITCH_COST":HOUSE_SWITCH_COST, "IMAGE_FORMATS":IMAGE_FORMATS, "PAGE_SIZES":PAGE_SIZES, "THEMES":THEMES, "COMMENT_SORTS":COMMENT_SORTS, "SORTS":SORTS, diff --git a/files/routes/login.py b/files/routes/login.py index 6cd003703..47175ff44 100644 --- a/files/routes/login.py +++ b/files/routes/login.py @@ -21,7 +21,7 @@ NO_LOGIN_REDIRECT_URLS = ("/login", "/logout", "/signup", "/forgot", "/reset", " @app.get("/login") @auth_desired -def login_get(v): +def login_get(v:Optional[User]): redir = request.values.get("redirect", "/").strip().rstrip('?').lower() if redir: if not is_site_url(redir) or redir in NO_LOGIN_REDIRECT_URLS: @@ -106,14 +106,14 @@ def login_post(): redir = request.values.get("redirect", "").strip().rstrip('?').lower() if redir: - if is_site_url(redir) and redir in NO_LOGIN_REDIRECT_URLS: + if is_site_url(redir) and redir not in NO_LOGIN_REDIRECT_URLS: return redirect(redir) return redirect('/') def log_failed_admin_login_attempt(account:User, type:str): if not account or account.admin_level < PERMS['SITE_WARN_ON_INVALID_AUTH']: return ip = get_CF() - print(f"Admin user from {ip} failed to login to account @{account.user_name} (invalid {type})!") + print(f"Admin user from {ip} failed to login to account @{account.user_name} (invalid {type})") try: with open("/admin_failed_logins", "a+", encoding="utf-8") as f: t = str(time.strftime("%d/%B/%Y %H:%M:%S UTC", time.gmtime(time.time()))) @@ -131,7 +131,7 @@ def on_login(account, redir=None): @app.get("/me") @app.get("/@me") @auth_required -def me(v): +def me(v:User): if v.client: return v.json else: return redirect(v.url) @@ -149,9 +149,9 @@ def logout(v): @app.get("/signup") @auth_desired -def sign_up_get(v): +def sign_up_get(v:Optional[User]): if not get_setting('Signups'): - return {"error": "New account registration is currently closed. Please come back later."}, 403 + abort(403, "New account registration is currently closed. Please come back later.") if v: return redirect(SITE_FULL) @@ -199,9 +199,9 @@ def sign_up_get(v): @app.post("/signup") @limiter.limit("1/second;10/day") @auth_desired -def sign_up_post(v): +def sign_up_post(v:Optional[User]): if not get_setting('Signups'): - return {"error": "New account registration is currently closed. Please come back later."}, 403 + abort(403, "New account registration is currently closed. Please come back later.") if v: abort(403) @@ -235,6 +235,7 @@ def sign_up_post(v): return signup_error("There was a problem. Please try again.") if not hmac.compare_digest(correct_formkey, form_formkey): + if SITE == 'localhost': return signup_error("There was a problem. Please try again!") return signup_error("There was a problem. Please try again.") if not request.values.get( @@ -339,7 +340,7 @@ def sign_up_post(v): redir = request.values.get("redirect", "").strip().rstrip('?').lower() if redir: - if is_site_url(redir) or redir in NO_LOGIN_REDIRECT_URLS: + if is_site_url(redir) or redir not in NO_LOGIN_REDIRECT_URLS: return redirect(redir) return redirect('/') @@ -416,7 +417,7 @@ def get_reset(): @app.post("/reset") @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @auth_desired -def post_reset(v): +def post_reset(v:Optional[User]): if v: return redirect('/') user_id = request.values.get("user_id") timestamp = 0 @@ -454,7 +455,7 @@ def post_reset(v): @app.get("/lost_2fa") @auth_desired -def lost_2fa(v): +def lost_2fa(v:Optional[User]): if v and not v.mfa_secret: abort(400, "You don't have 2FA enabled") return render_template("login/lost_2fa.html", v=v) diff --git a/files/routes/lottery.py b/files/routes/lottery.py index 4c7ee2953..707dd83af 100644 --- a/files/routes/lottery.py +++ b/files/routes/lottery.py @@ -23,7 +23,7 @@ def lottery_start(v): @app.post("/lottery/buy") @limiter.limit("3/second;100/minute;500/hour;1000/day") @auth_required -def lottery_buy(v): +def lottery_buy(v:User): try: quantity = int(request.values.get("quantity")) except: abort(400, "Invalid ticket quantity.") @@ -40,7 +40,7 @@ def lottery_buy(v): @app.get("/lottery/active") @limiter.limit("3/second;100/minute;500/hour;1000/day") @auth_required -def lottery_active(v): +def lottery_active(v:User): lottery, participants = get_active_lottery_stats() return {"message": "", "stats": {"user": v.lottery_stats, "lottery": lottery, "participants": participants}} diff --git a/files/routes/mail.py b/files/routes/mail.py index 6bb5f7bcb..e49bf29a0 100644 --- a/files/routes/mail.py +++ b/files/routes/mail.py @@ -19,7 +19,7 @@ def verify_email(v): @app.get("/activate") @auth_required -def activate(v): +def activate(v:User): email = request.values.get("email", "").strip().lower() if not email_regex.fullmatch(email): diff --git a/files/routes/notifications.py b/files/routes/notifications.py index 0654abc7d..80be4d52c 100644 --- a/files/routes/notifications.py +++ b/files/routes/notifications.py @@ -68,7 +68,7 @@ def notifications_modmail(v): @app.get("/notifications/messages") @auth_required -def notifications_messages(v): +def notifications_messages(v:User): try: page = max(int(request.values.get("page", 1)), 1) except: page = 1 @@ -137,7 +137,7 @@ def notifications_messages(v): @app.get("/notifications/posts") @auth_required -def notifications_posts(v): +def notifications_posts(v:User): try: page = max(int(request.values.get("page", 1)), 1) except: page = 1 @@ -179,7 +179,7 @@ def notifications_posts(v): @app.get("/notifications/modactions") @auth_required -def notifications_modactions(v): +def notifications_modactions(v:User): try: page = max(int(request.values.get("page", 1)), 1) except: page = 1 @@ -218,7 +218,7 @@ def notifications_modactions(v): @app.get("/notifications/reddit") @auth_required -def notifications_reddit(v): +def notifications_reddit(v:User): try: page = max(int(request.values.get("page", 1)), 1) except: page = 1 @@ -263,7 +263,7 @@ def notifications_reddit(v): @app.get("/notifications") @auth_required -def notifications(v): +def notifications(v:User): try: page = max(int(request.values.get("page", 1)), 1) except: page = 1 diff --git a/files/routes/oauth.py b/files/routes/oauth.py index 3e3f4e9fc..c095d4531 100644 --- a/files/routes/oauth.py +++ b/files/routes/oauth.py @@ -9,7 +9,7 @@ from files.__main__ import app, limiter @app.get("/authorize") @auth_required -def authorize_prompt(v): +def authorize_prompt(v:User): client_id = request.values.get("client_id") application = g.db.query(OauthApp).filter_by(client_id=client_id).one_or_none() if not application: return {"oauth_error": "Invalid `client_id`"}, 401 diff --git a/files/routes/posts.py b/files/routes/posts.py index e145c9002..a70c92483 100644 --- a/files/routes/posts.py +++ b/files/routes/posts.py @@ -1,5 +1,6 @@ import os import time +import html from io import BytesIO from os import path from shutil import copyfile @@ -122,7 +123,7 @@ def publish(pid, v): @app.get("/submit") @app.get("/h//submit") @auth_required -def submit_get(v, sub=None): +def submit_get(v:User, sub=None): sub = get_sub_by_name(sub, graceful=True) if request.path.startswith('/h/') and not sub: abort(404) @@ -310,8 +311,8 @@ def morecomments(v, cid): @app.post("/edit_post/") @limiter.limit("1/second;10/minute;100/hour;200/day") -@ratelimit_user("1/second;10/minute;100/hour;200/day") @is_not_permabanned +@ratelimit_user("1/second;10/minute;100/hour;200/day") def edit_post(pid, v): p = get_post(pid) if v.id != p.author_id and v.admin_level < PERMS['POST_EDITING']: @@ -360,7 +361,7 @@ def edit_post(pid, v): ) g.db.add(bet) - for i in poll_regex.finditer(body): + for i in list(poll_regex.finditer(body))[:10]: body = body.replace(i.group(0), "") body_html = filter_emojis_only(i.group(1)) if len(body_html) > 500: abort(400, "Poll option too long!") @@ -371,7 +372,7 @@ def edit_post(pid, v): ) g.db.add(option) - for i in choice_regex.finditer(body): + for i in list(choice_regex.finditer(body))[:10]: body = body.replace(i.group(0), "") body_html = filter_emojis_only(i.group(1)) if len(body_html) > 500: abort(400, "Poll option too long!") @@ -392,7 +393,7 @@ def edit_post(pid, v): p.body = body - for text in [p.body, p.title, p.url]: + for text in {p.body, p.title, p.url}: if not execute_blackjack(v, p, text, 'submission'): break if len(body_html) > POST_BODY_HTML_LENGTH_LIMIT: @@ -603,7 +604,7 @@ def is_repost(): @limiter.limit(POST_RATE_LIMIT) @limiter.limit(POST_RATE_LIMIT, key_func=lambda:f'{SITE}-{session.get("lo_user")}') @auth_required -def submit_post(v, sub=None): +def submit_post(v:User, sub=None): url = request.values.get("url", "").strip() @@ -754,12 +755,12 @@ def submit_post(v, sub=None): body = body.replace(i.group(0), "") options = [] - for i in poll_regex.finditer(body): + for i in list(poll_regex.finditer(body))[:10]: options.append(i.group(1)) body = body.replace(i.group(0), "") choices = [] - for i in choice_regex.finditer(body): + for i in list(choice_regex.finditer(body))[:10]: choices.append(i.group(1)) body = body.replace(i.group(0), "") @@ -810,7 +811,7 @@ def submit_post(v, sub=None): g.db.add(post) g.db.flush() - for text in [post.body, post.title, post.url]: + for text in {post.body, post.title, post.url}: if not execute_blackjack(v, post, text, 'submission'): break if v and v.admin_level >= PERMS['POST_BETS']: @@ -1072,9 +1073,10 @@ extensions = IMAGE_FORMATS + VIDEO_FORMATS + AUDIO_FORMATS @app.get("/submit/title") @limiter.limit("3/minute") -@ratelimit_user("3/minute") @auth_required +@ratelimit_user("3/minute") def get_post_title(v): + POST_TITLE_TIMEOUT = 5 url = request.values.get("url") if not url or '\\' in url: abort(400) url = url.strip() @@ -1084,7 +1086,8 @@ def get_post_title(v): if any((checking_url.endswith(f'.{x}') for x in extensions)): abort(400) - try: x = requests.get(url, headers=titleheaders, timeout=5, proxies=proxies) + try: + x = gevent.with_timeout(POST_TITLE_TIMEOUT, requests.get, url, headers=titleheaders, timeout=POST_TITLE_TIMEOUT, proxies=proxies) except: abort(400) content_type = x.headers.get("Content-Type") @@ -1096,4 +1099,6 @@ def get_post_title(v): title = match.group(1) else: abort(400) + title = html.unescape(title) + return {"url": url, "title": title} diff --git a/files/routes/search.py b/files/routes/search.py index 6b848b525..7515357aa 100644 --- a/files/routes/search.py +++ b/files/routes/search.py @@ -45,7 +45,7 @@ def searchparse(text): @app.get("/search/posts") @auth_required -def searchposts(v): +def searchposts(v:User): query = request.values.get("q", '').strip() @@ -181,7 +181,7 @@ def searchposts(v): @app.get("/search/comments") @auth_required -def searchcomments(v): +def searchcomments(v:User): query = request.values.get("q", '').strip() try: page = max(1, int(request.values.get("page", 1))) @@ -276,7 +276,7 @@ def searchcomments(v): @app.get("/search/users") @auth_required -def searchusers(v): +def searchusers(v:User): query = request.values.get("q", '').strip() diff --git a/files/routes/settings.py b/files/routes/settings.py index cfe3f02fd..e5bcfed5a 100644 --- a/files/routes/settings.py +++ b/files/routes/settings.py @@ -26,12 +26,12 @@ from files.__main__ import app, cache, limiter @app.get("/settings") @auth_required -def settings(v): +def settings(v:User): return redirect("/settings/personal") @app.get("/settings/personal") @auth_required -def settings_personal(v): +def settings_personal(v:User): return render_template("settings/personal.html", v=v) @app.delete('/settings/background') @@ -301,7 +301,7 @@ def settings_personal_post(v): @app.post("/settings/filters") @auth_required -def filters(v): +def filters(v:User): filters=request.values.get("filters")[:1000].strip() if filters == v.custom_filter_list: @@ -540,7 +540,7 @@ def settings_images_banner(v): @app.get("/settings/css") @auth_required -def settings_css_get(v): +def settings_css_get(v:User): return render_template("settings/css.html", v=v) @app.post("/settings/css") @@ -572,7 +572,7 @@ def settings_profilecss(v): @app.get("/settings/security") @auth_required -def settings_security(v): +def settings_security(v:User): return render_template("settings/security.html", v=v, mfa_secret=pyotp.random_base32() if not v.mfa_secret else None, @@ -581,8 +581,8 @@ def settings_security(v): @app.post("/settings/block") @limiter.limit("1/second;20/day") -@ratelimit_user("1/second;20/day") @auth_required +@ratelimit_user("1/second;20/day") def settings_block_user(v): user = get_user(request.values.get("username"), graceful=True) if not user: abort(404, "This user doesn't exist.") @@ -622,12 +622,12 @@ def settings_unblock_user(v): @app.get("/settings/apps") @auth_required -def settings_apps(v): +def settings_apps(v:User): return render_template("settings/apps.html", v=v) @app.get("/settings/advanced") @auth_required -def settings_advanced_get(v): +def settings_advanced_get(v:User): return render_template("settings/advanced.html", v=v) @app.post("/settings/name_change") @@ -671,8 +671,8 @@ def settings_name_change(v): @app.post("/settings/song_change_mp3") @feature_required('USERS_PROFILE_SONG') @limiter.limit("3/second;10/day") -@ratelimit_user("3/second;10/day") @auth_required +@ratelimit_user("3/second;10/day") def settings_song_change_mp3(v): file = request.files['file'] if file.content_type != 'audio/mpeg': @@ -699,8 +699,8 @@ def settings_song_change_mp3(v): @app.post("/settings/song_change") @feature_required('USERS_PROFILE_SONG') @limiter.limit("3/second;10/day") -@ratelimit_user("3/second;10/day") @auth_required +@ratelimit_user("3/second;10/day") def settings_song_change(v): song=request.values.get("song").strip() diff --git a/files/routes/static.py b/files/routes/static.py index 6c90bc49f..a5db159bd 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -25,7 +25,7 @@ def rdrama(id, title): @app.get("/marseys") @auth_required -def marseys(v): +def marseys(v:User): if SITE == 'rdrama.net': marseys = g.db.query(Marsey, User).join(User, Marsey.author_id == User.id).filter(Marsey.submitter_id==None) sort = request.values.get("sort", "usage") @@ -74,13 +74,13 @@ def marsey_list(): @app.get('/sidebar') @auth_desired -def sidebar(v): +def sidebar(v:Optional[User]): return render_template('sidebar.html', v=v) @app.get("/stats") @auth_required -def participation_stats(v): +def participation_stats(v:User): if v.client: return stats_cached() return render_template("stats.html", v=v, title="Content Statistics", data=stats_cached()) @@ -94,12 +94,12 @@ def chart(): @app.get("/weekly_chart") @auth_required -def weekly_chart(v): +def weekly_chart(v:User): return send_file(statshelper.chart_path(kind="weekly", site=SITE)) @app.get("/daily_chart") @auth_required -def daily_chart(v): +def daily_chart(v:User): return send_file(statshelper.chart_path(kind="daily", site=SITE)) @app.get("/patrons") @@ -115,18 +115,14 @@ def patrons(v): @app.get("/admins") @app.get("/badmins") @auth_required -def admins(v): - if v.admin_level >= PERMS['VIEW_SORTED_ADMIN_LIST']: - admins = g.db.query(User).filter(User.admin_level>1).order_by(User.truescore.desc()).all() - admins += g.db.query(User).filter(User.admin_level==1).order_by(User.truescore.desc()).all() - else: admins = g.db.query(User).filter(User.admin_level>0).order_by(User.truescore.desc()).all() +def admins(v:User): + admins = g.db.query(User).filter(User.admin_level >= PERMS['ADMIN_MOP_VISIBLE']).order_by(User.truescore.desc()).all() return render_template("admins.html", v=v, admins=admins) - @app.get("/log") @app.get("/modlog") @auth_required -def log(v): +def log(v:User): try: page = max(int(request.values.get("page", 1)), 1) except: page = 1 @@ -189,7 +185,7 @@ def log_item(id, v): @app.get("/directory") @auth_required -def static_megathread_index(v): +def static_megathread_index(v:User): return render_template("megathread_index.html", v=v) @app.get("/api") @@ -203,13 +199,13 @@ def api(v): @app.get("/press") @app.get("/media") @auth_desired -def contact(v): +def contact(v:Optional[User]): return render_template("contact.html", v=v) @app.post("/send_admin") @limiter.limit("1/second;1/2 minutes;10/day") -@ratelimit_user("1/second;1/2 minutes;10/day") @auth_required +@ratelimit_user("1/second;1/2 minutes;10/day") def submit_contact(v): body = request.values.get("message") if not body: abort(400) @@ -235,9 +231,7 @@ def submit_contact(v): execute_blackjack(v, new_comment, new_comment.body_html, 'modmail') new_comment.top_comment_id = new_comment.id - admins = g.db.query(User).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL']) - if SITE == 'watchpeopledie.tv': - admins = admins.filter(User.id != AEVANN_ID) + admins = g.db.query(User).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != AEVANN_ID) for admin in admins.all(): notif = Notification(comment_id=new_comment.id, user_id=admin.id) @@ -332,7 +326,7 @@ def badge_list(site): @app.get("/badges") @feature_required('BADGES') @auth_required -def badges(v): +def badges(v:User): badges, counts = badge_list(SITE) return render_template("badges.html", v=v, badges=badges, counts=counts) @@ -353,7 +347,7 @@ def blocks(v): @app.get("/banned") @auth_required -def banned(v): +def banned(v:User): users = g.db.query(User).filter(User.is_banned > 0, User.unban_utc == 0) if not v.can_see_shadowbanned: users = users.filter(User.shadowbanned == None) @@ -362,12 +356,12 @@ def banned(v): @app.get("/formatting") @auth_required -def formatting(v): +def formatting(v:User): return render_template("formatting.html", v=v) @app.get("/app") @auth_desired -def mobile_app(v): +def mobile_app(v:Optional[User]): return render_template("app.html", v=v) @app.get("/service-worker.js") @@ -395,7 +389,7 @@ def transfers_id(id, v): @app.get("/transfers") @auth_required -def transfers(v): +def transfers(v:User): comments = g.db.query(Comment).filter(Comment.author_id == AUTOJANNY_ID, Comment.parent_submission == None, Comment.body_html.like("% has transferred %")).order_by(Comment.id.desc()) diff --git a/files/routes/subs.py b/files/routes/subs.py index 55c5348b4..0e8a06426 100644 --- a/files/routes/subs.py +++ b/files/routes/subs.py @@ -107,7 +107,7 @@ def unexile(v, sub, uid): @app.post("/h//block") @auth_required -def block_sub(v, sub): +def block_sub(v:User, sub): sub = get_sub_by_name(sub).name existing = g.db.query(SubBlock).filter_by(user_id=v.id, sub=sub).one_or_none() @@ -121,7 +121,7 @@ def block_sub(v, sub): @app.post("/h//unblock") @auth_required -def unblock_sub(v, sub): +def unblock_sub(v:User, sub): sub = get_sub_by_name(sub).name if sub == "chudrama" and not v.can_see_chudrama: abort(403) block = g.db.query(SubBlock).filter_by(user_id=v.id, sub=sub).one_or_none() @@ -135,7 +135,7 @@ def unblock_sub(v, sub): @app.post("/h//subscribe") @auth_required -def subscribe_sub(v, sub): +def subscribe_sub(v:User, sub): sub = get_sub_by_name(sub).name existing = g.db.query(SubJoin).filter_by(user_id=v.id, sub=sub).one_or_none() @@ -148,7 +148,7 @@ def subscribe_sub(v, sub): @app.post("/h//unsubscribe") @auth_required -def unsubscribe_sub(v, sub): +def unsubscribe_sub(v:User, sub): sub = get_sub_by_name(sub).name subscribe = g.db.query(SubJoin).filter_by(user_id=v.id, sub=sub).one_or_none() @@ -160,7 +160,7 @@ def unsubscribe_sub(v, sub): @app.post("/h//follow") @auth_required -def follow_sub(v, sub): +def follow_sub(v:User, sub): sub = get_sub_by_name(sub) if sub.name == "chudrama" and not v.can_see_chudrama: abort(403) existing = g.db.query(SubSubscription).filter_by(user_id=v.id, sub=sub.name).one_or_none() @@ -173,7 +173,7 @@ def follow_sub(v, sub): @app.post("/h//unfollow") @auth_required -def unfollow_sub(v, sub): +def unfollow_sub(v:User, sub): sub = get_sub_by_name(sub) subscription = g.db.query(SubSubscription).filter_by(user_id=v.id, sub=sub.name).one_or_none() if subscription: @@ -184,7 +184,7 @@ def unfollow_sub(v, sub): @app.get("/h//mods") @auth_required -def mods(v, sub): +def mods(v:User, sub): sub = get_sub_by_name(sub) if sub.name == "chudrama" and not v.can_see_chudrama: abort(403) users = g.db.query(User, Mod).join(Mod).filter_by(sub=sub.name).order_by(Mod.created_utc).all() @@ -194,7 +194,7 @@ def mods(v, sub): @app.get("/h//exilees") @auth_required -def sub_exilees(v, sub): +def sub_exilees(v:User, sub): sub = get_sub_by_name(sub) if sub.name == "chudrama" and not v.can_see_chudrama: abort(403) users = g.db.query(User, Exile).join(Exile, Exile.user_id==User.id) \ @@ -206,7 +206,7 @@ def sub_exilees(v, sub): @app.get("/h//blockers") @auth_required -def sub_blockers(v, sub): +def sub_blockers(v:User, sub): sub = get_sub_by_name(sub) if sub.name == "chudrama" and not v.can_see_chudrama: abort(403) users = g.db.query(User, SubBlock).join(SubBlock) \ @@ -219,7 +219,7 @@ def sub_blockers(v, sub): @app.get("/h//followers") @auth_required -def sub_followers(v, sub): +def sub_followers(v:User, sub): sub = get_sub_by_name(sub) if sub.name == "chudrama" and not v.can_see_chudrama: abort(403) users = g.db.query(User, SubSubscription).join(SubSubscription) \ @@ -232,8 +232,8 @@ def sub_followers(v, sub): @app.post("/h//add_mod") @limiter.limit("1/second;30/day") -@ratelimit_user("1/second;30/day") @is_not_permabanned +@ratelimit_user("1/second;30/day") def add_mod(v, sub): if SITE_NAME == 'WPD': abort(403) sub = get_sub_by_name(sub).name @@ -457,8 +457,8 @@ def get_sub_css(sub): @app.post("/h//banner") @limiter.limit("1/second;10/day") -@ratelimit_user("1/second;10/day") @is_not_permabanned +@ratelimit_user("1/second;10/day") def sub_banner(v, sub): if g.is_tor: abort(403, "Image uploads are not allowed through TOR.") @@ -490,8 +490,8 @@ def sub_banner(v, sub): @app.post("/h//sidebar_image") @limiter.limit("1/second;10/day") -@ratelimit_user("1/second;10/day") @is_not_permabanned +@ratelimit_user("1/second;10/day") def sub_sidebar(v, sub): if g.is_tor: abort(403, "Image uploads are not allowed through TOR.") @@ -522,8 +522,8 @@ def sub_sidebar(v, sub): @app.post("/h//marsey_image") @limiter.limit("1/second;10/day") -@ratelimit_user("1/second;10/day") @is_not_permabanned +@ratelimit_user("1/second;10/day") def sub_marsey(v, sub): if g.is_tor: abort(403, "Image uploads are not allowed through TOR.") @@ -554,7 +554,7 @@ def sub_marsey(v, sub): @app.get("/holes") @auth_required -def subs(v): +def subs(v:User): subs = g.db.query(Sub, func.count(Submission.sub)).outerjoin(Submission, Sub.name == Submission.sub).group_by(Sub.name).order_by(func.count(Submission.sub).desc()).all() total_users = g.db.query(User).count() return render_template('sub/subs.html', v=v, subs=subs, total_users=total_users) @@ -665,7 +665,7 @@ def mod_pin(cid, v): g.db.add(ma) if v.id != comment.author_id: - message = f"@{v.username} (/h/{comment.post.sub} Mod) has pinned your [comment]({comment.shortlink})!" + message = f"@{v.username} (/h/{comment.post.sub} Mod) has pinned your [comment]({comment.shortlink})" send_repeatable_notification(comment.author_id, message) return {"message": "Comment pinned!"} @@ -691,7 +691,7 @@ def mod_unpin(cid, v): g.db.add(ma) if v.id != comment.author_id: - message = f"@{v.username} (/h/{comment.post.sub} Mod) has unpinned your [comment]({comment.shortlink})!" + message = f"@{v.username} (/h/{comment.post.sub} Mod) has unpinned your [comment]({comment.shortlink})" send_repeatable_notification(comment.author_id, message) return {"message": "Comment unpinned!"} @@ -699,7 +699,7 @@ def mod_unpin(cid, v): @app.get("/h//log") @app.get("/h//modlog") @auth_required -def hole_log(v, sub): +def hole_log(v:User, sub): sub = get_sub_by_name(sub) if sub.name == "chudrama" and not v.can_see_chudrama: abort(403) try: page = max(int(request.values.get("page", 1)), 1) diff --git a/files/routes/users.py b/files/routes/users.py index 605cc1178..e8d2a2a41 100644 --- a/files/routes/users.py +++ b/files/routes/users.py @@ -56,25 +56,25 @@ def upvoters_downvoters(v, username, uid, cls, vote_cls, vote_dir, template, sta @app.get("/@/upvoters//posts") @auth_required -def upvoters_posts(v, username, uid): +def upvoters_posts(v:User, username, uid): return upvoters_downvoters(v, username, uid, Submission, Vote, 1, "userpage/voted_posts.html", None) @app.get("/@/upvoters//comments") @auth_required -def upvoters_comments(v, username, uid): +def upvoters_comments(v:User, username, uid): return upvoters_downvoters(v, username, uid, Comment, CommentVote, 1, "userpage/voted_comments.html", True) @app.get("/@/downvoters//posts") @auth_required -def downvoters_posts(v, username, uid): +def downvoters_posts(v:User, username, uid): return upvoters_downvoters(v, username, uid, Submission, Vote, -1, "userpage/voted_posts.html", None) @app.get("/@/downvoters//comments") @auth_required -def downvoters_comments(v, username, uid): +def downvoters_comments(v:User, username, uid): return upvoters_downvoters(v, username, uid, Comment, CommentVote, -1, "userpage/voted_comments.html", True) def upvoting_downvoting(v, username, uid, cls, vote_cls, vote_dir, template, standalone): @@ -107,25 +107,25 @@ def upvoting_downvoting(v, username, uid, cls, vote_cls, vote_dir, template, sta @app.get("/@/upvoting//posts") @auth_required -def upvoting_posts(v, username, uid): +def upvoting_posts(v:User, username, uid): return upvoting_downvoting(v, username, uid, Submission, Vote, 1, "userpage/voted_posts.html", None) @app.get("/@/upvoting//comments") @auth_required -def upvoting_comments(v, username, uid): +def upvoting_comments(v:User, username, uid): return upvoting_downvoting(v, username, uid, Comment, CommentVote, 1, "userpage/voted_comments.html", True) @app.get("/@/downvoting//posts") @auth_required -def downvoting_posts(v, username, uid): +def downvoting_posts(v:User, username, uid): return upvoting_downvoting(v, username, uid, Submission, Vote, -1, "userpage/voted_posts.html", None) @app.get("/@/downvoting//comments") @auth_required -def downvoting_comments(v, username, uid): +def downvoting_comments(v:User, username, uid): return upvoting_downvoting(v, username, uid, Comment, CommentVote, -1, "userpage/voted_comments.html", True) def user_voted(v, username, cls, vote_cls, template, standalone): @@ -158,19 +158,19 @@ def user_voted(v, username, cls, vote_cls, template, standalone): @app.get("/@/voted/posts") @auth_required -def user_voted_posts(v, username): +def user_voted_posts(v:User, username): return user_voted(v, username, Submission, Vote, "userpage/voted_posts.html", None) @app.get("/@/voted/comments") @auth_required -def user_voted_comments(v, username): +def user_voted_comments(v:User, username): return user_voted(v, username, Comment, CommentVote, "userpage/voted_comments.html", True) @app.get("/grassed") @auth_required -def grassed(v): +def grassed(v:User): users = g.db.query(User).filter(User.ban_reason.like('grass award used by @%')) if not v.can_see_shadowbanned: users = users.filter(User.shadowbanned == None) @@ -179,7 +179,7 @@ def grassed(v): @app.get("/chuds") @auth_required -def chuds(v): +def chuds(v:User): users = g.db.query(User).filter(User.agendaposter == 1) if not v.can_see_shadowbanned: users = users.filter(User.shadowbanned == None) @@ -233,32 +233,30 @@ def all_upvoters_downvoters(v, username, vote_dir, is_who_simps_hates): @app.get("/@/upvoters") @auth_required -def upvoters(v, username): +def upvoters(v:User, username): return all_upvoters_downvoters(v, username, 1, False) @app.get("/@/downvoters") @auth_required -def downvoters(v, username): +def downvoters(v:User, username): return all_upvoters_downvoters(v, username, -1, False) @app.get("/@/upvoting") @auth_required -def upvoting(v, username): +def upvoting(v:User, username): return all_upvoters_downvoters(v, username, 1, True) @app.get("/@/downvoting") @auth_required -def downvoting(v, username): +def downvoting(v:User, username): return all_upvoters_downvoters(v, username, -1, True) @app.post("/@/suicide") @feature_required('USERS_SUICIDE') @limiter.limit("1/second;5/day") -@ratelimit_user("1/second;5/day") @auth_required +@ratelimit_user("1/second;5/day") def suicide(v, username): - - user = get_user(username) suicide = f"Hi there,\n\nA [concerned user](/id/{v.id}) reached out to us about you.\n\nWhen you're in the middle of something painful, it may feel like you don't have a lot of options. But whatever you're going through, you deserve help and there are people who are here for you.\n\nThere are resources available in your area that are free, confidential, and available 24/7:\n\n- Call, Text, or Chat with Canada's [Crisis Services Canada](https://www.crisisservicescanada.ca/en/)\n- Call, Email, or Visit the UK's [Samaritans](https://www.samaritans.org/)\n- Text CHAT to America's [Crisis Text Line](https://www.crisistextline.org/) at 741741.\nIf you don't see a resource in your area above, the moderators keep a comprehensive list of resources and hotlines for people organized by location. Find Someone Now\n\nIf you think you may be depressed or struggling in another way, don't ignore it or brush it aside. Take yourself and your feelings seriously, and reach out to someone.\n\nIt may not feel like it, but you have options. There are people available to listen to you, and ways to move forward.\n\nYour fellow users care about you and there are people who want to help." if not v.shadowbanned: @@ -268,7 +266,7 @@ def suicide(v, username): @app.get("/@/coins") @auth_required -def get_coins(v, username): +def get_coins(v:User, username): user = get_user(username, v=v, include_shadowbanned=False) return {"coins": user.coins} @@ -328,13 +326,13 @@ def transfer_bux(v, username): @app.get("/leaderboard") @auth_required -def leaderboard(v): +def leaderboard(v:User): users = g.db.query(User) if not v.can_see_shadowbanned: users = users.filter(User.shadowbanned == None) coins = Leaderboard("Coins", "coins", "coins", "Coins", None, Leaderboard.get_simple_lb, User.coins, v, lambda u:u.coins, g.db, users) - subscribers = Leaderboard("Followers", "followers", "followers", "Followers", None, Leaderboard.get_simple_lb, User.stored_subscriber_count, v, lambda u:u.stored_subscriber_count, g.db, users) + subscribers = Leaderboard("Followers", "followers", "followers", "Followers", "followers", Leaderboard.get_simple_lb, User.stored_subscriber_count, v, lambda u:u.stored_subscriber_count, g.db, users) posts = Leaderboard("Posts", "post count", "posts", "Posts", "", Leaderboard.get_simple_lb, User.post_count, v, lambda u:u.post_count, g.db, users) comments = Leaderboard("Comments", "comment count", "comments", "Comments", "comments", Leaderboard.get_simple_lb, User.comment_count, v, lambda u:u.comment_count, g.db, users) received_awards = Leaderboard("Awards", "received awards", "awards", "Awards", None, Leaderboard.get_simple_lb, User.received_award_count, v, lambda u:u.received_award_count, g.db, users) @@ -342,14 +340,16 @@ def leaderboard(v): truescore = Leaderboard("Truescore", "truescore", "truescore", "Truescore", None, Leaderboard.get_simple_lb, User.truescore, v, lambda u:u.truescore, g.db, users) badges = Leaderboard("Badges", "badges", "badges", "Badges", None, Leaderboard.get_badge_marsey_lb, Badge.user_id, v, None, g.db, None) - marseys = Leaderboard("Marseys", "Marseys made", "marseys", "Marseys", None, Leaderboard.get_badge_marsey_lb, Marsey.author_id, v, None, g.db, None) if SITE_NAME == 'rDrama' else None blocks = Leaderboard("Blocked", "most blocked", "blocked", "Blocked By", "blockers", Leaderboard.get_blockers_lb, UserBlock.target_id, v, None, g.db, None) owned_hats = Leaderboard("Owned hats", "owned hats", "owned-hats", "Owned Hats", None, Leaderboard.get_hat_lb, User.owned_hats, v, None, g.db, None) - designed_hats = Leaderboard("Designed hats", "designed hats", "designed-hats", "Designed Hats", None, Leaderboard.get_hat_lb, User.designed_hats, v, None, g.db, None) - leaderboards = [coins, coins_spent, truescore, subscribers, posts, comments, received_awards, badges, marseys, blocks, owned_hats, designed_hats] + leaderboards = [coins, coins_spent, truescore, subscribers, posts, comments, received_awards, badges, blocks, owned_hats] + + if SITE == 'rdrama.net': + leaderboards.append(Leaderboard("Designed hats", "designed hats", "designed-hats", "Designed Hats", None, Leaderboard.get_hat_lb, User.designed_hats, v, None, g.db, None)) + leaderboards.append(Leaderboard("Marseys", "Marseys made", "marseys", "Marseys", None, Leaderboard.get_badge_marsey_lb, Marsey.author_id, v, None, g.db, None)) return render_template("leaderboard.html", v=v, leaderboards=leaderboards) @@ -414,8 +414,8 @@ def unsubscribe(v, post_id): @app.post("/@/message") @limiter.limit("1/second;10/minute;20/hour;50/day") -@ratelimit_user("1/second;10/minute;20/hour;50/day") @is_not_permabanned +@ratelimit_user("1/second;10/minute;20/hour;50/day") def message2(v, username): user = get_user(username, v=v, include_blocks=True, include_shadowbanned=False) @@ -479,8 +479,8 @@ def message2(v, username): @app.post("/reply") @limiter.limit("1/second;6/minute;50/hour;200/day") -@ratelimit_user("1/second;6/minute;50/hour;200/day") @auth_required +@ratelimit_user("1/second;6/minute;50/hour;200/day") def messagereply(v): body = sanitize_raw_body(request.values.get("body"), False) if not body and not request.files.get("file"): abort(400, "Message is empty!") @@ -550,9 +550,7 @@ def messagereply(v): top_comment = c.top_comment(g.db) if top_comment.sentto == MODMAIL_ID: - admins = g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != v.id) - if SITE == 'watchpeopledie.tv': - admins = admins.filter(User.id != AEVANN_ID) + admins = g.db.query(User.id).filter(User.admin_level >= PERMS['NOTIFICATIONS_MODMAIL'], User.id != v.id, User.id != AEVANN_ID) admins = [x[0] for x in admins.all()] @@ -626,25 +624,40 @@ def redditor_moment_redirect(username, v): @auth_required def followers(username, v): u = get_user(username, v=v, include_shadowbanned=False) - if u.id == CARP_ID and SITE == 'watchpeopledie.tv': abort(403) if not (v.id == u.id or v.admin_level >= PERMS['USER_FOLLOWS_VISIBLE']): abort(403) + try: page = int(request.values.get("page", 1)) + except: page = 1 + users = g.db.query(Follow, User).join(Follow, Follow.target_id == u.id) \ .filter(Follow.user_id == User.id) \ - .order_by(Follow.created_utc).all() - return render_template("userpage/followers.html", v=v, u=u, users=users) + .order_by(Follow.created_utc.desc()) \ + .offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE + 1).all() + + next_exists = (len(users) > PAGE_SIZE) + users = users[:PAGE_SIZE] + + return render_template("userpage/followers.html", v=v, u=u, users=users, page=page, next_exists=next_exists) @app.get("/@/blockers") @auth_required def blockers(username, v): u = get_user(username, v=v, include_shadowbanned=False) + try: page = int(request.values.get("page", 1)) + except: page = 1 + users = g.db.query(UserBlock, User).join(UserBlock, UserBlock.target_id == u.id) \ .filter(UserBlock.user_id == User.id) \ - .order_by(UserBlock.created_utc).all() - return render_template("userpage/blockers.html", v=v, u=u, users=users) + .order_by(UserBlock.created_utc.desc()) \ + .offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE + 1).all() + + next_exists = (len(users) > PAGE_SIZE) + users = users[:PAGE_SIZE] + + return render_template("userpage/blockers.html", v=v, u=u, users=users, page=page, next_exists=next_exists) @app.get("/@/following") @auth_required @@ -653,18 +666,33 @@ def following(username, v): if not (v.id == u.id or v.admin_level >= PERMS['USER_FOLLOWS_VISIBLE']): abort(403) + try: page = int(request.values.get("page", 1)) + except: page = 1 + users = g.db.query(User).join(Follow, Follow.user_id == u.id) \ .filter(Follow.target_id == User.id) \ - .order_by(Follow.created_utc).all() - return render_template("userpage/following.html", v=v, u=u, users=users) + .order_by(Follow.created_utc.desc()) \ + .offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE + 1).all() -@app.get("/views") + next_exists = (len(users) > PAGE_SIZE) + users = users[:PAGE_SIZE] + + return render_template("userpage/following.html", v=v, u=u, users=users, page=page, next_exists=next_exists) + +@app.get("/@/views") @auth_required -def visitors(v): - if not v.viewers_recorded: - return render_template("errors/patron.html", v=v) - viewers=sorted(v.viewers, key = lambda x: x.last_view_utc, reverse=True) - return render_template("userpage/viewers.html", v=v, viewers=viewers) +def visitors(username, v:User): + u = get_user(username, v=v, include_shadowbanned=False) + + try: page = int(request.values.get("page", 1)) + except: page = 1 + + views = g.db.query(ViewerRelationship).filter_by(user_id=u.id).order_by(ViewerRelationship.last_view_utc.desc()).offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE + 1).all() + + next_exists = (len(views) > PAGE_SIZE) + views = views[:PAGE_SIZE] + + return render_template("userpage/views.html", v=v, u=u, views=views, next_exists=next_exists, page=page) @cache.memoize(timeout=86400) def userpagelisting(user:User, site=None, v=None, page:int=1, sort="new", t="all"): @@ -686,7 +714,7 @@ def u_username(username, v=None): return redirect(SITE_FULL + request.full_path.replace(username, u.username)) is_following = v and u.has_follower(v) - if v and v.id not in (u.id, DAD_ID) and u.viewers_recorded: + if v and v.id != u.id: g.db.flush() view = g.db.query(ViewerRelationship).filter_by(viewer_id=v.id, user_id=u.id).one_or_none() @@ -937,8 +965,7 @@ def user_profile_name(username): return redirect(x.profile_url) def get_saves_and_subscribes(v, template, relationship_cls, page:int, standalone=False): - PAGE_SIZE = 25 - if relationship_cls in [SaveRelationship, Subscription]: + if relationship_cls in {SaveRelationship, Subscription}: query = relationship_cls.submission_id join = relationship_cls.post cls = Submission @@ -951,18 +978,24 @@ def get_saves_and_subscribes(v, template, relationship_cls, page:int, standalone ids = [x[0] for x in g.db.query(query).join(join).filter(relationship_cls.user_id == v.id).order_by(cls.created_utc.desc()).offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE + 1).all()] next_exists = len(ids) > PAGE_SIZE ids = ids[:PAGE_SIZE] + + extra = None + if not v.admin_level >= PERMS['POST_COMMENT_MODERATION']: + extra = lambda q:q.filter(cls.is_banned == False, cls.deleted_utc == 0) + if cls is Submission: - listing = get_posts(ids, v=v, eager=True) + listing = get_posts(ids, v=v, eager=True, extra=extra) elif cls is Comment: - listing = get_comments(ids, v=v) + listing = get_comments(ids, v=v, extra=extra) else: raise TypeError("Only supports Submissions and Comments. This is probably the result of a bug with *this* function") + if v.client: return {"data": [x.json(g.db) for x in listing]} return render_template(template, u=v, v=v, listing=listing, page=page, next_exists=next_exists, standalone=standalone) @app.get("/@/saved/posts") @auth_required -def saved_posts(v, username): +def saved_posts(v:User, username): try: page = max(1, int(request.values.get("page", 1))) except: abort(400, "Invalid page input!") @@ -970,7 +1003,7 @@ def saved_posts(v, username): @app.get("/@/saved/comments") @auth_required -def saved_comments(v, username): +def saved_comments(v:User, username): try: page = max(1, int(request.values.get("page", 1))) except: abort(400, "Invalid page input!") @@ -978,7 +1011,7 @@ def saved_comments(v, username): @app.get("/@/subscribed/posts") @auth_required -def subscribed_posts(v, username): +def subscribed_posts(v:User, username): try: page = max(1, int(request.values.get("page", 1))) except: abort(400, "Invalid page input!") @@ -986,7 +1019,7 @@ def subscribed_posts(v, username): @app.post("/fp/") @auth_required -def fp(v, fp): +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) @@ -1032,7 +1065,7 @@ def toggle_holes(): @app.get("/badge_owners/") @auth_required -def bid_list(v, bid): +def bid_list(v:User, bid): try: bid = int(bid) except: abort(400) @@ -1094,7 +1127,7 @@ kofi_tiers={ @app.post("/settings/kofi") @limiter.limit(DEFAULT_RATELIMIT_SLOWER) @auth_required -def settings_kofi(v): +def settings_kofi(v:User): if not KOFI_TOKEN or KOFI_TOKEN == DEFAULT_CONFIG_VALUE: abort(404) if not (v.email and v.is_activated): abort(400, f"You must have a verified email to verify {patron} status and claim your rewards!") diff --git a/files/routes/votes.py b/files/routes/votes.py index 5d6d21e4e..ad6e5a282 100644 --- a/files/routes/votes.py +++ b/files/routes/votes.py @@ -42,7 +42,7 @@ def vote_info_get(v, link): def vote_post_comment(target_id, new, v, cls, vote_cls): if new == "-1" and DISABLE_DOWNVOTES: abort(403) - if new not in ["-1", "0", "1"]: abort(400) + if new not in {"-1", "0", "1"}: abort(400) if v.client and v.id not in PRIVILEGED_USER_BOTS: abort(403) new = int(new) target = None diff --git a/files/templates/admin/app.html b/files/templates/admin/app.html index 7a738ebbf..a8ea8b027 100644 --- a/files/templates/admin/app.html +++ b/files/templates/admin/app.html @@ -43,7 +43,7 @@
  • - +
    Posts
    • diff --git a/files/templates/admin/apps.html b/files/templates/admin/apps.html index a6ded0fee..c04a1a0e5 100644 --- a/files/templates/admin/apps.html +++ b/files/templates/admin/apps.html @@ -8,7 +8,7 @@
    - +
    diff --git a/files/templates/awards.html b/files/templates/awards.html index 738cb320f..425735cd3 100644 --- a/files/templates/awards.html +++ b/files/templates/awards.html @@ -1,40 +1,51 @@ -{% if SITE_NAME == 'PCM' %} - {% set wholesome = '/i/wholesome.webp' %} -{% else %} - {% set wholesome = '/e/marseywholesome.webp' %} +
    +{% macro stackable_award(award, src, alt) %} + {% for i in range(min(p.award_count(award, v), 4)) %} +
    + {{alt}} +
    + {% endfor %} +{% endmacro %} + +{% if p.award_count("wholesome", v) %} + {% set wholesome = '/i/wholesome.webp' if SITE_NAME == PCM else '/e/marseywholesome.webp' %} + {{ stackable_award('wholesome', wholesome, ':#marseywholesome:') }} {% endif %} -{% for i in range(min(p.award_count("wholesome", v), 4)) %} - {% if g.inferior_browser %} -
    - :#marseywholesome: +{% if p.award_count("train", v) %} + {{ stackable_award('train', '/e/marseytrain.webp', ':#marseytrain:') }} +{% endif %} + +{% if p.award_count("scooter", v) %} + {{ stackable_award('scooter', '/e/marseyscooter.webp', ':#marseyscooter:') }} +{% endif %} + +{% if p.award_count("firework", v) %} + + {{ stackable_award('firework', i) }} +{% endif %} + +{% if p.award_count("confetti", v) %} +
    +{% endif %} + +{% if p.award_count("ricardo", v) %} + {% for i in range(min(p.award_count("ricardo", v), 3)) %} +
    +
    - {% else %} - {% set seal_vertical = 'up' if (i % 2) == 0 else 'down' %} - {% set seal_horizontal = 'right' if i < 2 else 'left' %} - - - :#marseywholesome: - - - {% endif %} -{% endfor %} + {% endfor %} +{% endif %} -{% for i in range(min(p.award_count("train", v), 4)) %} - {% set train_dir = 'left' if (i % 2) == 0 else 'right' %} - {% set train_mirror = ' mirrored' if (i % 2) == 0 else '' %} - - :#marseytrain: - -{% endfor %} +{% if p.award_count("shit", v) %} + + +{% endif %} -{% for i in range(min(p.award_count("scooter", v), 4)) %} - {% set scooter_dir = 'right' if (i % 2) == 0 else 'left' %} - {% set scooter_mirror = '' if (i % 2) == 0 else ' mirrored' %} - - :#marseyscooter: - -{% endfor %} +{% if p.award_count("fireflies", v) %} + + +{% endif %} {% if p.award_count("tilt", v) %} {% endif %} -{% if p.award_count("confetti", v) %} -
    -{% endif %} - -{% if p.award_count("firework", v) %} - - {% for i in range(min(p.award_count("firework", v), 4)) %} -
    - -
    - {% endfor %} -{% endif %} - -{% if p.award_count("ricardo", v) %} - - {% for i in range(min(p.award_count("ricardo", v), 3)) %} -
    - -
    - {% endfor %} -{% endif %} - -{% if p.award_count("shit", v) %} - - -{% endif %} - -{% if p.award_count("fireflies", v) %} - - -{% endif %} - +
    diff --git a/files/templates/comments.html b/files/templates/comments.html index bf3ad23e0..2f10f816b 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -438,6 +438,10 @@
      +{% if v.admin_level >= PERMS['APPS_MODERATION'] and c.oauth_app %} + API App +{% endif %} + {% if v.admin_level >= PERMS['POST_COMMENT_DISTINGUISH'] and (v.id == c.author_id or v.admin_level >= PERMS['POST_COMMENT_MODERATION']) %} @@ -482,7 +486,7 @@ {% endif %} {% if c.parent_submission and (c.author_id==v.id or v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or (c.post.sub and v.mods(c.post.sub))) %} - + {% endif %} @@ -496,9 +500,6 @@ {% endif %} -{% if v.admin_level >= PERMS['APPS_MODERATION'] and c.oauth_app %} - API App -{% endif %}
    {% endif %} @@ -651,7 +652,7 @@ {% if c.author_id == v.id or (c.post.sub and v.mods(c.post.sub)) %} - + {% endif %} {% if v.admin_level < PERMS['POST_COMMENT_MODERATION'] %} @@ -696,6 +697,10 @@
      {% if c.parent_submission %} + {% if v.admin_level >= PERMS['APPS_MODERATION'] and c.oauth_app %} + API App + {% endif %} + {% if v.id == c.author_id %} @@ -705,7 +710,7 @@ - + {% endif %} {% if v.id != c.author_id and v.admin_level >= PERMS['USER_BAN'] %} @@ -722,10 +727,6 @@ {% endif %} - - {% if c.oauth_app and v.admin_level >= PERMS['APPS_MODERATION'] %} - API App - {% endif %}
    diff --git a/files/templates/donate_WPD.html b/files/templates/donate_WPD.html index 219507850..09a9e04e9 100644 --- a/files/templates/donate_WPD.html +++ b/files/templates/donate_WPD.html @@ -5,7 +5,7 @@
    - {% if v and v.truescore >= TRUESCORE_DONATE_LIMIT %} + {% if v and v.truescore >= TRUESCORE_DONATE_MINIMUM %} diff --git a/files/templates/donate_rDrama.html b/files/templates/donate_rDrama.html index 16c159a31..37e9c7e95 100644 --- a/files/templates/donate_rDrama.html +++ b/files/templates/donate_rDrama.html @@ -5,7 +5,7 @@
    Kofi {{KOFI_LINK}}
    - {% if v and v.truescore >= TRUESCORE_DONATE_LIMIT %} + {% if v and v.truescore >= TRUESCORE_DONATE_MINIMUM %} diff --git a/files/templates/errors/error.html b/files/templates/errors/error.html index d4f92a9dc..1e665add1 100644 --- a/files/templates/errors/error.html +++ b/files/templates/errors/error.html @@ -11,7 +11,7 @@
    {{code}} {{title}}

    {{msg|safe}}

    {% if details -%} -
    {{details|safe}}
    +
    {{details|safe}}
    {%- endif %} diff --git a/files/templates/errors/nsfw.html b/files/templates/errors/nsfw.html index b14275e7d..9329fda68 100644 --- a/files/templates/errors/nsfw.html +++ b/files/templates/errors/nsfw.html @@ -4,10 +4,10 @@ {% block content %}
    -
    +
    :#marseytwerking:
    Are you over 18?
    -

    This post is rated +18 (Adult-Only). You must be 18 or older to continue. Are you sure you want to proceed?

    +

    This post is rated +18 (Adult-Only). You must be 18 or older to continue. Are you sure you want to proceed?

    diff --git a/files/templates/errors/patron.html b/files/templates/errors/patron.html deleted file mode 100644 index c6655a3f8..000000000 --- a/files/templates/errors/patron.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "default.html" %} -{% block pagetitle %}401 Not Authorized{% endblock %} -{% block pagetype %}error-401{% endblock %} -{% block content %} -
    -
    -
    - :#marseymerchant: -
    401 Not Authorized
    -

    This page is only available to {% if SITE_NAME == 'rDrama' %}paypigs{% else %}patrons{% endif %}:

    - {% if FEATURES['MARSEYBUX'] and v.truescore -%} - {% if KOFI_LINK %} - {{KOFI_LINK}} - {% else %} - {{GUMROAD_LINK}} - {% endif %} - {%- endif %} -
    -
    -
    -{% endblock %} diff --git a/files/templates/home.html b/files/templates/home.html index 7a94c9ec8..11ba8dfa8 100644 --- a/files/templates/home.html +++ b/files/templates/home.html @@ -175,7 +175,7 @@ float: left; font-size: 14px; padding-top: 0.25rem; - padding-right: 0.25rem; + padding-right: 0.7rem; } diff --git a/files/templates/log.html b/files/templates/log.html index aba6d6f7e..7ee238d3c 100644 --- a/files/templates/log.html +++ b/files/templates/log.html @@ -70,7 +70,7 @@
    {% for ma in actions %} -
    +
    diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html index 94a5cc9ee..93de525a6 100644 --- a/files/templates/post_actions.html +++ b/files/templates/post_actions.html @@ -1,5 +1,5 @@ {% if v and v.id==p.author_id and p.private %} - + @@ -40,6 +40,10 @@ {% if v %}
      + {% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] and p.oauth_app %} + API App + {% endif %} + {% if v.admin_level >= PERMS['POST_COMMENT_DISTINGUISH'] %} @@ -63,10 +67,6 @@ {% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %} - - {% if p.oauth_app %} - API App - {% endif %} {% endif %} diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html index 2810f0238..59b910ec3 100644 --- a/files/templates/post_actions_mobile.html +++ b/files/templates/post_actions_mobile.html @@ -28,8 +28,8 @@ {% if p.sub and v.mods(p.sub) %} - - + + {% endif %} {% if v.id==p.author_id %} diff --git a/files/templates/post_admin_actions_mobile.html b/files/templates/post_admin_actions_mobile.html index 5799c60c0..d0598e4a2 100644 --- a/files/templates/post_admin_actions_mobile.html +++ b/files/templates/post_admin_actions_mobile.html @@ -9,6 +9,10 @@
      + {% if v.admin_level >= PERMS['APPS_MODERATION'] and p.oauth_app %} + API App + {% endif %} + {% if (request.path.startswith('/post/') or request.path.startswith('/h/')) and v.admin_level >= PERMS['POST_EDITING'] and p.id %} {% endif %} @@ -28,12 +32,9 @@ {% endif %} - {% if p.oauth_app and v.admin_level >= PERMS['APPS_MODERATION'] %} - - {% endif %} {% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %} - + {% endif %} {% if v.id != p.author_id and v.admin_level >= PERMS['USER_BAN'] %} diff --git a/files/templates/settings/personal.html b/files/templates/settings/personal.html index f9ad5d342..ed79fcbf7 100644 --- a/files/templates/settings/personal.html +++ b/files/templates/settings/personal.html @@ -25,7 +25,7 @@

    You're a {{TIERS_ID_TO_NAME[v.patron] if v.patron else "freeloader"}}!

    {% if v.patron %} Thanks ily! <3{% endif %} - {% if not v.patron and v.truescore >= TRUESCORE_DONATE_LIMIT %} + {% if not v.patron and v.truescore >= TRUESCORE_DONATE_MINIMUM %}

    To stop freeloading, first verify your email, support us on {{DONATE_SERVICE}} with the same email, and click "Claim {{patron}} Rewards"

    {% elif not v.patron %}

    To stop freeloading, you can donate via crypto. Please let us know first beforehand by sending us a modmail. Thanks!

    diff --git a/files/templates/settings/security.html b/files/templates/settings/security.html index 8f95e94c3..6495e4140 100644 --- a/files/templates/settings/security.html +++ b/files/templates/settings/security.html @@ -50,7 +50,7 @@
    {% if FEATURES['MARSEYBUX'] %} Must be same email as the one you used to donate - {% if v.truescore >= TRUESCORE_DONATE_LIMIT %} + {% if v.truescore >= TRUESCORE_DONATE_MINIMUM %} on {% if KOFI_TOKEN %} Kofi diff --git a/files/templates/settings2.html b/files/templates/settings2.html index 08c00f42c..d34132d9d 100644 --- a/files/templates/settings2.html +++ b/files/templates/settings2.html @@ -102,9 +102,5 @@
    {% block mobilenavbar %}{% include "mobile_navigation_bar.html" %}{% endblock %} -{% block invitationModal %}{% endblock %} -{% block exileModal %}{% endblock %} -{% block approveModal %}{% endblock %} -{% block errorToasts %}{% endblock %} {% block scripts %}{% endblock %} {% endblock %} diff --git a/files/templates/sidebar_rDrama.html b/files/templates/sidebar_rDrama.html index 92da421f5..ad54dd943 100644 --- a/files/templates/sidebar_rDrama.html +++ b/files/templates/sidebar_rDrama.html @@ -54,8 +54,28 @@ {%- endif %}
    -

    Rules

    -
      +

      Drama: any incident, scene, gaffe, rumor, opinion, or disagreement that is blown entirely out of proportion.

      + +

      Do your part to keep our community healthy by blowing everything out of proportion and making literally everything as dramatic as possible.

      + +

      rdrama.net caters to drama in all forms such as: Real life, videos, photos, gossip, rumors, news sites, Reddit, and Beyond™. There isn't drama we won't touch, and we want it all.

      + +

      What we want:

      +
        +
      • Arguments.
        • +
      • Gossip.
        • +
      • Scandals.
        • +
      • Lolcows.
        • +
      • Assholes.
        • +
      • Trainwrecks.
        • +
      • Meltdowns.
        • +
      • Dramatic news articles.
        • +
      • Dramatic rumours (with context).
        • +
      • Dramatic everything from anywhere
        • +
      + +

      A couple things to remember:

      +
      • NO RIGHTWING AGENDAPOSTING.
      • Don't post anything illegal.
      • No sexualizing minors.
        • @@ -67,8 +87,44 @@
      • Absolutely NO misgendering.
      • Absolutely NO antisemitism.
      • Absolutely NO vaccine misinformation.
        • -
    -

    This is an entertainment comedy website. Any and all posts and comments are parody with no basis in reality.

    +
  • You are encouraged to post drama you are involved in.
    • +
  • This is a mod playground.
    • +
  • Participation implies enthusiastic consent to being mod abused by unstable alcoholic bullies.
    • + + +

    Related subreddits:

    + + +

    Off-site drama whoring websites:

    + + +

    This is an entertainment comedy website. Any and all posts and comments are parody with no basis in reality.

    𝐜𝐚𝐫𝐩 𝐰𝐨𝐳 𝐞𝐫𝐞

    {% endif %} diff --git a/files/templates/submission.html b/files/templates/submission.html index a489f3343..b99139730 100644 --- a/files/templates/submission.html +++ b/files/templates/submission.html @@ -78,7 +78,7 @@
    -
    +
    {% if not p.is_image and p.thumb_url and not p.embed_url %}
    diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html index a406159e6..5bcc18cb7 100644 --- a/files/templates/submission_listing.html +++ b/files/templates/submission_listing.html @@ -45,7 +45,7 @@
    {% endif %} -
    +
    @@ -245,17 +245,17 @@ {% endif %} {% if p.is_image and not p.over_18 and ((v and v.cardview) or (not v and CARD_VIEW)) %} -
    +
    Unable to load image
    {% elif p.is_video %} -
    +
    {% elif p.is_audio %} -
    +
    {% elif p.is_youtube %} diff --git a/files/templates/submit.html b/files/templates/submit.html index 67ae18674..13d587f5d 100644 --- a/files/templates/submit.html +++ b/files/templates/submit.html @@ -105,7 +105,7 @@
    {% if error %}{{error | safe}}{% endif %} - +
    diff --git a/files/templates/userpage.html b/files/templates/userpage.html index 42ef0f00f..5c7299ddf 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -70,7 +70,9 @@ {% endif %} {% if v and (v.id == u.id or v.admin_level >= PERMS['USER_VOTERS_VISIBLE']) -%} -
    Simps | Haters | Simps For | Hates | Voted
    +
    + Profile Views | Simps | Haters | Simps For | Hates | Voted +
    {%- endif %}
    @@ -188,7 +190,6 @@
    {% if v and v.id == u.id %} Edit profile - Profile views {% endif %} {% if FEATURES['USERS_PROFILE_SONG'] and u.song and v and (v.id == u.id or v.mute and not u.unmutable) %} @@ -196,7 +197,7 @@ {% endif %}
    -
    +

    User ID: {{u.id}}

    Coins spent: {{u.coins_spent}}

    True score: {{u.truescore}}

    @@ -302,7 +303,9 @@ {% endif %} {% if v and (v.id == u.id or v.admin_level >= PERMS['USER_VOTERS_VISIBLE']) -%} -
    Simps | Haters | Simps For | Hates | Voted
    +
    + Profile Views | Simps | Haters | Simps For | Hates | Voted +
    {%- endif %}
    @@ -385,7 +388,6 @@
    {% if v and v.id == u.id %} Edit profile - Profile views {% endif %} {% if FEATURES['USERS_PROFILE_SONG'] and u.song and v and (v.id == u.id or v.mute and not u.unmutable) %} diff --git a/files/templates/userpage/blockers.html b/files/templates/userpage/blockers.html index f5d593c11..61a3bf517 100644 --- a/files/templates/userpage/blockers.html +++ b/files/templates/userpage/blockers.html @@ -1,11 +1,10 @@ {% extends "default.html" %} {% block pagetitle %}@{{u.username}}'s blockers{% endblock %} {% block content %} -
    @{{u.username}}'s blockers
    +
    @{{u.username}}'s blockers
    Gumroad {{GUMROAD_LINK}}
    - @@ -13,7 +12,6 @@ {% for block, user in users %} - @@ -24,3 +22,24 @@ {% endblock %} + +{% block pagenav %} + +{% endblock %} diff --git a/files/templates/userpage/followers.html b/files/templates/userpage/followers.html index 75ef2d80c..548a96ce5 100644 --- a/files/templates/userpage/followers.html +++ b/files/templates/userpage/followers.html @@ -1,11 +1,10 @@ {% extends "default.html" %} {% block pagetitle %}@{{u.username}}'s followers{% endblock %} {% block content %} -
    @{{u.username}}'s followers
    +
    @{{u.username}}'s followers
    # Name Blocking since
    {{loop.index}} {% include "user_in_table.html" %} 1599343262 %}data-time="{{block.created_utc}}"{% endif %}>
    - {% if v.id == u.id %} @@ -16,7 +15,6 @@ {% for follow, user in users %} - {% if v.id == u.id %} @@ -30,3 +28,24 @@ {% endblock %} + +{% block pagenav %} + +{% endblock %} diff --git a/files/templates/userpage/following.html b/files/templates/userpage/following.html index fcbcd18a3..beba6eff6 100644 --- a/files/templates/userpage/following.html +++ b/files/templates/userpage/following.html @@ -1,11 +1,10 @@ {% extends "default.html" %} {% block pagetitle %}Users followed by @{{u.username}}{% endblock %} {% block content %} -
    Users followed by @{{u.username}}
    +
    Users followed by @{{u.username}}
    # Name Following since
    {{loop.index}} {% include "user_in_table.html" %} 1599343262 %}data-time="{{follow.created_utc}}"{% endif %}>
    - {% if v.id == u.id %} @@ -15,7 +14,6 @@ {% for user in users %} - {% if v.id == u.id %} @@ -28,3 +26,24 @@ {% endblock %} + +{% block pagenav %} + +{% endblock %} diff --git a/files/templates/userpage/viewers.html b/files/templates/userpage/viewers.html deleted file mode 100644 index 51d2cd242..000000000 --- a/files/templates/userpage/viewers.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "default.html" %} -{% block pagetitle %}Profile Viewers{% endblock %} -{% block content %} -
    Users who viewed your profile
    -
    # Name
    {{loop.index}} {% include "user_in_table.html" %}
    Unfollow
    - - - - - - -{% for view in viewers %} - - - - -{% endfor %} -
    NameLast visit
    - {% with user=view.viewer %} - {% include "user_in_table.html" %} - {% endwith %} - {{view.last_view_string}}
    - -{% endblock %} diff --git a/files/templates/userpage/views.html b/files/templates/userpage/views.html new file mode 100644 index 000000000..5b4aeeed5 --- /dev/null +++ b/files/templates/userpage/views.html @@ -0,0 +1,45 @@ +{% extends "default.html" %} +{% block pagetitle %}Profile Views{% endblock %} +{% block content %} +
    Users who viewed @{{u.username}}'s profile
    +
    + + + + + + +{% for view in views %} + + + + +{% endfor %} +
    NameLast visit
    + {% with user=view.viewer %} + {% include "user_in_table.html" %} + {% endwith %} + {{view.last_view_string}}
    + +{% endblock %} + +{% block pagenav %} + +{% endblock %} diff --git a/files/templates/userpage/voted_comments.html b/files/templates/userpage/voted_comments.html index fa36d355b..c36a162d9 100644 --- a/files/templates/userpage/voted_comments.html +++ b/files/templates/userpage/voted_comments.html @@ -13,6 +13,6 @@
    - {% endif %} + {% endif %}
    {% endblock %} diff --git a/files/templates/userpage/voters.html b/files/templates/userpage/voters.html index e9b6ea990..7ca404fe6 100644 --- a/files/templates/userpage/voters.html +++ b/files/templates/userpage/voters.html @@ -1,7 +1,7 @@ {% extends "default.html" %} {% block pagetitle %}{{name2}}{% endblock %} {% block content %} -

    {{name2}}

    +

    {{name2}}

    Total: {{total}}
    diff --git a/files/tests/test_e2e.py b/files/tests/test_e2e.py deleted file mode 100644 index 00ede0ccf..000000000 --- a/files/tests/test_e2e.py +++ /dev/null @@ -1,37 +0,0 @@ -from bs4 import BeautifulSoup -from time import time, sleep -from files.__main__ import app - -# these tests require `docker-compose up` first - -def test_rules(): - response = app.test_client().get("/sidebar") - assert response.status_code == 200 - assert response.text.startswith("") - - -def test_signup(): - client = app.test_client() - with client: # this keeps the session between requests, which we need - signup_get_response = client.get("/signup") - assert signup_get_response.status_code == 200 - soup = BeautifulSoup(signup_get_response.text, 'html.parser') - # these hidden input values seem to be used for anti-bot purposes and need to be submitted - formkey = next(tag for tag in soup.find_all("input") if tag.get("name") == "formkey").get("value") - form_timestamp = next(tag for tag in soup.find_all("input") if tag.get("name") == "now").get("value") - - sleep(5) # too-fast submissions are rejected (bot check?) - username = "testuser" + str(round(time())) - signup_post_response = client.post("/signup", data={ - "username": username, - "password": "password", - "password_confirm": "password", - "email": "", - "formkey": formkey, - "now": form_timestamp - }) - print(f"Signing up as {username}", flush=True) - assert signup_post_response.status_code == 302 - assert "error" not in signup_post_response.location - - # we should now be logged in and able to post diff --git a/readme.md b/readme.md index 2c74f0c99..ed4fabff0 100644 --- a/readme.md +++ b/readme.md @@ -1,18 +1,13 @@ -[![Build status](https://img.shields.io/github/workflow/status/TheMotte/rDrama/run_tests.py/frost)](https://github.com/Aevann1/rDrama/actions?query=workflow%3Arun_tests.py+branch%3Afrost) - - This code runs https://rdrama.net, https://pcmemes.net and https://watchpeopledie.tv # Installation (Windows/Linux/MacOS) -1- Install Docker on your machine. - -[Docker installation](https://docs.docker.com/get-docker/) +1- Install Docker on your machine. [Docker installation](https://docs.docker.com/get-docker/) 2- Run the following commands in the terminal: ``` -git clone https://github.com/Aevann1/rDrama/ +git clone https://fsdfsd.net/rDrama/rDrama.git cd rDrama diff --git a/requirements.txt b/requirements.txt index 258d80ac3..ad4a75c58 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,7 +28,6 @@ tldextract user-agents psycopg2-binary pusher_push_notifications -pytest youtube-dl yattag webptools diff --git a/run_tests.py b/run_tests.py deleted file mode 100755 index 2b3ca6193..000000000 --- a/run_tests.py +++ /dev/null @@ -1,52 +0,0 @@ -#!/usr/bin/python3 - -import subprocess -import sys - -# we want to leave the container in whatever state it currently is, so check to see if it's running -docker_inspect = subprocess.run([ - "docker", - "container", - "inspect", - "-f", "{{.State.Status}}", - "rDrama", - ], - capture_output = True, - ).stdout.decode("utf-8").strip() - -was_running = docker_inspect == "running" - -# update containers, just in case they're out of date -if was_running: - print("Updating containers . . .", flush=True) -else: - print("Starting containers . . .", flush=True) -subprocess.run([ - "docker-compose", - "up", - "--build", - "-d", - ], - check = True, - ) - -# run the test -print("Running test . . .", flush=True) -result = subprocess.run([ - "docker", - "exec", - "rDrama", - "bash", "-c", "cd service && python3 -m pytest -s" - ]) - -if not was_running: - # shut down, if we weren't running in the first place - print("Shutting down containers . . .", flush=True) - subprocess.run([ - "docker-compose", - "stop", - ], - check = True, - ) - -sys.exit(result.returncode) diff --git a/schema.sql b/schema.sql index 9ba711ce2..9132c762e 100644 --- a/schema.sql +++ b/schema.sql @@ -395,7 +395,8 @@ CREATE TABLE public.comments ( wordle_result character varying(115), body_ts tsvector GENERATED ALWAYS AS (to_tsvector('english'::regconfig, (body)::text)) STORED, casino_game_id integer, - chuddedfor character varying(40) + chuddedfor character varying(40), + stickied_child_id integer ); @@ -2466,6 +2467,14 @@ ALTER TABLE ONLY public.save_relationship ADD CONSTRAINT save_relationship_user_fkey FOREIGN KEY (user_id) REFERENCES public.users(id) MATCH FULL; +-- +-- Name: comments stickied_child_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.comments + ADD CONSTRAINT stickied_child_fkey FOREIGN KEY (stickied_child_id) REFERENCES public.comments(id); + + -- -- Name: sub_blocks sub_blocks_sub_fkey; Type: FK CONSTRAINT; Schema: public; Owner: - -- diff --git a/seed-db.sql b/seed-db.sql index 636ff63f1..0daccc4e5 100644 --- a/seed-db.sql +++ b/seed-db.sql @@ -226,6 +226,7 @@ SET row_security = off; -- INSERT INTO public.hat_defs VALUES (716, 'Baked Beans Bucket Hat', 'This neighbor is wearing beans!', 2, 500, NULL, 1663647585); + INSERT INTO public.hat_defs VALUES (1002, 'Hearty Hands', 'I dont think hands should do that...', 2, 500, NULL, 1667084251); INSERT INTO public.hat_defs VALUES (1003, 'Dragged', 'HELLLLLLLLLLPPPPPPPPPPPPPPPPP', 2, 500, NULL, 1667084272); INSERT INTO public.hat_defs VALUES (718, 'Literally Me', 'Sving music, jazz? PTOOEY!', 2, 500, NULL, 1663801724); @@ -623,6 +624,7 @@ INSERT INTO public.hat_defs VALUES (1074, 'Scottish Sticky Note', 'idk why its s INSERT INTO public.hat_defs VALUES (1076, 'Snow Globe', 'Snow globe full of partially transparent webp flakes', 2, 1000, NULL, 1668755503); INSERT INTO public.hat_defs VALUES (1075, 'Jerma Approval', 'Who? What? I haven''t understood a hat submission in so fucking long', 2, 1000, NULL, 1668727612); INSERT INTO public.hat_defs VALUES (1079, 'Spinning Christmas Elf Hat', 'It''s time to go green.', 2, 1000, NULL, 1668755556); +INSERT INTO public.hat_defs VALUES (1100, 'World Cup Mascot', 'This user supports the 2022 World Cup and watched it for Jungkook!', 2, 500, NULL, 1669007389); INSERT INTO public.hat_defs VALUES (874, 'Carp', 'My 100th hat and a Thank you to carp. Now 150 more!', 2, 500, NULL, 1665272718); INSERT INTO public.hat_defs VALUES (1077, 'Premium Snow Globe', 'Snow globe with a more premium base.', 2, 1000, NULL, 1668755505); INSERT INTO public.hat_defs VALUES (93, 'Wizard I', 'Three decades a KHHV', 2, 500, NULL, 1662167687); @@ -1168,7 +1170,7 @@ INSERT INTO public.hat_defs VALUES (911, 'Racecar Hat', 'I sleep in a hat with m -- Name: hat_defs_id_seq; Type: SEQUENCE SET; Schema: public; Owner: - -- -SELECT pg_catalog.setval('public.hat_defs_id_seq', 1099, true); +SELECT pg_catalog.setval('public.hat_defs_id_seq', 1103, true); -- @@ -1202,6 +1204,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES ('marsey1984',2,'orwell book ingsoc big brother fascist',NULL), ('marsey300',2,'leonidas shield armor thermopylae spear greek spartan',NULL), ('marsey3d',2,'poly 3d print alive spin animated',NULL), +('marsey403',2,'error http unauthorized forbidden access',1669055713), ('marsey404',2,'missing 404 error html page notfound',1668930304), ('marsey40k',2,'warhammer 40k 40000 space space marine marine ultramarine smurf',NULL), ('marsey420',2,'marijuana weed dude weed lmao ganja drugs pot reggae joint jamaican',NULL), @@ -1372,6 +1375,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES ('marseybiting',2,'reaction datass lip bite dat ass',NULL), ('marseyblack',2,'basketball black african american bipoc coon fade jersey sports kang gang jogger',NULL), ('marseyblack2',2,'nigger african coon ape monkey bipoc excited happy',NULL), +('marseyblackandwhite',2,'black mixed white shredded manlet cat cute',1669229303), ('marseyblackcat',2,'cat black halloween homoween',1666656250), ('marseyblackcock',2,'cock chicken poultry bbc black ride mount cowgirl',NULL), ('marseyblackcop',2,'police officer acab thin blue line pig bipoc',NULL), @@ -1585,6 +1589,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES ('marseychonkerbutch',2,'fat obese brap bitch dyke dangerhair lesbian',NULL), ('marseychonkerfoid',2,'female woman fds fat obese hambeast landwhale porker pig bleeder birthing person bangs',NULL), ('marseychonkerfoidpuke',2,'fat huge sick yuck eat barf',1664574968), +('marseychonkernoticeme',2,'attention fat foid annoying',1669407871), ('marseychristmas',2,'candy cane santa christmas holiday',NULL), ('marseychristmasbulb',2,'ornament christmas happy holiday china',NULL), ('marseychristmasbulb2',2,'ornament holiday christmas',NULL), @@ -2025,6 +2030,8 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES ('marseyhitler2',2,'adolf adolph nazi germany kraut axis mustache genocide dictator authright chud conservative trump',NULL), ('marseyhmm',2,'confused reaction thinking thunk thonk judgment',NULL), ('marseyhmmm',2,'confused reaction thinking thunk thonk judgment',NULL), +('marseyhobbes',2,'calvin hobbes waterson tiger comic',1669097969), +('marseyholocaust',2,'jew nazi adl merchant genocide chud rightoid hitler train auschwitz 109',1669064577), ('marseyhomestar',2,'homestar runner fast everybody 2000s',NULL), ('marseyhomochingchong',2,'asian chinese jap gook chink rice gay strawhat glasses squint rainbow tiedie tyedye tyedie tiedye',1663248780), ('marseyhomofascist',2,'lgbt faggot ss fash nazi homocracy gay queer sodomy wholesome kiss',NULL), @@ -2531,6 +2538,8 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES ('marseypusheen',2,'grey gray',NULL), ('marseypussyhat',2,'feminist feminism activism activist protester protesting foid gussy woman birthing person roasty roastie thot slut whore',NULL), ('marseyputin',2,'vladimir russian kgb moscow ukraine dictator leader',NULL), +('marseyqatarworldcup',2,'soccer football sports muslim islam allah sand bipoc robe ghost',1669146805), +('marseyqatarworldcup2',2,'soccer football sports muslim islam allah sand bipoc robe ghost',1669146826), ('marseyqoomer',2,'shaman viking qanon jan6 capitol january6',NULL), ('marseyqr',2,'qr code',1663646718), ('marseyqr2',2,'cryptographic qrcode',1663944616), @@ -2668,6 +2677,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES ('marseyschizochadseethecapylove',2,'animated schizo schizocel rare love chad seethe capy aevann',NULL), ('marseyschizochadthankscapylove',2,'animated schizo schizocel rare love chad thanks queen capy aevann',NULL), ('marseyschizochadyescapylove',2,'animated schizo schizocel rare love chad yes capy aevann',NULL), +('marseyschizochiobulove',2,'chink asian tangerine feline singapore',1669161511), ('marseyschizodoggilove',2,'animated schizo schizocel rare love dussy doggi',NULL), ('marseyschizodongerlove',2,'animated schizo schizocel rare love kaiser uraniumdonger donger',NULL), ('marseyschizoducklove',2,'animated schizo schizocel rare love duck',NULL), @@ -2934,6 +2944,7 @@ INSERT INTO public.marseys (name, author_id, tags, created_utc) VALUES ('marseytranspearlclutch',2,'transgender upset snowflake clutching',1666994064), ('marseytransrentfree',2,'transgender lgbt rent free wojak chud',NULL), ('marseytree',2,'tree nature outdoors cosplay',NULL), +('marseytribute',2,'cum cumshot semen ropes load facial nsfw',1669095975), ('marseytrickortreat',2,'candy trick or treat halloween holiday',NULL), ('marseytrickrtreat',2,'halloween horror mask sam',1667697001), ('marseytrogdor',2,'burninator strongbad internet meme dragon marsdor',NULL), diff --git a/snappy_rDrama.txt b/snappy_rDrama.txt index 012bcd492..7a8f94639 100644 --- a/snappy_rDrama.txt +++ b/snappy_rDrama.txt @@ -1093,7 +1093,7 @@ Yawn, another brigade from Drama? They must be tired of disrespecting the trans {[para]} I'm not a homosexual because I have straight sex with a man and I like men. But I'm straight because I prefer women's dicks and love having sex with them. I'm a homophobe because I can't have it. {[para]} -Hello refugee, welcome to rDrama.net. +Hello refugee, welcome to rdrama.net. In order to continue posting, please submit a timestamped photograph of your anus (known colloquially as 'bussy') to one of our immigration officers for detailed inspection. Failure to do so would mean immediate deportation {[para]} Since when is promotion of gangbang considered as "sexual threat"? @@ -1705,7 +1705,7 @@ Watch what you want, but when I can't see something like First Reformed or Portr {[para]} This is outrageous. My criticism of Israel has very little to do with my rabid anti-semitism. {[para]} -This is rDrama.net sweaty. +This is rdrama.net sweaty. You're ALL awful. I'm awful too. You think that the mentally unstable we make fun of would be as miserable and unstable as they are without us? They wouldn't. @@ -1719,7 +1719,7 @@ This IS horrible. ALL of this is HORRIBLE. And you're part of it. Fuck you, you stupid bitch. -And fuck you all, rDrama.net. I'm out. +And fuck you all, rdrama.net. I'm out. {[para]} Being white and playing video games is a short pipeline that leads to learning Japanese and raping your sister {[para]} @@ -2938,7 +2938,7 @@ I'm here to show your audience that you don't have the secret of anything, not e Respond however you want, and I'll be back later to laugh about how once again, the angry impotent hate-ragers you all enjoy are not only sad, but ruining your life, when all you really need to do is take a shower and clean your room. Just think about how many of you actually killed yourself and just stopped posting, while everyone else failed to notice or were simply glad you disappeared. I hope it's you next. You're all a worthless drain on society. {[para]} -To be fair, you have to be very neurodivergent to understand rDrama.net. The bait is extremely obvious, and without a solid grasp of satire most of the jokes will go over a typical viewer's head. There's also Carp's racist outlook, which is deftly woven into his characterisation - his personal philosophy draws heavily from MDE literature, for instance. The fans understand this stuff; they have the intellectual capacity to truly appreciate the depths of these jokes, to realize that they're not just funny- they say something deep about THE INTERNET. As a consequence people who dislike rDrama truly ARE zoomers- of course they wouldn't appreciate, for instance, the humour in Janny's existential catchphrase "Y'all can't behave," which itself is a cryptic reference to Aldous Huxley's dystopian epic Brave New World. I'm smirking right now just imagining one of those seriousposting wingtards scratching their heads in confusion as Aevann's genius unfolds itself on their mobile phone screens. What fools... how I pity them. :marseylaugh: And yes by the way, I DO have a Marsey tattoo. And no, you cannot see it. It's for the ladies' eyes only- And even they have to demonstrate that they're within 5 IQ points of my own (preferably lower) beforehand. +To be fair, you have to be very neurodivergent to understand rdrama.net. The bait is extremely obvious, and without a solid grasp of satire most of the jokes will go over a typical viewer's head. There's also Carp's racist outlook, which is deftly woven into his characterisation - his personal philosophy draws heavily from MDE literature, for instance. The fans understand this stuff; they have the intellectual capacity to truly appreciate the depths of these jokes, to realize that they're not just funny- they say something deep about THE INTERNET. As a consequence people who dislike rDrama truly ARE zoomers- of course they wouldn't appreciate, for instance, the humour in Janny's existential catchphrase "Y'all can't behave," which itself is a cryptic reference to Aldous Huxley's dystopian epic Brave New World. I'm smirking right now just imagining one of those seriousposting wingtards scratching their heads in confusion as Aevann's genius unfolds itself on their mobile phone screens. What fools... how I pity them. :marseylaugh: And yes by the way, I DO have a Marsey tattoo. And no, you cannot see it. It's for the ladies' eyes only- And even they have to demonstrate that they're within 5 IQ points of my own (preferably lower) beforehand. {[para]} I don't know, but I'll make sure not to get on your bad side lest I begin molesting children. Like a Pascal's wager kind of thing. {[para]} @@ -2993,7 +2993,7 @@ https://media.giphy.com/media/3oz8xLd9DJq2l2VFtu/giphy.webp {[para]} Rape {[para]} -Here is the Contributors listing for the github project: https://github.com/Aevann1/rDrama +Here is the Contributors listing for the github project: https://fsdfsd.net/rDrama/rDrama/activity That list shows CarpathianFlorist as a contributor. CarpathianFlorist is a Racially Motivated Violent Extremist - a White Identity Extremist - who was involved in /r/MillionDollarExtreme and its many hundreds of spinoffs and descendants. I've collected dozens of his Reddit accts. @@ -3173,4 +3173,7 @@ Normies can't understand the thrill of pinning the Weasel. Night spent chasing a {[para]} I am the “office manager” of AHS. I’ve spent the past three years keeping spreadsheets and have inboxes full of ticket closures, and have written reports characterizing the response accuracy of Reddit AEO. -Would you like to escalate and mansplain my field of expertise to me more? \ No newline at end of file +Would you like to escalate and mansplain my field of expertise to me more? + +{[para]} +Normies can't understand the thrill of pinning the capybara. Night spent chasing an over amphetamined Aevann around the bean bag forts. His squealing and gibbering, pouring sweat and on the verge of seizing. Dramatards build up an intoxicating, delerious state with "dude bussy lmbo" chantings at the sidelines, hitting the Aevann-toy with brooms if he tries to escape. Carp would be giggling and laughing as the waves of methamphetamine pleasure seem to harmonize with the droning r-slur verses. He runs through the bean bag maze skinny and malnourished, with his viagra powered peepee a divining rod for the capybara. Sweat gushing down his, face around his unfocused eyes he laughs and chortles until he gasps "Found you!”. The Codescapybara screeches defensively but Whorist Florist is upon him in seconds. His peepee thrusting blindly into his flank, leg, stomach and ribs unconcemed about anything but the motion. Eventually serendepity finds his mouth and the Cocktube Rodent is placated, suckling contently on the Carp's dehydrated peepee. \ No newline at end of file