use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Search;
-use Friendica\Core\System;
use Friendica\Core\Session;
+use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Group;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
use Friendica\Model\Profile;
use Friendica\Model\User;
use Friendica\Module\Security\Login;
Group::addMember(User::getDefaultGroup(local_user(), $r[0]["network"]), $r[0]['id']);
if (isset($photo)) {
- Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
+ Contact::updateAvatar($r[0]["id"], $photo, true);
}
$forward_path = "contact/" . $r[0]['id'];
}
if (!empty($dfrn_request) && strlen($confirm_key)) {
- Network::fetchUrl($dfrn_request . '?confirm_key=' . $confirm_key);
+ DI::httpRequest()->fetch($dfrn_request . '?confirm_key=' . $confirm_key);
}
// (ignore reply, nothing we can do it failed)
$network = $data["network"];
// Canonicalize email-style profile locator
- $url = Probe::webfingerDfrn($data['url'], $hcard);
+ $url = Probe::webfingerDfrn($data['url'] ?? $url, $hcard);
if (substr($url, 0, 5) === 'stat:') {
// Every time we detect the remote subscription we define this as OStatus.
);
if (DBA::isResult($r)) {
$contact_record = $r[0];
- Contact::updateAvatar($photo, $uid, $contact_record["id"], true);
+ Contact::updateAvatar($contact_record["id"], $photo, true);
}
}
}
if (!$auto_confirm) {
notification([
- 'type' => Type::INTRO,
- 'notify_flags' => $r[0]['notify-flags'],
- 'language' => $r[0]['language'],
- 'to_name' => $r[0]['username'],
- 'to_email' => $r[0]['email'],
- 'uid' => $r[0]['uid'],
- 'link' => DI::baseUrl() . '/notifications/intros',
- 'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : DI::l10n()->t('[Name Withheld]')),
- 'source_link' => $r[0]['url'],
- 'source_photo' => $r[0]['photo'],
- 'verb' => Activity::REQ_FRIEND,
- 'otype' => 'intro'
+ 'type' => Notification\Type::INTRO,
+ 'otype' => Notification\ObjectType::INTRO,
+ 'verb' => Activity::REQ_FRIEND,
+ 'uid' => $r[0]['uid'],
+ 'cid' => $r[0]['id'],
+ 'link' => DI::baseUrl() . '/notifications/intros',
]);
}