Merge branch 'master' of code.monkeystew.net:thrrgilag/pnut-matrix
This commit is contained in:
commit
b4923409be
1 changed files with 1 additions and 1 deletions
|
@ -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()
|
r_event = MatrixMsgEvents.query.filter_by(event_id=event['redacts'],room_id=event['room_id']).first()
|
||||||
if r_event:
|
if r_event:
|
||||||
if r_event.pnut_user == app.config['MATRIX_PNUT_USER']:
|
if r_event.pnut_user == app.config['MATRIX_PNUT_USER']:
|
||||||
token = token == app.config['MATRIX_PNUT_TOKEN']
|
token = app.config['MATRIX_PNUT_TOKEN']
|
||||||
else:
|
else:
|
||||||
r_user = MatrixUser.query.filter_by(pnut_id=r_event.pnut_user).first()
|
r_user = MatrixUser.query.filter_by(pnut_id=r_event.pnut_user).first()
|
||||||
if r_user:
|
if r_user:
|
||||||
|
|
Loading…
Reference in a new issue