Further simplications for literals (#35)

A follow up on #34

Author: ferhatelmas

stream_chat/channel.py

@@ -71,7 +71,7 @@ def create(self, user_id):
         :param user_id: the ID of the user creating this channel
         :return:
         """
-        self.custom_data["created_by"] = {'id': user_id}
+        self.custom_data["created_by"] = {"id": user_id}
         return self.query(watch=False, state=False, presence=False)
 
     def query(self, **options):
@@ -81,8 +81,7 @@ def query(self, **options):
         :param options: the query options, check docs on https://getstream.io/chat/docs/
         :return: Returns a query response
         """
-        payload = {"state": True, "data": self.custom_data}
-        payload.update(options)
+        payload = {"state": True, "data": self.custom_data, **options}
 
         url = "channels/{}".format(self.channel_type)
         if self.id is not None:
@@ -261,6 +260,4 @@ def show(self, user_id):
 
 
 def add_user_id(payload, user_id):
-    payload = payload.copy()
-    payload.update({'user': {'id': user_id}})
-    return payload
+    return {**payload, "user": {"id": user_id}}

stream_chat/client.py

@@ -40,7 +40,7 @@ def __init__(self, api_key, api_secret, timeout=6.0, **options):
         self.session = requests.Session()
 
     def get_default_params(self):
-        return {'api_key': self.api_key}
+        return {"api_key": self.api_key}
 
     def _parse_response(self, response):
         try:
@@ -127,33 +127,27 @@ def export_user(self, user_id, **options):
         return self.get("users/{}/export".format(user_id), options)
 
     def ban_user(self, target_id, **options):
-        data = {'target_user_id': target_id}
-        data.update(options)
+        data = {"target_user_id": target_id, **options}
         return self.post("moderation/ban", data=data)
 
     def unban_user(self, target_id, **options):
-        params = {'target_user_id': target_id}
-        params.update(options)
+        params = {"target_user_id": target_id, **options}
         return self.delete("moderation/ban", params)
 
     def flag_message(self, target_id, **options):
-        data = {'target_message_id': target_id}
-        data.update(options)
+        data = {"target_message_id": target_id, **options}
         return self.post("moderation/flag", data=data)
 
     def unflag_message(self, target_id, **options):
-        data = {'target_message_id': target_id}
-        data.update(options)
+        data = {"target_message_id": target_id, **options}
         return self.post("moderation/unflag", data=data)
 
     def flag_user(self, target_id, **options):
-        data = {'target_user_id': target_id}
-        data.update(options)
+        data = {"target_user_id": target_id, **options}
         return self.post("moderation/flag", data=data)
 
     def unflag_user(self, target_id, **options):
-        data = {'target_user_id': target_id}
-        data.update(options)
+        data = {"target_user_id": target_id, **options}
         return self.post("moderation/unflag", data=data)
 
     def mute_user(self, target_id, user_id, **options):
@@ -165,7 +159,7 @@ def mute_user(self, target_id, user_id, **options):
         :param options: additional mute options
         :return:
         """
-        data = dict(target_id=target_id, user_id=user_id, **options)
+        data = {"target_id": target_id, "user_id": user_id, **options}
         return self.post("moderation/mute", data=data)
 
     def unmute_user(self, target_id, user_id):
@@ -177,7 +171,7 @@ def unmute_user(self, target_id, user_id):
         :return:
         """
 
-        data = {'target_id': target_id, 'user_id': user_id}
+        data = {"target_id": target_id, "user_id": user_id}
         return self.post("moderation/unmute", data=data)
 
     def mark_all_read(self, user_id):
@@ -292,8 +286,7 @@ def verify_webhook(self, request_body, x_signature):
         return signature == x_signature
 
     def search(self, filter_conditions, query, **options):
-        params = options.copy()
-        params.update({"filter_conditions": filter_conditions, "query": query})
+        params = {**options, "filter_conditions": filter_conditions, "query": query}
         return self.get("search", params={"payload": json.dumps(params)})
 
     def send_file(self, uri, url, name, user, content_type=None):