Merge branch 'master' into python3.5

2018-02-13 13:55:10 +02:00
parent e1e9ba80fa 27083a23ed
commit 6d99258c99
14 changed files with 912 additions and 555 deletions
@@ -80,6 +80,7 @@ class MatrixHandler:
                    pass
            portal.mxid = room
            portal.save()
+            inviter.register_portal(portal)
            await puppet.intent.send_notice(room, "Portal to private chat created.")
        else:
            await puppet.intent.join_room(room)