Some more API functions moved

[friendica.git] / src / Module / FriendSuggest.php

diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php
index a53d47c481ea4c51ceedb8e7d011ad08ea4a32aa..78e75bc314897a7a02aa33342321582492cf363a 100644 (file)
--- a/src/Module/FriendSuggest.php
+++ b/src/Module/FriendSuggest.php
@@ -68,16 +68,15 @@ class FriendSuggest extends BaseModule
 
                $note = Strings::escapeHtml(trim($_POST['note'] ?? ''));
 
-               $suggest = DI::fsuggest()->insert([
-                       'uid'     => local_user(),
-                       'cid'     => $cid,
-                       'name'    => $contact['name'],
-                       'url'     => $contact['url'],
-                       'request' => $contact['request'],
-                       'photo'   => $contact['avatar'],
-                       'note'    => $note,
-                       'created' => DateTimeFormat::utcNow()
-               ]);
+               $suggest = DI::fsuggest()->save(DI::fsuggestFactory()->createNew(
+                       local_user(),
+                       $cid,
+                       $contact['name'],
+                       $contact['url'],
+                       $contact['request'],
+                       $contact['avatar'],
+                       $note
+               ));
 
                Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::SUGGESTION, $suggest->id);
 
@@ -94,7 +93,7 @@ class FriendSuggest extends BaseModule
                        DI::baseUrl()->redirect();
                }
 
-               $contacts = ContactModel::selectToArray(['id', 'name'], [
+               $suggestableContacts = ContactModel::selectToArray(['id', 'name'], [
                        '`uid` = ? 
                        AND `id` != ? 
                        AND `network` = ? 
@@ -111,8 +110,8 @@ class FriendSuggest extends BaseModule
 
                $formattedContacts = [];
 
-               foreach ($contacts as $contact) {
-                       $formattedContacts[$contact['id']] = $contact['name'];
+               foreach ($suggestableContacts as $suggestableContact) {
+                       $formattedContacts[$suggestableContact['id']] = $suggestableContact['name'];
                }
 
                $tpl = Renderer::getMarkupTemplate('fsuggest.tpl');