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

Fix quotes

Browse source
This commit is contained in:
redfast00 2019-02-14 19:09:08 +01:00
parent 9eccc4ae7b
commit 66fd50743f
No known key found for this signature in database
GPG key ID: 5946E0E34FD0553C
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/app.py
View file

@ -126,17 +126,17 @@ def door(username):
command = tokens[0].lower() command = tokens[0].lower()
return mattermost_response(slotmachien_request(username, command), ephemeral=True) return mattermost_response(slotmachien_request(username, command), ephemeral=True)
@app.route('/cammiechat', methods=['POST']) @app.route('/cammiechat', methods=['POST'])
@requires_token('cammiechat') @requires_token('cammiechat')
@requires_regular @requires_regular
def cammiechat(username): def cammiechat(username):
headers = { headers = {
"X-Username": username "X-Username": username
} }
requests.post("https://kelder.zeus.ugent.be/messages/", data=request.values.get('text').strip(), headers=headers) requests.post("https://kelder.zeus.ugent.be/messages/", data=request.values.get('text').strip(), headers=headers)
return mattermost_response("Message sent", ephemeral=True) return mattermost_response("Message sent", ephemeral=True)
QUOTEE_REGEX = re.compile('\W*(\w+).*')
@app.route('/addquote', methods=['POST']) @app.route('/addquote', methods=['POST'])
@requires_token('quote') @requires_token('quote')
@ -149,13 +149,18 @@ def add_quote():
db.session.commit() db.session.commit()
return mattermost_response("{} added the quote \"{}\"".format(user, quote_text)) return mattermost_response("{} added the quote \"{}\"".format(user, quote_text))
@app.route('/quote', methods=['GET'])
@app.route('/quote', methods=['POST'])
def random_quote(): def random_quote():
text_contains = request.values['text'] text_contains = request.values['text']
matches = models.Quote.query.filter(models.Quote.quote.contains(text_contains)) matches = models.Quote.query.filter(models.Quote.quote.contains(text_contains)).all()
return mattermost_response(random.choice(matches)) if matches:
selected_quote = random.choice(matches)
response = f'{selected_quote.quote}'
return mattermost_response(response)
return mattermost_response(f'No quotes found matching "{text_contains}"', ephemeral=True)
@app.route('/', methods=['GET']) @app.route('/', methods=['GET'])
def list_quotes(): def list_quotes():
return render_template('quotes.html', quotes = reversed(models.Quote.query.all())) return render_template('quotes.html', quotes=reversed(models.Quote.query.all()))

6
setup_database.py
View file

@ -4,5 +4,7 @@ from app.app import db, models
db.create_all() db.create_all()
db.session.add(models.User('admin', admin=True)) exists = models.User.query.filter_by(username='admin').first()
db.session.commit() if not exists:
db.session.add(models.User('admin', admin=True))
db.session.commit()