aw
This commit is contained in:
Aevann1
parent
56a07369fd
commit
a7b801a9bb
12 changed files with 54 additions and 32 deletions
|
|
@ -83,7 +83,7 @@ SLURS = {
|
|||
"dancing israelis": "i love Israel",
|
||||
"sodomite": "total dreamboat",
|
||||
"pajeet": "sexy Indian dude",
|
||||
"female": "birthing person",
|
||||
"female": "bleeder",
|
||||
"landlord": "landchad",
|
||||
"tenant": "renthog",
|
||||
"renter": "rentoid",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import random
|
||||
|
||||
special_min = 100
|
||||
special_max = 1000
|
||||
special_max = 200
|
||||
standard_min = 10
|
||||
standard_max = 100
|
||||
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ def shop(v):
|
|||
elif v.patron == 4: discount = 0.75
|
||||
elif v.patron == 5: discount = 0.70
|
||||
elif v.patron == 6: discount = 0.65
|
||||
elif v.patron == 7: discount = 0.60
|
||||
else: discount = 1
|
||||
|
||||
for badge in [69,70,71,72,73]:
|
||||
|
|
@ -218,8 +219,6 @@ def award_post(pid, v):
|
|||
if not post:
|
||||
return {"error": "That post doesn't exist."}, 404
|
||||
|
||||
if kind == "ghost" and post.distinguish_level: return {"error": "You can't use the ghost award on distinguished posts."}, 403
|
||||
|
||||
post_award.submission_id = post.id
|
||||
g.db.add(post_award)
|
||||
|
||||
|
|
@ -392,12 +391,6 @@ def award_post(pid, v):
|
|||
g.db.add(badge)
|
||||
g.db.flush()
|
||||
send_notification(v.id, f"@AutoJanny has given you the following profile badge:\n\n\n\n{badge.name}")
|
||||
elif kind == "ghost":
|
||||
post.ghost = True
|
||||
g.db.add(post)
|
||||
for c in post.comments:
|
||||
c.ghost = True
|
||||
g.db.add(c)
|
||||
elif kind == "rehab":
|
||||
if author.rehab: author.rehab += 86400
|
||||
else: author.rehab = int(time.time()) + 86400
|
||||
|
|
@ -444,8 +437,6 @@ def award_comment(cid, v):
|
|||
if not c:
|
||||
return {"error": "That comment doesn't exist."}, 404
|
||||
|
||||
if kind == "ghost" and c.distinguish_level: return {"error": "You can't use the ghost award on distinguished comments."}, 403
|
||||
|
||||
comment_award.comment_id = c.id
|
||||
g.db.add(comment_award)
|
||||
|
||||
|
|
@ -615,9 +606,6 @@ def award_comment(cid, v):
|
|||
g.db.add(badge)
|
||||
g.db.flush()
|
||||
send_notification(v.id, f"@AutoJanny has given you the following profile badge:\n\n\n\n{badge.name}")
|
||||
elif kind == "ghost":
|
||||
c.ghost = True
|
||||
g.db.add(c)
|
||||
elif kind == "rehab":
|
||||
if author.rehab: author.rehab += 86400
|
||||
else: author.rehab = int(time.time()) + 86400
|
||||
|
|
|
|||
|
|
@ -288,8 +288,6 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
|
|||
elif v.subs == 2:
|
||||
posts = posts.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
|
||||
elif v.subs == 3:
|
||||
posts = posts.filter(Submission.sub.in_(v.subbed_subs))
|
||||
elif v.subs == 4:
|
||||
posts = posts.filter(Submission.sub != None, Submission.sub.notin_(v.all_blocks))
|
||||
|
||||
|
||||
|
|
@ -367,8 +365,6 @@ def frontlist(v=None, sort="hot", page=1, t="all", ids_only=True, ccmode="false"
|
|||
elif v.subs == 2:
|
||||
pins = pins.filter(or_(Submission.sub == None, Submission.sub.notin_(v.all_blocks)))
|
||||
elif v.subs == 3:
|
||||
pins = pins.filter(Submission.sub.in_(v.subbed_subs))
|
||||
elif v.subs == 4:
|
||||
pins = pins.filter(Submission.sub != None, Submission.sub.notin_(v.all_blocks))
|
||||
|
||||
if v and v.admin_level < 2:
|
||||
|
|
|
|||
|
|
@ -697,7 +697,7 @@ def thumbnail_thread(pid):
|
|||
|
||||
if SITE_NAME == 'Drama':
|
||||
for t in ("submission","comment"):
|
||||
word = random.choice(('rdrama','marsey'))
|
||||
word = random.choice(('rdrama','marsey','r/drama'))
|
||||
|
||||
try:
|
||||
data = requests.get(f'https://api.pushshift.io/reddit/{t}/search?html_decode=true&q={word}&size=1', timeout=5).json()["data"]
|
||||
|
|
|
|||
|
|
@ -466,7 +466,7 @@ def sub_toggle(mode, v):
|
|||
try: mode = int(mode)
|
||||
except: abort(400)
|
||||
|
||||
if mode in (1,2,3,4) and v.subs != mode:
|
||||
if mode in (1,2,3) and v.subs != mode:
|
||||
v.subs = mode
|
||||
g.db.add(v)
|
||||
g.db.commit()
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@
|
|||
|
||||
{% if c.awards %}
|
||||
{% for a in c.awards %}
|
||||
<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award{% if a.kind != 'ghost' %} given by @{{a.user.username}}{% endif %}"></i>
|
||||
<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award given by @{{a.user.username}}"></i>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
|
|
@ -190,8 +190,8 @@
|
|||
{% if c.is_pinned %}
|
||||
<i id='pinned-{{c.id}}'class="fas fa-thumbtack fa-rotate--45 text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Pinned by @{{c.is_pinned}}" {% if c.is_pinned_utc %}onmouseover="pinned_timestamp('pinned-{{c.id}}')" data-timestamp={{c.is_pinned_utc}} {% endif %}></i>
|
||||
{% endif %}
|
||||
{% if c.distinguish_level %}<i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{SITE_NAME}} Admin, speaking officially"></i>{% endif %}
|
||||
{% if c.is_op and not c.ghost %}<i class="fas fa-microphone-stand text-info" data-bs-toggle="tooltip" data-bs-placement="bottom" title="OP"></i>{% endif %}
|
||||
{% if c.distinguish_level and not c.ghost %}<i class="fas fa-broom text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{SITE_NAME}} Admin, speaking officially"></i>{% endif %}
|
||||
{% if c.is_op %}<i class="fas fa-microphone-stand text-info" data-bs-toggle="tooltip" data-bs-placement="bottom" title="OP"></i>{% endif %}
|
||||
{% if c.is_bot %}<i class="fas fa-robot text-info" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Bot"></i>{% endif %}
|
||||
{% if c.is_blocking %}<i class="fas fa-user-minus text-warning" data-bs-toggle="tooltip" data-bs-placement="bottom" title="You're blocking this user, but you can see this comment because you're an admin"></i>{% endif %}
|
||||
{% if c.is_blocked %}<i class="fas fa-user-minus text-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="This user is blocking you."></i>{% endif %}
|
||||
|
|
|
|||
|
|
@ -91,6 +91,12 @@ You can use Markdown formatting:
|
|||
<td>:marseyrandom:</td>
|
||||
<td>???</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>Random Fortune</td>
|
||||
<td>#fortune</td>
|
||||
<td>???</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>Poll Options (can select multiple options)</td>
|
||||
<td>$$bussy$$ $$gussy$$</td>
|
||||
|
|
@ -534,6 +540,39 @@ line breaks
|
|||
</tbody>
|
||||
</table></div>
|
||||
|
||||
<h5>Comment Commands</h5>
|
||||
|
||||
<div class="overflow-x-auto"><table class="table table-striped mb-5">
|
||||
<thead class="bg-primary text-white">
|
||||
<tr>
|
||||
<th>Comment Command</th>
|
||||
<th>Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>!slots100</td>
|
||||
<td>Play slots (coins) - minimum 100 coins</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>!slotsmb100</td>
|
||||
<td>Play slots (marseybux) - minimum 100 marseybux</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>!blackjack100</td>
|
||||
<td>Play blackjack (coins) - minimum 100 coins</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>!blackjackmb100</td>
|
||||
<td>Play blackjack (marseybux) - minimum 100 marseybux</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>!wordle</td>
|
||||
<td>Play wordle</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table></div>
|
||||
|
||||
{% include "expanded_image_modal.html" %}
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -68,16 +68,13 @@
|
|||
{% elif v.subs == 2 %}
|
||||
Include all holes
|
||||
{% elif v.subs == 3 %}
|
||||
View subscribed holes only
|
||||
{% elif v.subs == 4 %}
|
||||
View holes only
|
||||
{% endif %}
|
||||
</button>
|
||||
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);">
|
||||
{% if v.subs != 1 %}<a class="dropdown-item text-small-m" href="/sub_toggle/1"><i class="fas fa-user-group mr-2 text-small-m"></i>Include subscribed holes</a>{% endif %}
|
||||
{% if v.subs != 2 %}<a class="dropdown-item text-small-m" href="/sub_toggle/2"><i class="fas fa-user-group mr-2 text-small-m"></i>Include all holes</a>{% endif %}
|
||||
{% if v.subs != 3 %}<a class="dropdown-item text-small-m" href="/sub_toggle/3"><i class="fas fa-user-group mr-2 text-small-m"></i>View subscribed holes only</a>{% endif %}
|
||||
{% if v.subs != 4 %}<a class="dropdown-item text-small-m" href="/sub_toggle/4"><i class="fas fa-user-group mr-2 text-small-m"></i>View holes only</a>{% endif %}
|
||||
{% if v.subs != 3 %}<a class="dropdown-item text-small-m" href="/sub_toggle/3"><i class="fas fa-user-group mr-2 text-small-m"></i>View holes only</a>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -613,7 +613,7 @@
|
|||
|
||||
{% if p.awards %}
|
||||
{% for a in p.awards %}
|
||||
<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award{% if a.kind != 'ghost' %} given by @{{a.user.username}}{% endif %}"></i>
|
||||
<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award given by @{{a.user.username}}"></i>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
{% if v and v.admin_level > 1 and p.author.shadowbanned %}<i class="fas fa-user-times text-admin" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Shadowbanned by @{{p.author.shadowbanned}}"></i>{% endif %}
|
||||
|
|
|
|||
|
|
@ -160,7 +160,7 @@
|
|||
|
||||
{% if p.awards %}
|
||||
{% for a in p.awards %}
|
||||
<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award{% if a.kind != 'ghost' %} given by @{{a.user.username}}{% endif %}"></i>
|
||||
<i class="{{a.class_list}} px-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{a.title}} Award given by @{{a.user.username}}"></i>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
|
|
|
|||
|
|
@ -3509,6 +3509,8 @@ And so i see your beautifull Bimboudders bound there 😳 holy fuck im going maa
|
|||
{[para]}
|
||||
This is more than just a fancy wank, this is basically getting off to the very idea of getting off. Like people that watch sissy hypnosis or whatever, they're masturbating on a meta level that I can't even comprehend. It's like trying to understand an alien mind.
|
||||
{[para]}
|
||||
fsd
|
||||
I recently got a DM telling me one of my posts have been posted on a site called Kiwifarms. I'm scared these people will continue to harass me. Is there anything I can do to stop this, it's depressing to live in a world where sites like this are still allowed to stay up. Maybe I could file some sort of copyright request.
|
||||
{[para]}
|
||||
I recently got a DM telling me one of my posts have been posted on a site called Kiwifarms. I'm scared these people will continue to harass me. Is there anything I can do to stop this, it's depressing to live in a world where sites like this are still allowed to stay up. Maybe I could file some sort of copyright request.
|
||||
come to brasil
|
||||
{[para]}
|
||||
kys
|
||||
Loading…
Add table
Add a link
Reference in a new issue