bbbctl 0.2.0__tar.gz → 0.3.1__tar.gz

{bbbctl-0.2.0/src/bbbctl.egg-info → bbbctl-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: bbbctl
-Version: 0.2.0
+Version: 0.3.1
 Summary: BigBlueButton API command-line client
 Home-page: https://github.com/defnull/bbbctl
 Author: Marcel Hellkamp

{bbbctl-0.2.0 → bbbctl-0.3.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bbbctl
-version = 0.2.0
+version = 0.3.1
 author = Marcel Hellkamp
 author_email = marc@gsites.de
 description = BigBlueButton API command-line client

{bbbctl-0.2.0 → bbbctl-0.3.1/src/bbbctl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: bbbctl
-Version: 0.2.0
+Version: 0.3.1
 Summary: BigBlueButton API command-line client
 Home-page: https://github.com/defnull/bbbctl
 Author: Marcel Hellkamp

{bbbctl-0.2.0 → bbbctl-0.3.1}/src/bbbctl.py

@@ -28,7 +28,7 @@ class BBBApiClient:
         self.ssl = ssl_context or ssl.create_default_context()
 
     def makeurl(self, command, **query):
-        query = urllib.parse.urlencode(query)
+        query = urllib.parse.urlencode({k:v for k,v in query.items() if v is not None})
         checksum = hashlib.sha1(
             (command + query + self.secret).encode("utf8")
         ).hexdigest()
@@ -70,6 +70,9 @@ class BBBApiClient:
     def deleteRecordings(self, recordID):
         return self.call("deleteRecordings", recordID=recordID)
 
+    def sendChatMessage(self, meetingID, message, userName=None):
+        return self.call("sendChatMessage", meetingID=meetingID, message=message, userName=userName)
+
 
 def build_parser():
 
@@ -129,7 +132,7 @@ def build_parser():
 
     cmd = meet_sub.add_parser("list", help="List meetings")
     cmd.add_argument("--sort", help="Sort by a specific key")
-    cmd.add_argument("--no-user", action="store_true", help="Do not show participatns")
+    cmd.add_argument("--no-user", action="store_true", help="Do not show participants")
     cmd.set_defaults(cmd=cmd_meet_list)
 
     cmd = meet_sub.add_parser("info", help="Show meeting details")
@@ -139,10 +142,10 @@ def build_parser():
     cmd = meet_sub.add_parser("create", help="Create meeting")
     cmd.add_argument("id", help="Meeting ID")
     cmd.add_argument("name", help="Meeting name")
-    cmd.add_argument("--record", help="Allow recodring?", action="store_true")
+    cmd.add_argument("--record", help="Allow recording?", action="store_true")
     cmd.add_argument(
         "--mod",
-        help="Directly create and print a join link for this username. Can be repeated.",
+        help="Directly create and print a moderator join link for this username. Can be repeated.",
         action="append",
     )
     cmd.set_defaults(cmd=cmd_meet_create)
@@ -164,8 +167,15 @@ def build_parser():
     cmd.add_argument("id", help="Meeting ID")
     cmd.set_defaults(cmd=cmd_meet_end)
 
+    cmd = meet_sub.add_parser("chat", help="Send a chat message into a running meeting (BBB 3.0)")
+    cmd.add_argument("id", help="Meeting ID. Can be 'BROADCAST' do broadcase a message to all running meetings")
+    cmd.add_argument("message", help="The message to send to chat")
+    cmd.add_argument("--name", help="The name that will be shown as the sender of the chat message", default="SYSTEM")
+    cmd.set_defaults(cmd=cmd_meet_chat)
+
     cmd = meet_sub.add_parser("nuke", help="End ALL meeting")
-    cmd.add_argument("--doit", help="Really end all meetings?", action="store_true")
+    cmd.add_argument("--doit", help="Disable dry-run mode and actually end meetings?", action="store_true")
+    cmd.add_argument("--ask", help="Ask for every meeting?", action="store_true")
     cmd.set_defaults(cmd=cmd_meet_nuke)
 
     return parser
@@ -374,7 +384,7 @@ def cmd_meet_create(api, args):
                 meetingID=args.id,
                 fullName=name,
                 createTime=created.find("createTime").text,
-                password=created.find("moderatorPW").text,
+                role="MODERATOR",
             )
         print(name + ":", link)
 
@@ -399,14 +409,19 @@ def cmd_meet_end(api, args):
     api.end(meetingID=args.id, password=pwd)
 
 
+def cmd_meet_chat(api, args):
+    if args.id == "BROADCAST":
+        meetings = [m.find("meetingID").text for m in api.getMeetings()]
+    else:
+        meetings = [args.id]
+
+    for meeting in meetings:
+        api.sendChatMessage(meeting, args.message, userName=args.name)
+
+
 def cmd_meet_nuke(api, args):
     meetings = list(api.getMeetings())
     for meeting in meetings:
-        if args.doit:
-            api.end(
-                meetingID=meeting.find("meetingID").text,
-                password=meeting.find("moderatorPW").text,
-            )
         print(
             "{dryrun}id={id} user={users} name={name!r}".format(
                 dryrun="" if args.doit else "(dry run) ",
@@ -415,6 +430,16 @@ def cmd_meet_nuke(api, args):
                 name=meeting.find("meetingName").text,
             )
         )
+        if args.doit:
+            if args.ask:
+                answer = input("End this meeting? [Yna] ").strip().lower()
+                if answer == "a":
+                    args.ask = False
+                elif answer in ("", "y"):
+                    pass
+                else:
+                    continue
+            api.end(meetingID=meeting.find("meetingID").text)
 
 
 if __name__ == "__main__":