diff --git a/files/helpers/const.py b/files/helpers/const.py index f0959c130..db685dba3 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -281,35 +281,6 @@ elif SITE == 'pcmemes.net': LOTTERY_TICKET_COST = 12 LOTTERY_SINK_RATE = -8 -elif SITE == 'cringetopia.org': - EMOJI_SRCS = ['files/assets/emojis.json', 'files/assets/emojis.cringetopia.json'] - - HOLE_COST = 10000 - - AUTOJANNY_ID = 1 - SNAPPY_ID = 3 - LONGPOSTBOT_ID = 4 - ZOZBOT_ID = 5 - - GIFT_NOTIF_ID = 9 - CARP_ID = 43 - AEVANN_ID = 9 - SNAKES_ID = 3284 - - WELCOME_MSG = "Hi there! It's me, your soon-to-be favorite Cringetopia user @carpathianflorist here to give you a brief rundown on some of the sick features we have here. You'll probably want to start by following me, though. So go ahead and click my name and then smash that Follow button. This is actually really important, so go on. Hurry.\n\nThanks!\n\nNext up: If you're a member of the media, similarly just shoot me a DM and I'll set about verifying you and then we can take care of your sad journalism stuff.\n\n**FOR EVERYONE ELSE**\n\n Begin by navigating to [the settings page](/settings/profile) (we'll be prettying this up so it's less convoluted soon, don't worry) and getting some basic customization done.\n\n### Themes\n\nDefinitely change your theme right away, the default one (Midnight) is pretty enough, but why not use something *exotic* like Win98, or *flashy* like Tron? Even Coffee is super tasteful and way more fun than the default. More themes to come when we get around to it!\n\n### Avatar/pfp\n\nYou'll want to set this pretty soon. Set the banner too while you're at it. Your profile is important!\n\n### Flairs\n\nSince you're already on the settings page, you may as well set a flair, too. As with your username, you can - obviously - choose the color of this, either with a hex value or just from the preset colors. And also like your username, you can change this at any time.\n\n### PROFILE ANTHEMS\n\nSpeaking of profiles, hey, remember MySpace? Do you miss autoplaying music assaulting your ears every time you visited a friend's page? Yeah, we brought that back. Enter a YouTube URL, wait a few seconds for it to process, and then BAM! you've got a profile anthem which people cannot mute. Unless they spend 20,000 coins in the shop for a mute button. Which you can then remove from your profile by spending 40,000 coins on an unmuteable anthem. Get fucked poors!\n\n### Coins?\n\nCoins is basically our take on the karma system. Except unlike the karma system, it's not gay and boring and stupid and useless. Coins can be spent at [Marsey's Dramacoin Emporium](/shop) on upgrades to your user experience (many more coming than what's already listed there), and best of all on tremendously annoying awards to fuck with your fellow autists. We're always adding more, so check back regularly in case you happen to miss one of the announcement posts.\n\nLike karma, Coins is obtained by getting upvotes on your threads and comments. *Unlike* karma, it's also obtained by getting downvotes on your threads and comments. Downvotes don't really do anything here - they pay the same amount of Coins and they increase thread/comment ranking just the same as an upvote. You just use them to express petty disapproval and hopefully start a fight. Because all votes are visible here. To hell with your anonymity.\n\nCoins can also be traded amongst users from their profiles. Note that there is a 3% transaction fee.\n\n### Badges\n\nRemember all those neat little metallic icons you saw on my profile when you were following me? If not, scroll back up and go have a look. And doublecheck to make sure you pressed the Follow button. Anyway, those are badges. You earn them by doing a variety of things. Some of them even offer benefits, like discounts at the shop. A [complete list of badges and their requirements can be found here](/badges), though I add more pretty regularly, so keep an eye on the [changelog](/h/changelog).\n\n### Other stuff\n\nWe're always adding new features, and we take a fun-first approach to development. If you have a suggestion for something that would be fun, funny, annoying - or best of all, some combination of all three - definitely make a thread about it. Or just DM me if you're shy. Weirdo. Anyway there's also the [leaderboards](/leaderboard), boring stuff like two-factor authentication you can toggle on somewhere in the settings page (psycho), the ability to save posts and comments, more than a thousand emojis, and on and on and on and on. This is just the basics, mostly to help you get acquainted with some of the things you can do here to make it more easy on the eyes, customizable, and enjoyable. If you don't enjoy it, just go away! We're not changing things to suit you! Get out of here loser! And no, you can't delete your account :na:\n\nI love you.
*xoxo Carp* 💋" - ROLES={ - "owner": "809580734578819072", - "admin": "846509661288267776", - "linked": "890342909390520382", - "1": "868129042346414132", - "2": "875569477671067688", - "3": "869434199575236649", - "4": "868140288013664296", - "5": "947236580794450010", - "6": "947236351445725204", - "7": "886781932430565418", - } - PROCOINS_ENABLED = False elif SITE == 'watchpeopledie.co': PERMS['HOLE_CREATE'] = 2 PERMS['FLAGS_VISIBLE'] = 2 @@ -913,7 +884,6 @@ approved_embed_hosts = { SITE, 'rdrama.net', 'pcmemes.net', - 'cringetopia.org', 'watchpeopledie.co', 'devrama.xyz', 'lgbdropthet.com', @@ -1016,7 +986,7 @@ MASTER_KEY = environ.get("MASTER_KEY") TRUSTED_SERVER_PSK = environ.get("TRUSTED_SERVER_PSK", None) FP = environ.get("FP") -if SITE_NAME in ('Cringetopia', 'WPD'): PATRON_DEFAULT = 7 +if SITE_NAME == 'WPD': PATRON_DEFAULT = 7 else: PATRON_DEFAULT = 0 tiers={ diff --git a/files/templates/award_modal.html b/files/templates/award_modal.html index 364506589..47854ce41 100644 --- a/files/templates/award_modal.html +++ b/files/templates/award_modal.html @@ -28,7 +28,7 @@ - +
diff --git a/files/templates/comments.html b/files/templates/comments.html index 1708874b8..3103a9713 100644 --- a/files/templates/comments.html +++ b/files/templates/comments.html @@ -441,7 +441,7 @@ Context - + {% if v %} @@ -648,7 +648,7 @@ Context - Copy link + Copy link {% if v %} Report diff --git a/files/templates/default.html b/files/templates/default.html index 5d0a93603..f14daf2da 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -263,8 +263,6 @@ {% elif SITE == 'pcmemes.net' %} - {% elif SITE == 'cringetopia.org' %} - {% endif %} diff --git a/files/templates/formatting.html b/files/templates/formatting.html index 8e4384c58..37f1b0f60 100644 --- a/files/templates/formatting.html +++ b/files/templates/formatting.html @@ -603,7 +603,7 @@ line breaks !slots100 Play slots using coins - minimum 100 coins - {% if SITE_NAME not in ('Cringetopia', 'WPD') %} + {% if SITE_NAME != 'WPD' %} !slotsmb100 Play slots using marseybux - minimum 100 marseybux @@ -613,7 +613,7 @@ line breaks !blackjack100 Play blackjack using coins - minimum 100 coins - {% if SITE_NAME not in ('Cringetopia', 'WPD') %} + {% if SITE_NAME != 'WPD' %} !blackjackmb100 Play blackjack using marseybux - minimum 100 marseybux diff --git a/files/templates/header.html b/files/templates/header.html index 59d806262..d829e4dc6 100644 --- a/files/templates/header.html +++ b/files/templates/header.html @@ -238,7 +238,7 @@ Discord Fediverse {% endif %} - {% if SITE_NAME not in ('Cringetopia', 'WPD') %} + {% if SITE_NAME != 'WPD' %} Donate {% endif %} {% if SITE_NAME == 'rDrama' %} @@ -297,7 +297,7 @@ Discord Fediverse {% endif %} - {% if SITE_NAME not in ('Cringetopia', 'WPD') %} + {% if SITE_NAME != 'WPD' %} Donate {% endif %} {% if SITE_NAME == 'rDrama' %}Archives{% endif %} diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html index f9c6a192a..b9061e6d2 100644 --- a/files/templates/post_actions.html +++ b/files/templates/post_actions.html @@ -12,7 +12,7 @@ Give Award {% endif %} -Copy link +Copy link {% if v %} Subscribe diff --git a/files/templates/post_actions_mobile.html b/files/templates/post_actions_mobile.html index c2dbfc8ab..3428a4e9d 100644 --- a/files/templates/post_actions_mobile.html +++ b/files/templates/post_actions_mobile.html @@ -8,7 +8,7 @@ {% if not p.ghost or v.id == AEVANN_ID %}{% endif %} - + diff --git a/files/templates/settings_security.html b/files/templates/settings_security.html index 75855b34f..b710a8878 100644 --- a/files/templates/settings_security.html +++ b/files/templates/settings_security.html @@ -44,7 +44,7 @@
- {% if SITE_NAME not in ('Cringetopia', 'WPD') %} + {% if SITE_NAME != 'WPD' %} Claim paypig rewards {% endif %} {% if v.email %} @@ -53,7 +53,7 @@ {% endif %}
- {% if SITE_NAME not in ('Cringetopia', 'WPD') %} + {% if SITE_NAME != 'WPD' %} Must be same email as gumroad {% endif %}
diff --git a/files/templates/shop.html b/files/templates/shop.html index 34c4da878..2c9c97354 100644 --- a/files/templates/shop.html +++ b/files/templates/shop.html @@ -2,7 +2,6 @@ {%- set SHOP_FLAVOR = { 'rDrama': 'Stir drama.', 'PCM': 'Watch IP2.', - 'Cringetopia': 'Look at cringe.', 'WPD': 'Watch people die.', }[SITE_NAME] -%} @@ -85,7 +84,7 @@ {% set kind = a['kind'] %} {% if a['kind'] != "benefactor" %}Buy{% endif %} - {% if SITE_NAME not in ('Cringetopia', 'WPD') %} + {% if SITE_NAME != 'WPD' %} {% if a['kind'] != "grass" %}Buy with MBux{% endif %} {% endif %} diff --git a/readme.md b/readme.md index ea259d68d..99a11be8a 100644 --- a/readme.md +++ b/readme.md @@ -1,7 +1,7 @@ [![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, https://cringetopia.org, and https://watchpeopledie.co +This code runs https://rdrama.net, https://pcmemes.net, and https://watchpeopledie.co # Installation (Windows/Linux/MacOS)