forked from MarseyWorld/MarseyWorld
one less env var
parent
3ff07e44b0
commit
43b4162378
|
@ -13,8 +13,7 @@ export TURNSTILE_SECRET='blahblahblah'
|
|||
export YOUTUBE_KEY='blahblahblah'
|
||||
export VAPID_PUBLIC_KEY='blahblahblah'
|
||||
export VAPID_PRIVATE_KEY='blahblahblah'
|
||||
export DONATE_SERVICE='blahblahblah'
|
||||
export DONATE_LINK='https://blahblahblah'
|
||||
export DONATE_LINK='blahblahblah'
|
||||
export CF_KEY='blahblahblah'
|
||||
export CF_ZONE='blahblahblah'
|
||||
export DEBIAN_FRONTEND='noninteractive'
|
||||
|
|
|
@ -34,8 +34,6 @@ TURNSTILE_SECRET = environ.get("TURNSTILE_SECRET").strip()
|
|||
YOUTUBE_KEY = environ.get("YOUTUBE_KEY").strip()
|
||||
VAPID_PUBLIC_KEY = environ.get("VAPID_PUBLIC_KEY").strip()
|
||||
VAPID_PRIVATE_KEY = environ.get("VAPID_PRIVATE_KEY").strip()
|
||||
DONATE_SERVICE = environ.get("DONATE_SERVICE").strip()
|
||||
DONATE_LINK = environ.get("DONATE_LINK").strip()
|
||||
CF_KEY = environ.get("CF_KEY").strip()
|
||||
CF_ZONE = environ.get("CF_ZONE").strip()
|
||||
blackjack = environ.get("BLACKJACK", "").strip()
|
||||
|
@ -44,6 +42,13 @@ PROGSTACK_MUL = float(environ.get("PROGSTACK_MUL", 2.0))
|
|||
ENCOURAGED = environ.get("ENCOURAGED", "").strip().split()
|
||||
ENCOURAGED2 = environ.get("ENCOURAGED2", "").strip().split()
|
||||
|
||||
DONATE_LINK = environ.get("DONATE_LINK").strip()
|
||||
|
||||
if DONATE_LINK == DEFAULT_CONFIG_VALUE:
|
||||
DONATE_SERVICE = DONATE_LINK
|
||||
else:
|
||||
DONATE_SERVICE = tldextract.extract(DONATE_LINK).domain.capitalize()
|
||||
|
||||
class Service(Enum):
|
||||
RDRAMA = auto()
|
||||
CHAT = auto()
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<div class="overflow-x-auto">
|
||||
<table class="table table-striped mb-5">
|
||||
<tbody>
|
||||
{% if DONATE_SERVICE != DEFAULT_CONFIG_VALUE and v and v.can_see_countryclub and v.chud != 1 %}
|
||||
{% if DONATE_LINK != DEFAULT_CONFIG_VALUE and v and v.can_see_countryclub and v.chud != 1 %}
|
||||
<tr>
|
||||
<td>{{DONATE_SERVICE}}</td>
|
||||
<td><a rel="nofollow noopener" href="{{DONATE_LINK}}">{{DONATE_LINK}}</a></td>
|
||||
|
@ -25,7 +25,7 @@
|
|||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
{% if v and v.truescore >= TRUESCORE_MINIMUM and DONATE_SERVICE != DEFAULT_CONFIG_VALUE %}
|
||||
{% if v and v.truescore >= TRUESCORE_MINIMUM and DONATE_LINK != DEFAULT_CONFIG_VALUE %}
|
||||
<li class="pl-2 pb-4">
|
||||
If you donate via {{DONATE_SERVICE}}, please first <a href="/settings/security#site-settings-email-section">verify your email on the site</a>, and then use that same email on {{DONATE_SERVICE}} to get your <a rel="nofollow noopener" href="{{DONATE_LINK}}">{{patron}} rewards</a> automatically!
|
||||
</li>
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
</div>
|
||||
<div class="body w-lg-100">
|
||||
<p>You're a {{TIER_TO_NAME[v.patron] if v.patron else "freeloader"}}!</p>{% if v.patron %} Thanks ily! <3{% endif %}
|
||||
{% if not v.patron and v.truescore >= TRUESCORE_MINIMUM and DONATE_SERVICE != DEFAULT_CONFIG_VALUE %}
|
||||
{% if not v.patron and v.truescore >= TRUESCORE_MINIMUM and DONATE_LINK != DEFAULT_CONFIG_VALUE %}
|
||||
<p class="font-italic">To stop freeloading, first <a href="/settings/security#site-settings-email-section">verify your email</a>, support us on <a href="{{DONATE_LINK}}">{{DONATE_SERVICE}}</a> with the same email, and click "Claim {{patron}} Rewards"</p>
|
||||
{% elif not v.patron %}
|
||||
<p class="font-italic">To stop freeloading, you can <a href="/donate">donate via crypto</a>. Please let us know first beforehand by <a href="/contact">sending us a modmail.</a> Thanks!</p>
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
<input autocomplete="off" class="btn btn-primary ml-auto" type="submit" value="Add email">
|
||||
{% endif %}
|
||||
</div>
|
||||
{% if v.truescore >= TRUESCORE_MINIMUM and DONATE_SERVICE != DEFAULT_CONFIG_VALUE %}
|
||||
{% if v.truescore >= TRUESCORE_MINIMUM and DONATE_LINK != DEFAULT_CONFIG_VALUE %}
|
||||
<div class="text-small text-muted pl-1 pt-1 pt-sm-3">
|
||||
Must be same email as the one you used to donate on <a rel="nofollow noopener" class="text-primary no-visited" href="{{DONATE_LINK}}">{{DONATE_SERVICE}}</a>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue