make user URL optional in connect command

diff --git a/src/shpub/Cli.php b/src/shpub/Cli.php
index 5b46fcdd1f80748c7ee7dd67c025068390d8112b..34ef479ad94def40867c123e0a6524cf4fe0e497 100644 (file)
--- a/src/shpub/Cli.php
+++ b/src/shpub/Cli.php
@@ -146,7 +146,7 @@ class Cli
         $cmd->addArgument(
             'user',
             [
-                'optional'    => false,
+                'optional'    => true,
                 'description' => 'User URL',
             ]
         );

diff --git a/src/shpub/Command/Connect.php b/src/shpub/Command/Connect.php
index b59de5ce10a668bebd91738b87de11af9fd87933..68a4e18e354e26c372e69ab789a9e6e499a2f7ab 100644 (file)
--- a/src/shpub/Command/Connect.php
+++ b/src/shpub/Command/Connect.php
@@ -16,6 +16,14 @@ class Command_Connect
 
     public function run($server, $user, $newKey, $force)
     {
+        $server = Validator::url($server, 'server');
+        if ($user === null) {
+            //indieweb: homepage is your identity
+            $user = $server;
+        } else {
+            $user = Validator::url($user, 'user');
+        }
+
         $host = $this->getHost($newKey != '' ? $newKey : $server, $force);
         if ($host === null) {
             //already taken