Merge branch 'develop' into boeserwolf/get-set-topic

src/SlashCommands.js

@@ -91,6 +91,18 @@ export const CommandMap = {
         hideCompletionAfterSpace: true,
     }),
 
+    upgraderoom: new Command({
+        name: 'upgraderoom',
+        args: '<new_version>',
+        description: _td('Upgrades a room to a new version'),
+        runFn: function(roomId, args) {
+            if (args) {
+                return success(MatrixClientPeg.get().upgradeRoom(roomId, args));
+            }
+            return reject(this.getUsage());
+        },
+    }),
+
     nick: new Command({
         name: 'nick',
         args: '<display_name>',
@@ -154,6 +166,18 @@ export const CommandMap = {
         },
     }),
 
+    roomname: new Command({
+        name: 'roomname',
+        args: '<name>',
+        description: _td('Sets the room name'),
+        runFn: function(roomId, args) {
+            if (args) {
+                return success(MatrixClientPeg.get().setRoomName(roomId, args));
+            }
+            return reject(this.getUsage());
+        },
+    }),
+
     invite: new Command({
         name: 'invite',
         args: '<user-id>',