Merge branch leandr92:master (PR #181)

Author: Terrance

skpy/chat.py

@@ -338,9 +338,12 @@ class SkypeGroupChat(SkypeChat):
         active (bool):
             Whether the full group chat was retrieved from the server.  This may be ``False`` if a group conversation
             still appears in the recent list despite being left or deleted.
+        moderated (bool):
+            Whether the group chat is a Skype Moderated Group.
     """
 
-    attrs = SkypeChat.attrs + ("topic", "creatorId", "userIds", "adminIds", "open", "history", "picture", "active")
+    attrs = SkypeChat.attrs + ("topic", "creatorId", "userIds", "adminIds", "open", "history", "picture", "active",
+                               "moderated")
 
     @classmethod
     def rawToFields(cls, raw={}, active=False):
@@ -357,6 +360,7 @@ def rawToFields(cls, raw={}, active=False):
                        "creatorId": SkypeUtils.noPrefix(props.get("creator")),
                        "userIds": userIds,
                        "adminIds": adminIds,
+                       "moderated": props.get("moderatedthread") == "true",
                        "open": props.get("joiningenabled", "") == "true",
                        "history": props.get("historydisclosed", "") == "true",
                        "picture": props.get("picture", "")[4:] or None,
@@ -381,6 +385,18 @@ def setTopic(self, topic):
                         auth=SkypeConnection.Auth.RegToken, params={"name": "topic"}, json={"topic": topic})
         self.topic = topic
 
+    def setModerated(self, moderated=True):
+        """
+        Update the chat type, and make chat moderated.
+
+        Args:
+            moderated (bool): whether to enable moderation restrictions
+        """
+        self.skype.conn("PUT", "{0}/threads/{1}/properties".format(self.skype.conn.msgsHost, self.id),
+                        auth=SkypeConnection.Auth.RegToken, params={"name": "moderatedthread"},
+                        json={"moderatedthread": moderated})
+        self.moderated = moderated
+
     def setOpen(self, open):
         """
         Enable or disable joining by URL.  This does not affect current participants inviting others.
@@ -492,7 +508,7 @@ def chat(self, id):
                                auth=SkypeConnection.Auth.RegToken, params={"view": "msnp24Equivalent"}).json()
         return self.merge(SkypeChat.fromRaw(self.skype, json))
 
-    def create(self, members=(), admins=()):
+    def create(self, members=(), admins=(), moderated=False):
         """
         Create a new group chat with the given users.
 
@@ -502,17 +518,19 @@ def create(self, members=(), admins=()):
         Args:
             members (str list): user identifiers to initially join the conversation
             admins (str list): user identifiers to gain admin privileges
+            moderate (bool): whether to enable moderation restrictions
 
         Returns:
             :class:`SkypeGroupChat`: newly created group conversation
         """
         memberObjs = [{"id": "8:{0}".format(self.skype.userId), "role": "Admin"}]
+        props = {"moderatedthread": moderated}
         for id in members:
             if id == self.skype.userId:
                 continue
             memberObjs.append({"id": "8:{0}".format(id), "role": "Admin" if id in admins else "User"})
         resp = self.skype.conn("POST", "{0}/threads".format(self.skype.conn.msgsHost),
-                               auth=SkypeConnection.Auth.RegToken, json={"members": memberObjs})
+                               auth=SkypeConnection.Auth.RegToken, json={"members": memberObjs, "properties": props})
         return self.chat(resp.headers["Location"].rsplit("/", 1)[1])
 
     @staticmethod