forked from MarseyWorld/MarseyWorld
cbv
parent
9d43e68d0d
commit
541aab1605
|
|
@ -141,7 +141,7 @@ AGENDAPOSTER_MSG = """Hi @{username},\n\nYour {type} has been automatically remo
|
|||
included. \n\n*This is an automated message; if you need help,
|
||||
you can message us [here](/contact).*"""
|
||||
|
||||
if SITE in ('rdrama.net','devrama.xyz','2much4you.net','ruqqus.us'):
|
||||
if SITE in ('rdrama.net','devrama.xyz','ruqqus.us'):
|
||||
PW_ID = 3750
|
||||
BASEDBOT_ID = 0
|
||||
KIPPY_ID = 7150
|
||||
|
|
@ -642,8 +642,6 @@ REDDIT_NOTIFS = {
|
|||
'the_homocracy': HOMO_ID
|
||||
}
|
||||
|
||||
toomuch_subs = ('2much4you','2balkan4you','2middleeast4you','2asia4you','2caucasian4you','2european4you','2american4you')
|
||||
|
||||
discounts = {
|
||||
69: 0.02,
|
||||
70: 0.04,
|
||||
|
|
|
|||
|
|
@ -270,8 +270,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
|
|||
|
||||
if sub: posts = posts.filter_by(sub=sub.name)
|
||||
elif SITE != 'devrama.xyz':
|
||||
if SITE_NAME == '2Much4You': posts = posts.filter(Submission.sub.in_(toomuch_subs))
|
||||
elif SITE_NAME == 'Ruqqus':
|
||||
if SITE_NAME == 'Ruqqus':
|
||||
posts = posts.filter(Submission.sub != None)
|
||||
if v and v.all_blocks: posts = posts.filter(Submission.sub.notin_(v.all_blocks))
|
||||
elif SITE_NAME == 'PCM':
|
||||
|
|
@ -351,8 +350,7 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
|
|||
pins = g.db.query(Submission).filter(Submission.stickied != None, Submission.is_banned == False)
|
||||
if sub: pins = pins.filter_by(sub=sub.name)
|
||||
elif SITE != 'devrama.xyz':
|
||||
if SITE_NAME == '2Much4You': pins = pins.filter(Submission.sub.in_(toomuch_subs))
|
||||
elif SITE_NAME == 'Ruqqus':
|
||||
if SITE_NAME == 'Ruqqus':
|
||||
pins = pins.filter(Submission.sub != None)
|
||||
if v and v.all_blocks: pins = pins.filter(Submission.sub.notin_(v.all_blocks))
|
||||
elif SITE_NAME == 'PCM':
|
||||
|
|
|
|||
|
|
@ -751,7 +751,7 @@ def thumbnail_thread(pid):
|
|||
|
||||
if SITE_NAME == 'Drama':
|
||||
for t in ("submission","comment"):
|
||||
word = random.choice(('rdrama','marsey','2much4you.net'))
|
||||
word = random.choice(('rdrama','marsey'))
|
||||
|
||||
try:
|
||||
data = requests.get(f'https://api.pushshift.io/reddit/{t}/search?html_decode=true&q={word}&size=1')
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@
|
|||
{% if request.host != 'pcmemes.net' %}
|
||||
<a class="dropdown-item" href="/discord"><i class="fab fa-discord fa-fw text-left mr-3"></i>Discord</a>
|
||||
{% endif %}
|
||||
{% if not (g.webview and v.truecoins < 1) and SITE_NAME not in ('2Much4You','Ruqqus') %}
|
||||
{% if not (g.webview and v.truecoins < 1) and SITE_NAME != 'Ruqqus' %}
|
||||
<a class="dropdown-item" rel="nofollow noopener noreferrer" href="{{config('GUMROAD_LINK')}}"><i class="fas fa-dollar-sign fa-fw text-left mr-3"></i>Donate</a>
|
||||
{% endif %}
|
||||
{% if SITE_NAME == 'Drama' %}<a class="dropdown-item" href="/archives"><i class="fas fa-book fa-fw text-left mr-3"></i>Archives</a>{% endif %}
|
||||
|
|
@ -225,7 +225,7 @@
|
|||
{% if request.host != 'pcmemes.net' %}
|
||||
<a class="nav-item nav-link" href="/discord"><i class="fab fa-discord fa-fw mr-3"></i>Discord</a>
|
||||
{% endif %}
|
||||
{% if not (g.webview and v.truecoins < 1) and SITE_NAME not in ('2Much4You','Ruqqus') %}
|
||||
{% if not (g.webview and v.truecoins < 1) and SITE_NAME != 'Ruqqus' %}
|
||||
<a class="nav-item nav-link" rel="nofollow noopener noreferrer" href="{{config('GUMROAD_LINK')}}"><i class="fas fa-dollar-sign fa-fw mr-3"></i>Donate</a>
|
||||
{% endif %}
|
||||
{% if SITE_NAME == 'Drama' %}<a class="nav-item nav-link" href="/archives"><i class="fas fa-book fa-fw mr-3"></i>Archives</a>{% endif %}
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
<div class="col sidebar text-left d-none d-lg-block pt-3 bg-white" style="max-width:300px">
|
||||
{% if sub %}
|
||||
{% set image=sub.sidebar_url %}
|
||||
{% else %}
|
||||
{% set image='/static/assets/images/' + SITE_NAME + '/sidebar.webp?a=1041' %}
|
||||
{% endif %}
|
||||
|
||||
<img alt="sidebar image" role="button" data-bs-toggle="modal" data-bs-target="#expandImageModal" onclick="expandDesktopImage('{{image}}')" loading="lazy" src="{{image}}" width=100%>
|
||||
|
||||
{% if sub %}
|
||||
{% if sub.sidebar_html %}
|
||||
<div class="mt-4">{{sub.sidebar_html|safe}}</div>
|
||||
{% endif %}
|
||||
<a class="btn btn-primary btn-block mt-4" href="/s/{{sub.name}}/mods">MODS</a>
|
||||
{% if v and v.mods(sub.name) %}
|
||||
<a class="btn btn-primary btn-block" href="/s/{{sub.name}}/settings">SUB SETTINGS</a>
|
||||
{% endif %}
|
||||
{% if v %}
|
||||
<a class="btn btn-primary btn-block {% if v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/s/{{sub.name}}/block','block-sub','unblock-sub');this.classList.toggle('d-none');nextElementSibling.classList.toggle('d-none')">BLOCK SUB</a>
|
||||
<a class="btn btn-primary btn-block {% if not v.blocks(sub.name) %}d-none{% endif %}" onclick="post_toast(this,'/s/{{sub.name}}/unblock','block-sub','unblock-sub');this.classList.toggle('d-none');previousElementSibling.classList.toggle('d-none')">UNBLOCK SUB</a>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<p class="mt-4">Rules: No doxxing, No CP or other clearly illegal shit. Thanks!</p>
|
||||
{% endif %}
|
||||
|
||||
<a class="btn btn-primary btn-block" href="/create_sub">CREATE SUB</a>
|
||||
|
||||
<pre>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</pre>
|
||||
</div>
|
||||
|
|
@ -84,10 +84,6 @@
|
|||
|
||||
<div class="input-group mb2">
|
||||
<select autocomplete="off" id='sub' class="form-control" form="submitform" name="sub">
|
||||
{% if SITE_NAME == '2Much4You' %}
|
||||
{% set SUBS = toomuch_subs %}
|
||||
{% endif %}
|
||||
|
||||
{% if SITE_NAME == 'PCM' %}
|
||||
<option value="none" selected>
|
||||
None
|
||||
|
|
|
|||
Loading…
Reference in New Issue