Handle normalized acct: URIs in ostatussub

[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..a8039ae56532226705b68ea6298a985e1f193779 100644 (file)
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -242,9 +242,9 @@ class OStatusSubAction extends Action
     function pullRemoteProfile()
     {
         $validate = new Validate();
-        $this->profile_uri = $this->trimmed('profile');
+        $this->profile_uri = Discovery::normalize($this->trimmed('profile'));
         try {
-            if ($validate->email($this->profile_uri)) {
+            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);