Empty resource would throw exception

[quix0rs-gnu-social.git] / plugins / OStatus / actions / ostatussub.php

diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index 75c75c54c6e64667e51965d845f328edaf458311..7531bb688644faa556684b799566702f317daf6d 100644 (file)
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -242,9 +242,13 @@ class OStatusSubAction extends Action
     function pullRemoteProfile()
     {
         $validate = new Validate();
-        $this->profile_uri = $this->trimmed('profile');
         try {
-            if ($validate->email($this->profile_uri)) {
+            $this->profile_uri = Discovery::normalize($this->trimmed('profile'));
+        } catch (Exception $e) {
+            $this->profile_uri = null;
+        }
+        try {
+            if (Discovery::isAcct($this->profile_uri) && $validate->email(mb_substr($this->profile_uri, 5))) {
                 $this->oprofile = Ostatus_profile::ensureWebfinger($this->profile_uri);
             } else if ($validate->uri($this->profile_uri)) {
                 $this->oprofile = Ostatus_profile::ensureProfileURL($this->profile_uri);