Use _set_payload_from_options in channels

ymyzk · Jul 18, 2015 · 34b9308 · 34b9308
1 parent 70474a3
commit 34b9308
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 45 deletions.
diff --git a/channels/backends/hipchat.py b/channels/backends/hipchat.py
@@ -47,14 +47,8 @@ def send(self, message, fail_silently=False, options=None):
         if self.notify is not None:
             payload["notify"] = self.notify
 
-        if options is not None and "hipchat" in options:
-            options = options["hipchat"]
-            if "color" in options:
-                payload["color"] = options["color"]
-            if "notify" in options:
-                payload["notify"] = options["notify"]
-            if "message_format" in options:
-                payload["message_format"] = options["message_format"]
+        self._set_payload_from_options(payload, options, "hipchat", [
+            "color", "notify", "message_format"])
 
         try:
             response = requests.post(self.url,

diff --git a/channels/backends/slack.py b/channels/backends/slack.py
@@ -34,17 +34,14 @@ def send(self, message, fail_silently=False, options=None):
             payload["icon_emoji"] = self.icon_emoji
         if self.icon_url is not None:
             payload["icon_url"] = self.icon_url
-        if options is not None and "slack" in options:
-            options = options["slack"]
-            if "attachments" in options:
-                payload["attachments"] = options["attachments"]
-            if "unfurl_links" in options:
-                payload["unfurl_links"] = options["unfurl_links"]
-        data = {
-            "payload": json.dumps(payload)
-        }
+
+        self._set_payload_from_options(payload, options, "slack", [
+            "attachments", "unfurl_links"])
+
         try:
-            response = requests.post(self.url, data=data)
+            response = requests.post(self.url, data={
+                "payload": json.dumps(payload)
+            })
             if response.status_code != requests.codes.ok:
                 raise HttpError(response.status_code, response.text)
         except:

diff --git a/channels/backends/twitter.py b/channels/backends/twitter.py
@@ -29,25 +29,9 @@ def send(self, message, fail_silently=False, options=None):
             "status": message
         }
 
-        if options is not None and "twitter" in options:
-            options = options["twitter"]
-            if "in_reply_to_status_id" in options:
-                payload["in_reply_to_status_id"] =\
-                    options["in_reply_to_status_id"]
-            if "possibly_sensitive" in options:
-                payload["possibly_sensitive"] = options["possibly_sensitive"]
-            if "lat" in options:
-                payload["lat"] = options["lat"]
-            if "long" in options:
-                payload["long"] = options["long"]
-            if "place_id" in options:
-                payload["place_id"] = options["place_id"]
-            if "display_coordinates" in options:
-                payload["display_coordinates"] = options["display_coordinates"]
-            if "trim_user" in options:
-                payload["trim_user"] = options["trim_user"]
-            if "media_ids" in options:
-                payload["media_ids"] = options["media_ids"]
+        self._set_payload_from_options(payload, options, "twitter", [
+            "in_reply_to_status_id", "possibly_sensitive", "lat", "long",
+            "place_id", "display_coordinates", "trim_user", "media_ids"])
 
         auth = OAuth1(self.api_key, self.api_secret, self.access_token,
                       self.access_token_secret)

diff --git a/channels/backends/yo.py b/channels/backends/yo.py
@@ -22,14 +22,8 @@ def send(self, message, fail_silently=False, options=None):
         if self.username is not None:
             payload["username"] = self.username
 
-        if options is not None and "yo" in options:
-            options = options["yo"]
-            if "username" in options:
-                payload["username"] = options["username"]
-            if "link" in options:
-                payload["link"] = options["link"]
-            if "location" in options:
-                payload["location"] = options["location"]
+        self._set_payload_from_options(payload, options, "yo", [
+            "username", "link", "location"])
 
         try:
             response = requests.post(self.url, data=payload)