master
Aevann1 2022-02-28 00:42:13 +02:00
parent 48ae53263a
commit ac0932986a
4 changed files with 24 additions and 18 deletions

View File

@ -1206,14 +1206,15 @@ def submit_post(v, sub=None):
for x in notify_users: for x in notify_users:
add_notif(cid, x) add_notif(cid, x)
text = f"@{v.username} has made a new post: [{post.title}]({post.shortlink})" if request.values.get('followers'):
if post.sub: text += f" in <a href='/s/{post.sub}'>/s/{post.sub}" text = f"@{v.username} has made a new post: [{post.title}]({post.shortlink})"
if post.sub: text += f" in <a href='/s/{post.sub}'>/s/{post.sub}"
cid = notif_comment(text, autojanny=True) cid = notif_comment(text, autojanny=True)
for follow in v.followers: for follow in v.followers:
user = get_account(follow.user_id) user = get_account(follow.user_id)
if post.club and not user.paid_dues: continue if post.club and not user.paid_dues: continue
add_notif(cid, user.id) add_notif(cid, user.id)

View File

@ -744,7 +744,7 @@
{% if p.edited_utc %} {% if p.edited_utc %}
&nbsp;&nbsp;Edited <span data-bs-toggle="tooltip" data-bs-placement="bottom" onmouseover="timestamp('edited_timestamp','{{p.edited_utc}}')" id="edited_timestamp">{{p.edited_string}}</span> &nbsp;&nbsp;Edited <span data-bs-toggle="tooltip" data-bs-placement="bottom" onmouseover="timestamp('edited_timestamp','{{p.edited_utc}}')" id="edited_timestamp">{{p.edited_string}}</span>
{% endif %} {% endif %}
&nbsp;&nbsp;{{p.views}} views &nbsp;&nbsp;{{p.views}} reads
</div> </div>
{% if p.active_flags %} {% if p.active_flags %}
<div id="flaggers" class="flaggers d-none"> <div id="flaggers" class="flaggers d-none">

View File

@ -208,7 +208,7 @@
{% if p.edited_utc %} {% if p.edited_utc %}
&nbsp;&nbsp;Edited <span data-bs-toggle="tooltip" data-bs-placement="bottom" id="edited_timestamp-{{p.id}}" onmouseover="timestamp('edited_timestamp-{{p.id}}','{{p.edited_utc}}')">{{p.edited_string}}</span> &nbsp;&nbsp;Edited <span data-bs-toggle="tooltip" data-bs-placement="bottom" id="edited_timestamp-{{p.id}}" onmouseover="timestamp('edited_timestamp-{{p.id}}','{{p.edited_utc}}')">{{p.edited_string}}</span>
{% endif %} {% endif %}
&nbsp;&nbsp;{{p.views}} views &nbsp;&nbsp;{{p.views}} reads
</div> </div>
<h5 class="card-title post-title text-left w-lg-95 mb-0 pb-0 pb-md-1"><a {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}" class="stretched-link {% if p.author.agendaposter %}agendaposter{% endif %}"> <h5 class="card-title post-title text-left w-lg-95 mb-0 pb-0 pb-md-1"><a {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}" class="stretched-link {% if p.author.agendaposter %}agendaposter{% endif %}">

View File

@ -161,27 +161,32 @@
<pre></pre> <pre></pre>
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<input autocomplete="off" type="checkbox" class="custom-control-input" id="nsfwCheck" name="over_18"> <input checked autocomplete="off" type="checkbox" class="custom-control-input" id="followers" name="followers">
<label class="custom-control-label" for="nsfwCheck">+18</label> <label class="custom-control-label" for="followers">Alert Followers</label>
</div>
<div class="custom-control custom-checkbox">
<input autocomplete="off" type="checkbox" class="custom-control-input" id="nsfw" name="over_18">
<label class="custom-control-label" for="nsfw">+18</label>
</div> </div>
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<input autocomplete="off" type="checkbox" class="custom-control-input" id="privateCheck" name="private"> <input autocomplete="off" type="checkbox" class="custom-control-input" id="private" name="private">
<label class="custom-control-label" for="privateCheck">Draft</label> <label class="custom-control-label" for="private">Draft</label>
</div> </div>
{% if v.club_allowed != False %} {% if v.club_allowed != False %}
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<input autocomplete="off" type="checkbox" class="custom-control-input" id="clubCheck" name="club"> <input autocomplete="off" type="checkbox" class="custom-control-input" id="club" name="club">
<label class="custom-control-label" for="clubCheck">{{CC_TITLE}} thread</label> <label class="custom-control-label" for="club">{{CC_TITLE}} thread</label>
</div> </div>
{% endif %} {% endif %}
<div class="custom-control custom-checkbox"> <div class="custom-control custom-checkbox">
<input {% if ghost != 42069 and v.coins < ghost and v.procoins < ghost %}disabled{% endif %} autocomplete="off" type="checkbox" class="custom-control-input" id="ghostCheck" name="ghost"> <input {% if ghost != 42069 and v.coins < ghost and v.procoins < ghost %}disabled{% endif %} autocomplete="off" type="checkbox" class="custom-control-input" id="ghost" name="ghost">
{% if ghost == 42069 %} {% if ghost == 42069 %}
<label class="custom-control-label" for="ghostCheck">Ghost Thread (will use a ghost award you own)</label> <label class="custom-control-label" for="ghost">Ghost Thread (will use a ghost award you own)</label>
{% else %} {% else %}
<label class="custom-control-label" for="ghostCheck">Ghost Thread (cost: {{ghost}} coins or marseybux)</label> <label class="custom-control-label" for="ghost">Ghost Thread (cost: {{ghost}} coins or marseybux)</label>
{% endif %} {% endif %}
</div> </div>