diff --git a/files/helpers/const.py b/files/helpers/const.py
index 56a2505e2..5124931e9 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -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",
diff --git a/files/helpers/treasure.py b/files/helpers/treasure.py
index d5e9e293b..ab8b5b8d8 100644
--- a/files/helpers/treasure.py
+++ b/files/helpers/treasure.py
@@ -1,7 +1,7 @@
import random
special_min = 100
-special_max = 1000
+special_max = 200
standard_min = 10
standard_max = 100
diff --git a/files/routes/awards.py b/files/routes/awards.py
index f66e45263..d9a5e088e 100644
--- a/files/routes/awards.py
+++ b/files/routes/awards.py
@@ -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
diff --git a/files/routes/front.py b/files/routes/front.py
index a69612a26..fbe8c334b 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -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:
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 571cda4bb..e81596161 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -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"]
diff --git a/files/routes/subs.py b/files/routes/subs.py
index 755369e87..45fb64a7d 100644
--- a/files/routes/subs.py
+++ b/files/routes/subs.py
@@ -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()
diff --git a/files/templates/comments.html b/files/templates/comments.html
index e51a43ef9..f9a7a1b26 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -170,7 +170,7 @@
{% if c.awards %}
{% for a in c.awards %}
-
+
{% endfor %}
{% endif %}
@@ -190,8 +190,8 @@
{% if c.is_pinned %}
{% endif %}
- {% if c.distinguish_level %}{% endif %}
- {% if c.is_op and not c.ghost %}{% endif %}
+ {% if c.distinguish_level and not c.ghost %}{% endif %}
+ {% if c.is_op %}{% endif %}
{% if c.is_bot %}{% endif %}
{% if c.is_blocking %}{% endif %}
{% if c.is_blocked %}{% endif %}
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index fce8a06d0..88b4ba0b2 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -91,6 +91,12 @@ You can use Markdown formatting:
| :marseyrandom: |
??? |
+
+ | Random Fortune |
+ #fortune |
+ ??? |
+
+
| Poll Options (can select multiple options) |
$$bussy$$ $$gussy$$ |
@@ -534,6 +540,39 @@ line breaks
+Comment Commands
+
+
+
+
+ | Comment Command |
+ Description |
+
+
+
+
+ | !slots100 |
+ Play slots (coins) - minimum 100 coins |
+
+
+ | !slotsmb100 |
+ Play slots (marseybux) - minimum 100 marseybux |
+
+
+ | !blackjack100 |
+ Play blackjack (coins) - minimum 100 coins |
+
+
+ | !blackjackmb100 |
+ Play blackjack (marseybux) - minimum 100 marseybux |
+
+
+ | !wordle |
+ Play wordle |
+
+
+