forked from rDrama/rDrama
"Leave" instead of "Kick" when its myself
parent
6c97b77f4c
commit
d6df16394f
|
@ -176,14 +176,15 @@ def group_reject(v:User, group_name, user_id):
|
||||||
if not membership:
|
if not membership:
|
||||||
abort(404, "There is no membership to reject!")
|
abort(404, "There is no membership to reject!")
|
||||||
|
|
||||||
if membership.approved_utc:
|
if v.id == membership.user_id:
|
||||||
text = f"@{v.username} (!{group}'s owner) has kicked you from the group!"
|
msg = f"You have left !{group} successfully!"
|
||||||
msg = f"You have kicked @{membership.user.username} successfully!"
|
|
||||||
else:
|
else:
|
||||||
text = f"@{v.username} (!{group}'s owner) has rejected your application!"
|
if membership.approved_utc:
|
||||||
msg = f"You have rejected @{membership.user.username} successfully!"
|
text = f"@{v.username} (!{group}'s owner) has kicked you from the group!"
|
||||||
|
msg = f"You have kicked @{membership.user.username} successfully!"
|
||||||
if v.id != membership.user_id:
|
else:
|
||||||
|
text = f"@{v.username} (!{group}'s owner) has rejected your application!"
|
||||||
|
msg = f"You have rejected @{membership.user.username} successfully!"
|
||||||
send_repeatable_notification(membership.user_id, text)
|
send_repeatable_notification(membership.user_id, text)
|
||||||
|
|
||||||
g.db.delete(membership)
|
g.db.delete(membership)
|
||||||
|
|
|
@ -59,7 +59,7 @@
|
||||||
{% if v.id == group.owner.id or v.admin_level >= PERMS['MODS_EVERY_GROUP'] %}
|
{% if v.id == group.owner.id or v.admin_level >= PERMS['MODS_EVERY_GROUP'] %}
|
||||||
<td>
|
<td>
|
||||||
<div id="kick-{{membership.user_id}}" {% if name == 'applications' %}class="d-none"{% endif %}>
|
<div id="kick-{{membership.user_id}}" {% if name == 'applications' %}class="d-none"{% endif %}>
|
||||||
<button type="button" class="btn btn-primary btn-block" data-nonce="{{g.nonce}}" data-onclick="reject_membership(this,'{{group}}','{{membership.user_id}}')">Kick</button>
|
<button type="button" class="btn btn-primary btn-block" data-nonce="{{g.nonce}}" data-onclick="reject_membership(this,'{{group}}','{{membership.user_id}}')">{% if v.id == membership.user_id %}Leave{% else %}Kick{% endif %}</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div {% if name == 'members' %}class="d-none"{% endif %}>
|
<div {% if name == 'members' %}class="d-none"{% endif %}>
|
||||||
|
|
Loading…
Reference in New Issue