forked from rDrama/rDrama
Merge branch 'frost' of https://github.com/Aevann1/Drama into frost
commit
2ba05b4916
|
|
@ -347,18 +347,20 @@ def rehole_post(v, pid, hole):
|
|||
|
||||
return {"message": f"Post moved to {sub_to_str}!"}
|
||||
|
||||
def on_post_hole_entered(post, v):
|
||||
def on_post_hole_entered(post, v=None):
|
||||
if not post.sub or not post.subr:
|
||||
return
|
||||
hole = post.subr.name
|
||||
author = post.author
|
||||
|
||||
# Notify hole followers
|
||||
if not post.ghost and not post.private:
|
||||
if not post.ghost and not post.private and not author.shadowbanned:
|
||||
text = f"<a href='/h/{hole}'>/h/{hole}</a> has a new " \
|
||||
+ f"post: [{post.title}]({post.shortlink}) by @{v.username}"
|
||||
+ f"post: [{post.title}]({post.shortlink}) by @{author.username}"
|
||||
cid = notif_comment(text, autojanny=True)
|
||||
for follow in post.subr.followers:
|
||||
if follow.user_id == v.id: continue
|
||||
if follow.user_id == author.id or (v and follow.user_id == v.id):
|
||||
continue
|
||||
user = get_account(follow.user_id)
|
||||
if post.club and not user.paid_dues: continue
|
||||
add_notif(cid, user.id)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div class="col sidebar text-left {% if request.path != '/sidebar' %}d-none d-lg-block{% endif %} pt-3 pb-5 bg-white" style="max-width:300px">
|
||||
<div class="col sidebar text-left {% if request.path != '/sidebar' %}d-none d-lg-block{% endif %} pt-3 pb-5 bg-white" id="sidebar-content">
|
||||
|
||||
{% if sub %}
|
||||
{% set image=sub.sidebar_url %}
|
||||
|
|
@ -55,20 +55,4 @@
|
|||
- No doxing.<br><br>
|
||||
</div>
|
||||
{% endif %}
|
||||
<pre>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</pre>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div class="col sidebar text-left {% if request.path != '/sidebar' %}d-none d-lg-block{% endif %} pt-3 pb-5 bg-white" style="max-width:300px">
|
||||
<div class="col sidebar text-left {% if request.path != '/sidebar' %}d-none d-lg-block{% endif %} pt-3 pb-5 bg-white" id="sidebar-content">
|
||||
|
||||
{% if sub %}
|
||||
{% set image=sub.sidebar_url %}
|
||||
|
|
@ -52,6 +52,7 @@
|
|||
<a href="/h/cartel">Cartel</a>
|
||||
<a href="/h/isis">ISIS</a>
|
||||
<a href="/h/execution">Execution</a>
|
||||
<a href="/h/maiming">Maiming</a>
|
||||
<a href="/h/police">Police</a>
|
||||
<a href="/h/combat">Combat</a>
|
||||
<a href="/h/child">Child</a>
|
||||
|
|
@ -90,20 +91,4 @@
|
|||
</li>
|
||||
</ol>
|
||||
</div>
|
||||
<pre>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</pre>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ set VISITORS_HERE_FLAVOR = [
|
|||
' throwing shade right now',
|
||||
]
|
||||
-%}
|
||||
<div class="col sidebar text-left {% if request.path != '/sidebar' %}d-none d-lg-block{% endif %} pt-3 pb-5 bg-white" style="max-width:300px">
|
||||
<div class="col sidebar text-left {% if request.path != '/sidebar' %}d-none d-lg-block{% endif %} pt-3 pb-5 bg-white" id="sidebar-content">
|
||||
|
||||
{% if sub %}
|
||||
{% set image=sub.sidebar_url %}
|
||||
|
|
@ -113,20 +113,4 @@ set VISITORS_HERE_FLAVOR = [
|
|||
<span style="color:hotpink">πππ«π© π°π¨π³ ππ«π</span><br><br>
|
||||
</div>
|
||||
{% endif %}
|
||||
<pre>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</pre>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2062,7 +2062,6 @@ SET row_security = off;
|
|||
COPY public.badge_defs (id, name, description) FROM stdin;
|
||||
136 TRAIN 2022 Beware: Found to be one of the most transmisic commenters on the site!
|
||||
137 Lottershe Winner This user won the Lottershe grand prize.
|
||||
139 Kristallmopt This user was fired from a volunteer position
|
||||
140 Y'all Seein' Eye Gets notified when other sites talk about us
|
||||
141 Marsey Typographer For substantial and exceptional contributions to Marsey Alphabet.
|
||||
142 Punching Down This user mogs incels.
|
||||
|
|
@ -2070,6 +2069,8 @@ COPY public.badge_defs (id, name, description) FROM stdin;
|
|||
144 Energy Drink Enjoyer Grip 'N Sip.
|
||||
147 Freebase Fiend From the crack grew a glass rose.
|
||||
148 Blackpilled Proud incel ally.
|
||||
149 Thin This user has verified that they are calorically disciplined.
|
||||
139 Auspicious Incident This user was fired from a volunteer position
|
||||
4 White Hat Discreetly reported an exploit
|
||||
1 Alpha User Joined during open alpha
|
||||
2 Verified Email Verified Email
|
||||
|
|
@ -2175,7 +2176,7 @@ COPY public.badge_defs (id, name, description) FROM stdin;
|
|||
-- Name: badge_defs_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
|
||||
--
|
||||
|
||||
SELECT pg_catalog.setval('public.badge_defs_id_seq', 148, true);
|
||||
SELECT pg_catalog.setval('public.badge_defs_id_seq', 149, true);
|
||||
|
||||
|
||||
--
|
||||
|
|
|
|||
Loadingβ¦
Reference in New Issue