Changed to support multiple rooms.

config/settings/common.py

@@ -499,7 +499,13 @@ CORS_ORIGIN_WHITELIST = (
 # Matrix chat settings
 MATRIX_USER=env('MATRIX_USERNAME')
 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'
 X_FRAME_OPTIONS = 'SAMEORIGIN'
 

mhackspace/base/tasks.py

@@ -34,7 +34,7 @@ def send_email(email_to,
     return {'result', 'Email sent to %s' % email_to}
 
 @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
     # TODO at least log that something has gone wrong
     try:
@@ -48,14 +48,14 @@ def matrix_message(message, prefix=''):
 
         # join room by id
         url_params = {
-            'room': settings.MATRIX_ROOM,
+            'room': settings.MATRIX_ROOM.get(room),
             'access_token': access_token}
         url = matrix_join_room_id_url.format(**url_params)
         r1 = requests.post(url)
 
         # send message
         url_params = {
-            "room": settings.MATRIX_ROOM,
+            "room": settings.MATRIX_ROOM.get(room),
             "access_token": access_token}
         url = matrix_send_msg_url.format(**url_params)
         details = {

mhackspace/users/models.py

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