diff --git a/docker-compose.yml b/docker-compose.yml
index dc7b82cc8..4cdeb0ed6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,66 +2,66 @@ version: '2.3'
services:
files:
- build:
- context: .
- volumes:
- - "./:/service"
- environment:
- - DATABASE_URL=postgresql://postgres@postgres:5432
- - MASTER_KEY=${MASTER_KEY:-KTVciAUQFpFh2WdJ/oiHJlxl6FvzRZp8kYzAAv3l2OA=}
- - REDIS_URL=redis://redis
- - DOMAIN=localhost
- - SITE_NAME=Drama
- - GIPHY_KEY=3435tdfsdudebussylmaoxxt43
- - FORCE_HTTPS=0
- - DISCORD_SERVER_ID=3435tdfsdudebussylmaoxxt43
- - DISCORD_CLIENT_ID=3435tdfsdudebussylmaoxxt43
- - DISCORD_CLIENT_SECRET=3435tdfsdudebussylmaoxxt43
- - DISCORD_BOT_TOKEN=3435tdfsdudebussylmaoxxt43
- #- HCAPTCHA_SITEKEY=3435tdfsdudebussylmaoxxt43
- - HCAPTCHA_SECRET=3435tdfsdudebussylmaoxxt43
- - YOUTUBE_KEY=3435tdfsdudebussylmaoxxt43
- - PUSHER_KEY=3435tdfsdudebussylmaoxxt43
- - CATBOX_KEY=3435tdfsdudebussylmaoxxt43
- - SPAM_SIMILARITY_THRESHOLD=0.5
- - SPAM_SIMILAR_COUNT_THRESHOLD=5
- - SPAM_URL_SIMILARITY_THRESHOLD=0.1
- - COMMENT_SPAM_SIMILAR_THRESHOLD=0.5
- - COMMENT_SPAM_COUNT_THRESHOLD=5
- - READ_ONLY=0
- - BOT_DISABLE=0
- - COINS_NAME=Dramacoins
- - DEFAULT_TIME_FILTER=all
- - DEFAULT_THEME=midnight
- - DEFAULT_COLOR=ff66ac #YOU HAVE TO PICK ONE OF THOSE COLORS OR SHIT WILL BREAK: ff66ac, 805ad5, 62ca56, 38a169, 80ffff, 2a96f3, eb4963, ff0000, f39731, 30409f, 3e98a7, e4432d, 7b9ae4, ec72de, 7f8fa6, f8db58
- - SLOGAN=Dude bussy lmao
- - GUMROAD_TOKEN=3435tdfsdudebussylmaoxxt43
- - GUMROAD_LINK=https://marsey1.gumroad.com/l/tfcvri
- - CARD_VIEW=1
- - DISABLE_DOWNVOTES=0
- - DUES=0
- - MAIL_USERNAME=blahblahblah@gmail.com
- - MAIL_PASSWORD=3435tdfsdudebussylmaoxxt43
- links:
- - "redis"
- - "postgres"
- ports:
- - "80:80"
- depends_on:
- - redis
- - postgres
+ build:
+ context: .
+ volumes:
+ - "./:/service"
+ environment:
+ - DATABASE_URL=postgresql://postgres@postgres:5432
+ - MASTER_KEY=${MASTER_KEY:-KTVciAUQFpFh2WdJ/oiHJlxl6FvzRZp8kYzAAv3l2OA=}
+ - REDIS_URL=redis://redis
+ - DOMAIN=localhost
+ - SITE_NAME=Drama
+ - GIPHY_KEY=3435tdfsdudebussylmaoxxt43
+ - FORCE_HTTPS=0
+ - DISCORD_SERVER_ID=3435tdfsdudebussylmaoxxt43
+ - DISCORD_CLIENT_ID=3435tdfsdudebussylmaoxxt43
+ - DISCORD_CLIENT_SECRET=3435tdfsdudebussylmaoxxt43
+ - DISCORD_BOT_TOKEN=3435tdfsdudebussylmaoxxt43
+ #- HCAPTCHA_SITEKEY=3435tdfsdudebussylmaoxxt43
+ - HCAPTCHA_SECRET=3435tdfsdudebussylmaoxxt43
+ - YOUTUBE_KEY=3435tdfsdudebussylmaoxxt43
+ - PUSHER_KEY=3435tdfsdudebussylmaoxxt43
+ - CATBOX_KEY=3435tdfsdudebussylmaoxxt43
+ - SPAM_SIMILARITY_THRESHOLD=0.5
+ - SPAM_SIMILAR_COUNT_THRESHOLD=5
+ - SPAM_URL_SIMILARITY_THRESHOLD=0.1
+ - COMMENT_SPAM_SIMILAR_THRESHOLD=0.5
+ - COMMENT_SPAM_COUNT_THRESHOLD=5
+ - READ_ONLY=0
+ - BOT_DISABLE=0
+ - COINS_NAME=Dramacoins
+ - DEFAULT_TIME_FILTER=all
+ - DEFAULT_THEME=midnight
+ - DEFAULT_COLOR=ff66ac #YOU HAVE TO PICK ONE OF THOSE COLORS OR SHIT WILL BREAK: ff66ac, 805ad5, 62ca56, 38a169, 80ffff, 2a96f3, eb4963, ff0000, f39731, 30409f, 3e98a7, e4432d, 7b9ae4, ec72de, 7f8fa6, f8db58
+ - SLOGAN=Dude bussy lmao
+ - GUMROAD_TOKEN=3435tdfsdudebussylmaoxxt43
+ - GUMROAD_LINK=https://marsey1.gumroad.com/l/tfcvri
+ - CARD_VIEW=1
+ - DISABLE_DOWNVOTES=0
+ - DUES=0
+ - MAIL_USERNAME=blahblahblah@gmail.com
+ - MAIL_PASSWORD=3435tdfsdudebussylmaoxxt43
+ links:
+ - "redis"
+ - "postgres"
+ ports:
+ - "80:80"
+ depends_on:
+ - redis
+ - postgres
redis:
- image: redis
- ports:
- - "6379:6379"
+ image: redis
+ ports:
+ - "6379:6379"
postgres:
- image: postgres:12.3
- volumes:
- - "./schema.sql:/docker-entrypoint-initdb.d/00-schema.sql"
- - "./seed-db.sql:/docker-entrypoint-initdb.d/01-schema.sql"
- environment:
- - POSTGRES_HOST_AUTH_METHOD=trust
- ports:
- - "5432:5432"
\ No newline at end of file
+ image: postgres:12.3
+ volumes:
+ - "./schema.sql:/docker-entrypoint-initdb.d/00-schema.sql"
+ - "./seed-db.sql:/docker-entrypoint-initdb.d/01-schema.sql"
+ environment:
+ - POSTGRES_HOST_AUTH_METHOD=trust
+ ports:
+ - "5432:5432"
\ No newline at end of file
diff --git a/files/helpers/const.py b/files/helpers/const.py
index afd14f7d6..f0f88c3a0 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -5,79 +5,79 @@ SITE = environ.get("DOMAIN", '').strip()
SITE_NAME = environ.get("SITE_NAME", '').strip()
SLURS = {
- "faggot": "cute twink",
- "fag": "cute twink",
- "pedophile": "libertarian",
- "pedo": "libertarian",
- "kill yourself": "keep yourself safe",
- "nigger": "🏀",
- "rapist": "male feminist",
- "steve akins": "penny verity oaken",
- "trannie": "🚂🚃🚃",
- "tranny": "🚂🚃🚃",
- "troon": "🚂🚃🚃",
- "nonewnormal": "HorseDewormerAddicts",
- "kike": "https://sciencedirect.com/science/article/abs/pii/S016028960600033X",
- "janny": "j-slur",
- "jannie": "j-slur",
- "janny": "j-slur",
- "latinos": "latinx",
- "latino": "latinx",
- "latinas": "latinx",
- "latina": "latinx",
- "hispanics": "latinx",
- "hispanic": "latinx",
- "uss liberty incident": "tragic accident aboard the USS Liberty",
- "lavon affair": "Lavon Misunderstanding",
- "shylock": "Israeli friend",
- "yid": "Israeli friend",
- "heeb": "Israeli friend",
- "sheeny": "Israeli friend",
- "sheenies": "Israeli friends",
- "hymie": "Israeli friend",
- "allah": "Allah (SWT)",
- "mohammad": "Mohammad (PBUH)",
- "mohammed": "Mohammad (PBUH)",
- "muhammad": "Mohammad (PBUH)",
- "muhammed": "Mohammad (PBUH)",
- "i hate marsey": "i love marsey",
- "libertarian": "pedophile",
- "billie eilish": "Billie Eilish (fat cow)",
- "dancing israelis": "i love Israel",
- "sodomite": "total dreamboat",
- "pajeet": "sexy Indian dude",
- "female": "birthing person",
- "landlord": "landchad",
- "tenant": "renthog",
- "renter": "rentoid",
- "autistic": "neurodivergent",
- "anime": "p-dophilic japanese cartoons",
- "holohoax": "i tried to claim the Holocaust didn't happen because I am a pencil-dicked imbecile and the word filter caught me lol",
- "groomercord": "discord (actually a pretty cool service)",
- "pedocord": "discord (actually a pretty cool service)",
- "i hate carp": "i love Carp",
- "manlet": "little king",
- "gamer": "g*mer",
- "journalist": "journ*list",
- "journalism": "journ*lism",
- "buttcheeks": "bulva",
- "asscheeks": "bulva",
- "wuhan flu": "SARS-CoV-2 syndemic",
- "china flu": "SARS-CoV-2 syndemic",
- "china virus": "SARS-CoV-2 syndemic",
- "kung flu": "SARS-CoV-2 syndemic",
- "nig": "🏀",
- "nigs": "🏀s",
+ "faggot": "cute twink",
+ "fag": "cute twink",
+ "pedophile": "libertarian",
+ "pedo": "libertarian",
+ "kill yourself": "keep yourself safe",
+ "nigger": "🏀",
+ "rapist": "male feminist",
+ "steve akins": "penny verity oaken",
+ "trannie": "🚂🚃🚃",
+ "tranny": "🚂🚃🚃",
+ "troon": "🚂🚃🚃",
+ "nonewnormal": "HorseDewormerAddicts",
+ "kike": "https://sciencedirect.com/science/article/abs/pii/S016028960600033X",
+ "janny": "j-slur",
+ "jannie": "j-slur",
+ "janny": "j-slur",
+ "latinos": "latinx",
+ "latino": "latinx",
+ "latinas": "latinx",
+ "latina": "latinx",
+ "hispanics": "latinx",
+ "hispanic": "latinx",
+ "uss liberty incident": "tragic accident aboard the USS Liberty",
+ "lavon affair": "Lavon Misunderstanding",
+ "shylock": "Israeli friend",
+ "yid": "Israeli friend",
+ "heeb": "Israeli friend",
+ "sheeny": "Israeli friend",
+ "sheenies": "Israeli friends",
+ "hymie": "Israeli friend",
+ "allah": "Allah (SWT)",
+ "mohammad": "Mohammad (PBUH)",
+ "mohammed": "Mohammad (PBUH)",
+ "muhammad": "Mohammad (PBUH)",
+ "muhammed": "Mohammad (PBUH)",
+ "i hate marsey": "i love marsey",
+ "libertarian": "pedophile",
+ "billie eilish": "Billie Eilish (fat cow)",
+ "dancing israelis": "i love Israel",
+ "sodomite": "total dreamboat",
+ "pajeet": "sexy Indian dude",
+ "female": "birthing person",
+ "landlord": "landchad",
+ "tenant": "renthog",
+ "renter": "rentoid",
+ "autistic": "neurodivergent",
+ "anime": "p-dophilic japanese cartoons",
+ "holohoax": "i tried to claim the Holocaust didn't happen because I am a pencil-dicked imbecile and the word filter caught me lol",
+ "groomercord": "discord (actually a pretty cool service)",
+ "pedocord": "discord (actually a pretty cool service)",
+ "i hate carp": "i love Carp",
+ "manlet": "little king",
+ "gamer": "g*mer",
+ "journalist": "journ*list",
+ "journalism": "journ*lism",
+ "buttcheeks": "bulva",
+ "asscheeks": "bulva",
+ "wuhan flu": "SARS-CoV-2 syndemic",
+ "china flu": "SARS-CoV-2 syndemic",
+ "china virus": "SARS-CoV-2 syndemic",
+ "kung flu": "SARS-CoV-2 syndemic",
+ "nig": "🏀",
+ "nigs": "🏀s",
}
LONGPOST_REPLIES = ['Wow, you must be a JP fan.', 'This is one of the worst posts I have EVER seen. Delete it.', "No, don't reply like this, please do another wall of unhinged rant please.", '# 😴😴😴', "Ma'am we've been over this before. You need to stop.", "I've known more coherent downies.", "Your pulitzer's in the mail", "That's great and all, but I asked for my burger without cheese.", 'That degree finally paying off', "That's nice sweaty. Why don't you have a seat in the time out corner with Pizzashill until you calm down, then you can have your Capri Sun.", "All them words won't bring your pa back.", "You had a chance to not be completely worthless, but it looks like you threw it away. At least you're consistent.", 'Some people are able to display their intelligence by going on at length on a subject and never actually saying anything. This ability is most common in trades such as politics, public relations, and law. You have impressed me by being able to best them all, while still coming off as an absolute idiot.', "You can type 10,000 characters and you decided that these were the one's that you wanted.", 'Have you owned the libs yet?', "I don't know what you said, because I've seen another human naked.", 'Impressive. Normally people with such severe developmental disabilities struggle to write much more than a sentence or two. He really has exceded our expectations for the writing portion. Sadly the coherency of his writing, along with his abilities in the social skills and reading portions, are far behind his peers with similar disabilities.', "This is a really long way of saying you don't fuck.", "Sorry ma'am, looks like his delusions have gotten worse. We'll have to admit him,", '', 'If only you could put that energy into your relationships', 'Posts like this is why I do Heroine.', 'still unemployed then?', 'K', 'look im gunna have 2 ask u 2 keep ur giant dumps in the toilet not in my replys 😷😷😷', "Mommy is soooo proud of you, sweaty. Let's put this sperg out up on the fridge with all your other failures.", "Good job bobby, here's a star", "That was a mistake. You're about to find out the hard way why.", 'You sat down and wrote all this shit. You could have done so many other things with your life. What happened to your life that made you decide writing novels of bullshit on rdrama.net was the best option?', "I don't have enough spoons to read this shit", "All those words won't bring daddy back.", 'OUT!']
AGENDAPOSTER_MSG = """Hi @{username},\n\nYour comment has been automatically removed because you forgot
- to include `trans lives matter`.\n\nDon't worry, we're here to help! We
- won't let you post or comment anything that doesn't express your love and acceptance towards
- the trans community. Feel free to resubmit your comment with `trans lives matter`
- included. \n\n*This is an automated message; if you need help,
- you can message us [here](/contact).*"""
+ to include `trans lives matter`.\n\nDon't worry, we're here to help! We
+ won't let you post or comment anything that doesn't express your love and acceptance towards
+ the trans community. Feel free to resubmit your comment with `trans lives matter`
+ included. \n\n*This is an automated message; if you need help,
+ you can message us [here](/contact).*"""
VAXX_MSG = """Hi @{username}, it appears that you may be trying to spread dangerous misinformation regarding ineffective COVID-19 treatments based on pseudoscientific hearsay. Your post has been removed because it contained the word ivermectin. We ask that you understand that horse dewormer neither treats, nor prevents, COVID-19. For more information, please read up on what the FDA has to say on the matter:
@@ -92,27 +92,27 @@ Thank you."""
BASED_MSG = "@{username}'s Based Count has increased by 1. Their Based Count is now {basedcount}.\n\nPills: {pills}"
if SITE == "pcmemes.net":
- BASEDBOT_ACCOUNT = 800
- NOTIFICATIONS_ACCOUNT = 1046
- AUTOJANNY_ACCOUNT = 1050
- SNAPPY_ACCOUNT = 261
- LONGPOSTBOT_ACCOUNT = 1832
- ZOZBOT_ACCOUNT = 1833
- AUTOPOLLER_ACCOUNT = 3369
+ BASEDBOT_ACCOUNT = 800
+ NOTIFICATIONS_ACCOUNT = 1046
+ AUTOJANNY_ACCOUNT = 1050
+ SNAPPY_ACCOUNT = 261
+ LONGPOSTBOT_ACCOUNT = 1832
+ ZOZBOT_ACCOUNT = 1833
+ AUTOPOLLER_ACCOUNT = 3369
elif SITE == 'rdrama.net':
- NOTIFICATIONS_ACCOUNT = 1046
- AUTOJANNY_ACCOUNT = 2360
- SNAPPY_ACCOUNT = 261
- LONGPOSTBOT_ACCOUNT = 1832
- ZOZBOT_ACCOUNT = 1833
- AUTOPOLLER_ACCOUNT = 6176
+ NOTIFICATIONS_ACCOUNT = 1046
+ AUTOJANNY_ACCOUNT = 2360
+ SNAPPY_ACCOUNT = 261
+ LONGPOSTBOT_ACCOUNT = 1832
+ ZOZBOT_ACCOUNT = 1833
+ AUTOPOLLER_ACCOUNT = 6176
else:
- NOTIFICATIONS_ACCOUNT = 1
- AUTOJANNY_ACCOUNT = 2
- SNAPPY_ACCOUNT = 3
- LONGPOSTBOT_ACCOUNT = 4
- ZOZBOT_ACCOUNT = 5
- AUTOPOLLER_ACCOUNT = 6
+ NOTIFICATIONS_ACCOUNT = 1
+ AUTOJANNY_ACCOUNT = 2
+ SNAPPY_ACCOUNT = 3
+ LONGPOSTBOT_ACCOUNT = 4
+ ZOZBOT_ACCOUNT = 5
+ AUTOPOLLER_ACCOUNT = 6
PUSHER_INSTANCE_ID = '02ddcc80-b8db-42be-9022-44c546b4dce6'
PUSHER_KEY = environ.get("PUSHER_KEY", "").strip()
@@ -121,11 +121,11 @@ single_words = "|".join([slur.lower() for slur in SLURS.keys()])
SLUR_REGEX = re.compile(rf"(?i)(?<=\s|>)({single_words})(?=[\s<,.]|s[\s<,.])")
def sub_matcher(match: re.Match) -> str:
- return SLURS[match.group(0).lower()]
+ return SLURS[match.group(0).lower()]
def censor_slurs(body: str, logged_user) -> str:
- if not logged_user or logged_user.slurreplacer: body = SLUR_REGEX.sub(sub_matcher, body)
- return body
+ if not logged_user or logged_user.slurreplacer: body = SLUR_REGEX.sub(sub_matcher, body)
+ return body
if SITE_NAME == "Drama":
AWARDS = {
diff --git a/files/templates/comments.html b/files/templates/comments.html
index fab23eb12..3239cd2ef 100755
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -109,13 +109,13 @@
})()
{% if c.is_pinned %}
- const pinned_info = document.getElementById('pinned-{{c.id}}')
- {% if c.is_pinned.startswith('t:') %}
- pinned_info.setAttribute("data-bs-original-title", `Pinned until ${new Date({{c.is_pinned[2:]}} * 1000).toString()}`)
- {% else %}
- pinned_info.setAttribute("data-bs-original-title", "Pinned by @{{c.is_pinned}}")
- {%endif%}
- {%endif%}
+ const pinned_info = document.getElementById('pinned-{{c.id}}')
+ {% if c.is_pinned.startswith('t:') %}
+ pinned_info.setAttribute("data-bs-original-title", `Pinned until ${new Date({{c.is_pinned[2:]}} * 1000).toString()}`)
+ {% else %}
+ pinned_info.setAttribute("data-bs-original-title", "Pinned by @{{c.is_pinned}}")
+ {%endif%}
+ {%endif%}
})()
diff --git a/files/templates/shop.html b/files/templates/shop.html
index 931e884b3..f69f021d3 100644
--- a/files/templates/shop.html
+++ b/files/templates/shop.html
@@ -7,95 +7,95 @@
{% block pagetype %}message{% endblock %}
{% block Banner %}
-
-
-
-