diff --git a/cmdclient/console.py b/cmdclient/console.py
index f6a7731eab..2e6b026762 100755
--- a/cmdclient/console.py
+++ b/cmdclient/console.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright 2014 matrix.org
+# Copyright 2014 OpenMarket Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -88,6 +88,8 @@ class SynapseCmd(cmd.Cmd):
return False
def _domain(self):
+ if "user" not in self.config or not self.config["user"]:
+ return None
return self.config["user"].split(":")[1]
def do_config(self, line):
@@ -191,8 +193,10 @@ class SynapseCmd(cmd.Cmd):
p = getpass.getpass("Enter your password: ")
user = args["user_id"]
if self._is_on("complete_usernames") and not user.startswith("@"):
- user = "@" + user + ":" + self._domain()
-
+ domain = self._domain()
+ if domain:
+ user = "@" + user + ":" + domain
+
reactor.callFromThread(self._do_login, user, p)
#print " got %s " % p
except Exception as e:
@@ -312,7 +316,7 @@ class SynapseCmd(cmd.Cmd):
try:
args = self._parse(line, ["roomname"], force_keys=True)
path = "/join/%s" % urllib.quote(args["roomname"])
- reactor.callFromThread(self._run_and_pprint, "PUT", path, {})
+ reactor.callFromThread(self._run_and_pprint, "POST", path, {})
except Exception as e:
print e
@@ -700,7 +704,7 @@ def main(server_url, identity_server_url, username, token, config_path):
if __name__ == '__main__':
parser = argparse.ArgumentParser("Starts a synapse client.")
parser.add_argument(
- "-s", "--server", dest="server", default="http://localhost:8080",
+ "-s", "--server", dest="server", default="http://localhost:8008",
help="The URL of the home server to talk to.")
parser.add_argument(
"-i", "--identity-server", dest="identityserver", default="http://localhost:8090",
|
