Merge pull request #9938 from annando/database-issues

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 1e485e3040aea218635b09d93f8c027c014d7b72..bd72813b8ae71b2bab1c3e158dd596cb015d9cce 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -35,7 +35,7 @@ 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;
@@ -298,7 +298,7 @@ function dfrn_request_post(App $a)
                $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.
@@ -559,18 +559,12 @@ function dfrn_request_content(App $a)
 
                                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',
                                        ]);
                                }