Merge pull request #1806 from...

Merge pull request #1806 from OpenTechFund/enhancement/add-option-for-comment-notification-slack-room

Add SLACK_DESTINATION_ROOM_COMMENTS setting allowing comments notific…

opentech/apply/activity/messaging.py

@@ -429,6 +429,7 @@ class SlackAdapter(AdapterBase):
         super().__init__()
         self.destination = settings.SLACK_DESTINATION_URL
         self.target_room = settings.SLACK_DESTINATION_ROOM
+        self.comments_room = settings.SLACK_DESTINATION_ROOM_COMMENTS
 
     def slack_links(self, links, sources):
         return ', '.join(
@@ -591,7 +592,7 @@ class SlackAdapter(AdapterBase):
 
         return f'<{user.slack}>'
 
-    def slack_channels(self, source):
+    def slack_channels(self, source, **kwargs):
         target_rooms = [self.target_room]
         try:
             extra_rooms = source.get_from_parent('slack_channel').split(',')
@@ -601,6 +602,13 @@ class SlackAdapter(AdapterBase):
         else:
             target_rooms.extend(extra_rooms)
 
+        try:
+            if self.comments_room and kwargs['comment']:
+                target_rooms.extend([self.comments_room])
+        except KeyError:
+            # Not a comment.
+            pass
+
         # Make sure each channel name starts with a "#".
         target_rooms = [
             room if room.startswith('#') else '#' + room
@@ -611,7 +619,7 @@ class SlackAdapter(AdapterBase):
         return target_rooms
 
     def send_message(self, message, recipient, source, **kwargs):
-        target_rooms = self.slack_channels(source)
+        target_rooms = self.slack_channels(source, **kwargs)
 
         if not self.destination or not any(target_rooms):
             errors = list()

opentech/settings/base.py

@@ -505,6 +505,7 @@ if not SEND_MESSAGES:
 
 SLACK_DESTINATION_URL = env.get('SLACK_DESTINATION_URL', None)
 SLACK_DESTINATION_ROOM = env.get('SLACK_DESTINATION_ROOM', None)
+SLACK_DESTINATION_ROOM_COMMENTS = env.get('SLACK_DESTINATION_ROOM_COMMENTS', None)
 
 
 # Celery config