From 2a68819aed11ab3fe847cfb980ad090828168f5c Mon Sep 17 00:00:00 2001
From: Oly <oly@digitaloctave.com>
Date: Thu, 17 May 2018 09:12:36 +0100
Subject: [PATCH] Changed to support multiple rooms.

---
 config/settings/common.py  | 8 +++++++-
 mhackspace/base/tasks.py   | 6 +++---
 mhackspace/users/models.py | 1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/config/settings/common.py b/config/settings/common.py
index 5e2d8c7..bfa83f5 100644
--- a/config/settings/common.py
+++ b/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'
 
diff --git a/mhackspace/base/tasks.py b/mhackspace/base/tasks.py
index c5de625..2b9f64e 100644
--- a/mhackspace/base/tasks.py
+++ b/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 = {
diff --git a/mhackspace/users/models.py b/mhackspace/users/models.py
index 2752114..bc9d88c 100644
--- a/mhackspace/users/models.py
+++ b/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,