forked from rDrama/rDrama
fdfd
parent
c1b6ad132a
commit
093543abd5
|
@ -176,7 +176,7 @@ def retry(f):
|
||||||
except OperationalError as e:
|
except OperationalError as e:
|
||||||
#self.session.rollback()
|
#self.session.rollback()
|
||||||
#raise(DatabaseOverload)
|
#raise(DatabaseOverload)
|
||||||
abort(500)
|
print("sex")
|
||||||
except:
|
except:
|
||||||
self.session.rollback()
|
self.session.rollback()
|
||||||
return f(self, *args, **kwargs)
|
return f(self, *args, **kwargs)
|
||||||
|
|
|
@ -114,7 +114,7 @@
|
||||||
<div class="user-info">
|
<div class="user-info">
|
||||||
<span class="comment-collapse d-md-none" onclick="collapse_comment('{{c.base36id}}')"></span>
|
<span class="comment-collapse d-md-none" onclick="collapse_comment('{{c.base36id}}')"></span>
|
||||||
{% if c.banaward %} <i class="fas fa-gavel text-danger" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="Given the 1-day ban award by @{{c.banaward}}"></i> {% endif %}
|
{% if c.banaward %} <i class="fas fa-gavel text-danger" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="Given the 1-day ban award by @{{c.banaward}}"></i> {% endif %}
|
||||||
{% if c.active_flags %} <a class="btn btn-primary" style="padding:1px 5px; font-size:10px;" href="javascript:void(0)" onclick="document.getElementById('flaggers-{{c.id}}').classList.toggle('d-none')">{{c.active_flags}} Flags</a> {% endif %}
|
{% if c.active_flags %} <a class="btn btn-primary" style="padding:1px 5px; font-size:10px;" href="javascript:void(0)" onclick="document.getElementById('flaggers-{{c.id}}').classList.toggle('d-none')">{{c.active_flags}} Reports</a> {% endif %}
|
||||||
{% if c.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span> {% endif %}
|
{% if c.over_18 %}<span class="badge badge-danger text-small-extra mr-1">+18</span> {% endif %}
|
||||||
{% if c.is_nsfl %}<span class="badge text-black border-danger border-1 text-small-extra">nsfl</span> {% endif %}
|
{% if c.is_nsfl %}<span class="badge text-black border-danger border-1 text-small-extra">nsfl</span> {% endif %}
|
||||||
{% if v and v.admin_level==6 and c.author.shadowbanned %}<i class="fas fa-user-times text-admin" data-toggle="tooltip" data-placement="bottom" title="Shadowbanned user"></i> {% endif %}
|
{% if v and v.admin_level==6 and c.author.shadowbanned %}<i class="fas fa-user-times text-admin" data-toggle="tooltip" data-placement="bottom" title="Shadowbanned user"></i> {% endif %}
|
||||||
|
@ -192,8 +192,8 @@
|
||||||
<div id="flaggers-{{c.id}}" class="flaggers d-none" style="margin: 7px; border: 1px solid #999b2e; padding: 10px; border-radius: 3px;">
|
<div id="flaggers-{{c.id}}" class="flaggers d-none" style="margin: 7px; border: 1px solid #999b2e; padding: 10px; border-radius: 3px;">
|
||||||
<strong style="color: #999b2e;"><i class="far fa-fw fa-flag"></i> Reported by:</strong>
|
<strong style="color: #999b2e;"><i class="far fa-fw fa-flag"></i> Reported by:</strong>
|
||||||
<ul style="margin-bottom: 0;">
|
<ul style="margin-bottom: 0;">
|
||||||
{% for u in c.flagged_by %}
|
{% for f in c.flags %}
|
||||||
<li><a href="{{ u.url }}">@{{ u.username }}</a></li>
|
<li><a href="{{ f.user.url }}">@{{ f.user.username }}</a>: "{{f.reason}}"</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
@ -280,7 +280,7 @@
|
||||||
<div class="dropdown-menu border-0 shadow" aria-labelledby="dropdownMoreLink">
|
<div class="dropdown-menu border-0 shadow" aria-labelledby="dropdownMoreLink">
|
||||||
{% if not (v and v.id==c.author_id) %}
|
{% if not (v and v.id==c.author_id) %}
|
||||||
{% if v %}
|
{% if v %}
|
||||||
<a class="dropdown-item" href="javascript:void(0)" data-toggle="modal" data-target="#reportCommentModal" onclick="report_commentModal('{{c.base36id}}','{{c.author.username if not c.author.is_deleted else '[is_deleted]'}}',)"><i class="fas fa-flag fa-fw"></i>Flag</a>
|
<a class="dropdown-item" href="javascript:void(0)" data-toggle="modal" data-target="#reportCommentModal" onclick="report_commentModal('{{c.base36id}}','{{c.author.username if not c.author.is_deleted else '[is_deleted]'}}',)"><i class="fas fa-flag fa-fw"></i>Report</a>
|
||||||
{% else %}
|
{% else %}
|
||||||
<a class="dropdown-item" href="javascript:void(0)" data-toggle="modal" data-target="#reportCommentModal" onclick=""><i class="fas fa-flag fa-fw"></i>Flag</a>
|
<a class="dropdown-item" href="javascript:void(0)" data-toggle="modal" data-target="#reportCommentModal" onclick=""><i class="fas fa-flag fa-fw"></i>Flag</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -474,7 +474,7 @@
|
||||||
<li class="list-group-item"><a href="{{c.permalink}}?context=5#context"{% if c.author.is_private %} rel="nofollow"{% endif %}><i class="fas fa-dna"></i>Context</a></li>
|
<li class="list-group-item"><a href="{{c.permalink}}?context=5#context"{% if c.author.is_private %} rel="nofollow"{% endif %}><i class="fas fa-dna"></i>Context</a></li>
|
||||||
|
|
||||||
{% if not (v and v.id==c.author_id) %}
|
{% if not (v and v.id==c.author_id) %}
|
||||||
<li class="list-group-item"><a href="javascript:void(0)" data-toggle="modal" data-dismiss="modal" data-target="#reportCommentModal" onclick="report_commentModal('{{c.base36id}}','{{c.author.username if not c.author.is_deleted else '[is_deleted]'}}')" class="d-block"><i class="fas fa-flag"></i>Flag</a></li>
|
<li class="list-group-item"><a href="javascript:void(0)" data-toggle="modal" data-dismiss="modal" data-target="#reportCommentModal" onclick="report_commentModal('{{c.base36id}}','{{c.author.username if not c.author.is_deleted else '[is_deleted]'}}')" class="d-block"><i class="fas fa-flag"></i>Report</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if v and c.parent_submission and c.author_id==v.id %}
|
{% if v and c.parent_submission and c.author_id==v.id %}
|
||||||
|
|
|
@ -10,23 +10,16 @@
|
||||||
</div>
|
</div>
|
||||||
<!-- Before report is made, show this -->
|
<!-- Before report is made, show this -->
|
||||||
<div class="" id="reportCommentFormBefore">
|
<div class="" id="reportCommentFormBefore">
|
||||||
<form>
|
<form id="report-comment-form" method="post">
|
||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<div class="h6">We're sorry something here is wrong.</div>
|
<div class="h6">We're sorry something here is wrong.</div>
|
||||||
<small class="form-text text-muted">Please select a reason for flagging below.</small>
|
<small class="form-text text-muted">Please enter a reason for reporting below.</small>
|
||||||
<input type="hidden" name="formkey" value="{{v.formkey}}">
|
<pre></pre>
|
||||||
<select name="report_type" class="custom-select mt-3">
|
<input maxlength="100" id="reason-comment" class="form-control"/>
|
||||||
<option disabled selected>
|
|
||||||
Reason for flagging?
|
|
||||||
</option>
|
|
||||||
<option value="admin">
|
|
||||||
This comment breaks Drama policy
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<button type="button" class="btn btn-link text-muted" data-dismiss="modal">Cancel</button>
|
<button type="button" class="btn btn-link text-muted" data-dismiss="modal">Cancel</button>
|
||||||
<button id="reportCommentButton" class="btn btn-danger">Report comment</button>
|
<button type="button" id="reportCommentButton" class="btn btn-danger">Report comment</button>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue