midgard/mattermore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove @ if present

Browse source
This commit is contained in:
redfast00 2019-06-05 13:28:05 +02:00
parent 6913931d4f
commit b980376a71
No known key found for this signature in database
GPG key ID: 5946E0E34FD0553C
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/app.py
View file

@ -7,8 +7,6 @@ from datetime import datetime
import requests import requests
import config import config
import random import random
import re
import pdb
from mattermostdriver import Driver from mattermostdriver import Driver
app = Flask(__name__) app = Flask(__name__)
@ -83,13 +81,18 @@ def mattermost_response(message, ephemeral=False):
return Response(json.dumps(response_dict), mimetype="application/json") return Response(json.dumps(response_dict), mimetype="application/json")
# Removes @ from username if @ was prepended
def get_actual_username(username):
return username.lstrip('@')
@app.route('/authorize', methods=['POST']) @app.route('/authorize', methods=['POST'])
@requires_token('authorize') @requires_token('authorize')
@requires_admin @requires_admin
def authorize(admin_username): def authorize(admin_username):
'''Slash-command to authorize a new user or modify an existing user''' '''Slash-command to authorize a new user or modify an existing user'''
tokens = request.values.get('text').strip().split() tokens = request.values.get('text').strip().split()
to_authorize = tokens[0] to_authorize = get_actual_username(tokens[0])
as_admin = len(tokens) == 2 and tokens[1] == 'admin' as_admin = len(tokens) == 2 and tokens[1] == 'admin'
user = models.User.query.filter_by(username=to_authorize).first() user = models.User.query.filter_by(username=to_authorize).first()
if not user: if not user:
@ -110,7 +113,7 @@ def authorize(admin_username):
def revoke(admin_username): def revoke(admin_username):
'''Slash-command to revoke a user''' '''Slash-command to revoke a user'''
tokens = request.values.get('text').strip().split() tokens = request.values.get('text').strip().split()
to_revoke = tokens[0] to_revoke = get_actual_username(tokens[0])
user = models.User.query.filter_by(username=to_revoke).first() user = models.User.query.filter_by(username=to_revoke).first()
if not user: if not user:
return mattermost_response("Could not find '{}'".format(to_revoke)) return mattermost_response("Could not find '{}'".format(to_revoke))