forked from rDrama/rDrama
dsMerge branch 'frost' of https://github.com/Aevann1/Drama into frost
commit
2a508f5e6c
|
@ -996,8 +996,6 @@ def submit_post(v):
|
|||
n = Notification(comment_id=c_jannied.id, user_id=v.id)
|
||||
g.db.add(n)
|
||||
|
||||
new_post.comment_count = 1
|
||||
|
||||
if v.id == CARP_ID:
|
||||
if random.random() < 0.02: body = "i love you carp"
|
||||
else: body = ":#marseyfuckoffcarp:"
|
||||
|
@ -1058,6 +1056,7 @@ def submit_post(v):
|
|||
n = Notification(comment_id=c.id, user_id=v.id)
|
||||
g.db.add(n)
|
||||
|
||||
new_post.comment_count += 1
|
||||
|
||||
v.post_count = g.db.query(Submission.id).filter_by(author_id=v.id, is_banned=False, deleted_utc=0).count()
|
||||
g.db.add(v)
|
||||
|
|
|
@ -684,8 +684,12 @@
|
|||
|
||||
</div>
|
||||
|
||||
{% if u.song %}
|
||||
<div id="uid" class="d-none">{{u.id}}</div>
|
||||
{% if u.song%}
|
||||
{% if v and v.id == u.id %}
|
||||
<div id="vid" class="d-none">{{v.id}}</div>
|
||||
{% else %}
|
||||
<div id="uid" class="d-none">{{u.id}}</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if v %}
|
||||
|
@ -694,7 +698,7 @@
|
|||
<div id="username" class="d-none">{{u.username}}</div>
|
||||
{% endif %}
|
||||
|
||||
<script src="/static/assets/js/userpage.js?a=204"></script>
|
||||
<script src="/static/assets/js/userpage.js?a=205"></script>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
|
@ -720,7 +724,7 @@
|
|||
</nav>
|
||||
{% endif %}
|
||||
|
||||
<script src="/static/assets/js/marked.js?a=203"></script>
|
||||
<script src="/static/assets/js/marked.js?a=202"></script>
|
||||
|
||||
<style>
|
||||
.userbanner {
|
||||
|
|
|
@ -114,5 +114,5 @@
|
|||
<div id="username" class="d-none">{{u.username}}</div>
|
||||
{% endif %}
|
||||
|
||||
<script src="/static/assets/js/userpage.js?a=204"></script>
|
||||
<script src="/static/assets/js/userpage.js?a=205"></script>
|
||||
{% endblock %}
|
|
@ -48,5 +48,5 @@
|
|||
<div id="username" class="d-none">{{u.username}}</div>
|
||||
{% endif %}
|
||||
|
||||
<script src="/static/assets/js/userpage.js?a=204"></script>
|
||||
<script src="/static/assets/js/userpage.js?a=205"></script>
|
||||
{% endblock %}
|
Loading…
Reference in New Issue