Commit b4923409 authored by Morgan McMillian's avatar Morgan McMillian

Merge branch 'master' of code.monkeystew.net:thrrgilag/pnut-matrix

parents 27fc81d7 077eea1f
......@@ -131,7 +131,7 @@ def on_receive_events(transaction):
r_event = MatrixMsgEvents.query.filter_by(event_id=event['redacts'],room_id=event['room_id']).first()
if r_event:
if r_event.pnut_user == app.config['MATRIX_PNUT_USER']:
token = token == app.config['MATRIX_PNUT_TOKEN']
token = app.config['MATRIX_PNUT_TOKEN']
else:
r_user = MatrixUser.query.filter_by(pnut_id=r_event.pnut_user).first()
if r_user:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment