This commit is contained in:
Aevann1 2021-07-25 20:05:09 +02:00
parent 430307ff70
commit 05ed081938
2 changed files with 6 additions and 8 deletions

View file

@ -38,23 +38,21 @@ def mod_distinguish_post(bid, pid, board, v):
return "", 204 return "", 204
@app.route("/mod/invite_mod/<bid>", methods=["POST"]) @app.route("/mod/invite_mod", methods=["POST"])
@auth_required @auth_required
@validate_formkey @validate_formkey
def mod_invite_username(bid, board, v): def mod_invite_username(v):
username = request.form.get("username", '').lstrip('@') username = request.form.get("username", '').lstrip('@')
user = get_user(username) user = get_user(username)
if not user: if not user:
return jsonify({"error": "That user doesn't exist."}), 404 return jsonify({"error": "That user doesn't exist."}), 404
if board.has_ban(user):
return jsonify({"error": f"@{user.username} is exiled from +{board.name} and can't currently become a guildmaster."}), 409
if not user.can_join_gms: if not user.can_join_gms:
return jsonify({"error": f"@{user.username} already leads enough guilds."}), 409 return jsonify({"error": f"@{user.username} already leads enough guilds."}), 409
x = g.db.query(ModRelationship).filter_by( x = g.db.query(ModRelationship).filter_by(
user_id=user.id, board_id=board.id).first() user_id=user.id, board_id=1).first()
if x and x.accepted: if x and x.accepted:
return jsonify({"error": f"@{user.username} is already a mod."}), 409 return jsonify({"error": f"@{user.username} is already a mod."}), 409
@ -70,7 +68,7 @@ def mod_invite_username(bid, board, v):
else: else:
x = ModRelationship( x = ModRelationship(
user_id=user.id, user_id=user.id,
board_id=board.id, board_id=1,
accepted=False, accepted=False,
perm_full=True, perm_full=True,
perm_content=True, perm_content=True,

View file

@ -20,7 +20,7 @@
if (isValidUsername) { if (isValidUsername) {
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open("post", "/mod/invite_mod/"+boardid); xhr.open("post", "/mod/invite_mod");
xhr.withCredentials=true; xhr.withCredentials=true;
f=new FormData(); f=new FormData();
f.append("username", username); f.append("username", username);
@ -220,7 +220,7 @@
<!-- Badmin Invite User Modal --> <!-- Badmin Invite User Modal -->
<div class="modal fade" id="badminInviteModal" tabindex="-1" role="dialog" aria-labelledby="badminInviteModalTitle" aria-hidden="true"> <div class="modal fade" id="badminInviteModal" tabindex="-1" role="dialog" aria-labelledby="badminInviteModalTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document"> <div class="modal-dialog modal-dialog-centered" role="document">
<form action="/mod/invite_mod/{{b.base36id}}" id="invite-form" method="post" onsubmit="return false;"> <form action="/mod/invite_mod" id="invite-form" method="post" onsubmit="return false;">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title">Invite user to be badmin</h5> <h5 class="modal-title">Invite user to be badmin</h5>