nathanwoodburn/shakecities
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: Allow underscores in tribe names
All checks were successful
Build Docker / Build Main Image (push) Successful in 18s
Details
Build Docker / Build SLDs Image (push) Successful in 19s
Details

Browse Source
This commit is contained in:
Nathan Woodburn 2023-11-22 13:12:38 +11:00
parent 74ab088461
commit bd149f012e
Signed by: nathanwoodburn
GPG Key ID: 203B000478AD0EF1
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.py
View File

@ -68,7 +68,7 @@ def index():
tribes = db.get_tribes() tribes = db.get_tribes()
tribesHTML = "" tribesHTML = ""
for tribe in tribes: for tribe in tribes:
tribesHTML += "<a href='/tribe/" + tribe + "'>" + tribe + "</a><br>" tribesHTML += "<a href='/tribe/" + tribe + "'>" + tribe.capitalize() + "</a><br>"
if 'token' in request.cookies: if 'token' in request.cookies:
@ -337,7 +337,7 @@ def tribe_list():
tribes = db.get_tribes() tribes = db.get_tribes()
tribesHTML = "" tribesHTML = ""
for tribe in tribes: for tribe in tribes:
tribesHTML += "<a href='/tribe/" + tribe + "'>" + tribe + "</a><br>" tribesHTML += "<a href='/tribe/" + tribe + "'>" + tribe.capitalize() + "</a><br>"
# Add create link if user is logged in # Add create link if user is logged in
if 'token' in request.cookies: if 'token' in request.cookies:
@ -382,9 +382,11 @@ def create_tribe():
return resp return resp
tribe = request.form['tribe'].strip().lower() tribe = request.form['tribe'].strip().lower()
if not re.match("^[a-z0-9]*$", tribe): if not re.match("^[a-z0-9_]*$", tribe):
return error('Sorry tribe can only contain lowercase letters and numbers') return error('Sorry tribe can only contain lowercase letters, numbers and underscores')
if tribe.startswith("_") or tribe.endswith("_"):
return error('Sorry tribe can\'t start or end with an underscore')
if len(tribe) < 3: if len(tribe) < 3:
return error('Sorry tribe must be at least 3 characters long') return error('Sorry tribe must be at least 3 characters long')
if len(tribe) > 255: if len(tribe) > 255:
@ -398,7 +400,7 @@ def create_tribe():
@app.route('/tribe/<tribe>') @app.route('/tribe/<tribe>')
def tribe(tribe): def tribe(tribe):
tribe = tribe.lower() tribe = tribe.lower()
if not re.match("^[a-z0-9]*$", tribe): if not re.match("^[a-z0-9_]*$", tribe):
return error('Sorry we couldn\'t find that tribe') return error('Sorry we couldn\'t find that tribe')
data = db.get_tribe_data_raw(tribe) data = db.get_tribe_data_raw(tribe)
@ -435,7 +437,7 @@ def tribe(tribe):
@app.route('/join_tribe/<tribe>') @app.route('/join_tribe/<tribe>')
def join_tribe(tribe): def join_tribe(tribe):
tribe = tribe.lower() tribe = tribe.lower()
if not re.match("^[a-z0-9]*$", tribe): if not re.match("^[a-z0-9_]*$", tribe):
return error('Sorry we couldn\'t find that tribe') return error('Sorry we couldn\'t find that tribe')
data = db.get_tribe_data_raw(tribe) data = db.get_tribe_data_raw(tribe)