oly
/
hackspace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed to support multiple rooms.

This commit is contained in:
Oly 2018-05-17 09:12:36 +01:00
parent e73758ae75
commit 2a68819aed
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/settings/common.py
View File

@ -499,7 +499,13 @@ CORS_ORIGIN_WHITELIST = (
# Matrix chat settings # Matrix chat settings
MATRIX_USER=env('MATRIX_USERNAME') MATRIX_USER=env('MATRIX_USERNAME')
MATRIX_PASSWORD=env('MATRIX_PASSWORD') MATRIX_PASSWORD=env('MATRIX_PASSWORD')
MATRIX_ROOM=env('MATRIX_ROOM') MATRIX_ROOM={
'default': env('MATRIX_ROOM', default='fmCpNwqgIiuwATlcdw:matrix.org'),
'admin': 'SiUlbxziFQjndQQTvl:matrix.org',
'piwars': 'ilIDnMSGUKsejBFkmh:matrix.org'
}
MSG_PREFIX = 'MH' MSG_PREFIX = 'MH'
X_FRAME_OPTIONS = 'SAMEORIGIN' X_FRAME_OPTIONS = 'SAMEORIGIN'

6
mhackspace/base/tasks.py
View File

@ -34,7 +34,7 @@ def send_email(email_to,
return {'result', 'Email sent to %s' % email_to} return {'result', 'Email sent to %s' % email_to}
@shared_task @shared_task
def matrix_message(message, prefix=''): def matrix_message(message, prefix='', room='default'):
# we dont rely on theses, so ignore if it goes wrong # we dont rely on theses, so ignore if it goes wrong
# TODO at least log that something has gone wrong # TODO at least log that something has gone wrong
try: try:
@ -48,14 +48,14 @@ def matrix_message(message, prefix=''):
# join room by id # join room by id
url_params = { url_params = {
'room': settings.MATRIX_ROOM, 'room': settings.MATRIX_ROOM.get(room),
'access_token': access_token} 'access_token': access_token}
url = matrix_join_room_id_url.format(**url_params) url = matrix_join_room_id_url.format(**url_params)
r1 = requests.post(url) r1 = requests.post(url)
# send message # send message
url_params = { url_params = {
"room": settings.MATRIX_ROOM, "room": settings.MATRIX_ROOM.get(room),
"access_token": access_token} "access_token": access_token}
url = matrix_send_msg_url.format(**url_params) url = matrix_send_msg_url.format(**url_params)
details = { details = {

1
mhackspace/users/models.py
View File

@ -123,6 +123,7 @@ class Rfid(models.Model):
def send_subscription_update_message(sender, instance, **kwargs): def send_subscription_update_message(sender, instance, **kwargs):
matrix_message.delay( matrix_message.delay(
room='admin',
prefix=' - MEMBERSHIP', prefix=' - MEMBERSHIP',
message='Changed to %s for user %s' % ( message='Changed to %s for user %s' % (
instance.get_status, instance.get_status,