X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsalmon.php;h=d5b0fe243036b3d0dc41484af647371a61ff17da;hb=56c3b3f653bfe2d789470c9bb8434845d3387745;hp=bd08431a4cfeea8f5a878c5845b6656647f6ad32;hpb=a86ffd878dc3ca8638345781bda0f18071d439e5;p=friendica.git diff --git a/mod/salmon.php b/mod/salmon.php index bd08431a4c..d5b0fe2430 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -5,12 +5,12 @@ use Friendica\App; use Friendica\Core\PConfig; use Friendica\Database\DBM; +use Friendica\Model\Contact; use Friendica\Protocol\OStatus; use Friendica\Protocol\Salmon; use Friendica\Util\Crypto; require_once 'include/items.php'; -require_once 'include/follow.php'; function salmon_return($val) { @@ -69,7 +69,7 @@ function salmon_post(App $a) { // unpack the data // strip whitespace so our data element will return to one big base64 blob - $data = str_replace(array(" ","\t","\r","\n"),array("","","",""),$base->data); + $data = str_replace([" ","\t","\r","\n"],["","","",""],$base->data); // stash away some other stuff for later @@ -164,7 +164,7 @@ function salmon_post(App $a) { if (! DBM::is_result($r)) { logger('mod-salmon: Author unknown to us.'); if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) { - $result = new_contact($importer['uid'],$author_link); + $result = Contact::createFromProbe($importer['uid'], $author_link); if($result['success']) { $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s') AND `uid` = %d LIMIT 1",