Merge pull request #9947 from annando/database

[friendica.git] / src / Model / Contact.php

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 5b28d0fdfacc89dd1df3bc19552167f0494b8833..f96c556d241784ce4e86279b7c6517efa0f2c4cc 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -34,7 +34,6 @@ use Friendica\Core\Worker;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Notify\Type;
 use Friendica\Network\HTTPException;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Activity;
@@ -906,7 +905,7 @@ class Contact
 
                if (empty($contact['uid']) || ($contact['uid'] != $uid)) {
                        if ($uid == 0) {
-                               $profile_link = self::magicLink($contact['url']);
+                               $profile_link = self::magicLinkByContact($contact);
                                $menu = ['profile' => [DI::l10n()->t('View Profile'), $profile_link, true]];
 
                                return $menu;
@@ -1340,11 +1339,11 @@ class Contact
                }
 
                if ($thread_mode) {             
-                       $items = Post::toArray(Post::selectForUser(local_user(), ['uri', 'gravity', 'parent-uri', 'thr-parent-id', 'author-id'], $condition, $params));
+                       $items = Post::toArray(Post::selectForUser(local_user(), ['uri-id', 'gravity', 'parent-uri-id', 'thr-parent-id', 'author-id'], $condition, $params));
 
                        $o .= conversation($a, $items, 'contacts', $update, false, 'commented', local_user());
                } else {
-                       $items = Post::toArray(Post::selectForUser(local_user(), [], $condition, $params));
+                       $items = Post::toArray(Post::selectForUser(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params));
 
                        $o .= conversation($a, $items, 'contact-posts', $update);
                }
@@ -2499,12 +2498,12 @@ class Contact
 
                                Group::addMember(User::getDefaultGroup($importer['uid'], $contact_record["network"]), $contact_record['id']);
 
-                               if (($user['notify-flags'] & Type::INTRO) &&
+                               if (($user['notify-flags'] & Notification\Type::INTRO) &&
                                        in_array($user['page-flags'], [User::PAGE_FLAGS_NORMAL])) {
 
                                        notification([
-                                               'type'  => Type::INTRO,
-                                               'otype' => Notify\ObjectType::INTRO,
+                                               'type'  => Notification\Type::INTRO,
+                                               'otype' => Notification\ObjectType::INTRO,
                                                'verb'  => ($sharing ? Activity::FRIEND : Activity::FOLLOW),
                                                'uid'   => $user['uid'],
                                                'cid'   => $contact_record['id'],
@@ -2685,14 +2684,10 @@ class Contact
                        return 'contact/' . $contact['id'] . '/conversations';
                }
 
-               if ($contact['network'] != Protocol::DFRN) {
+               if (!empty($contact['network']) && $contact['network'] != Protocol::DFRN) {
                        return $destination;
                }
 
-               if (!empty($contact['uid'])) {
-                       return self::magicLink($contact['url'], $url);
-               }
-
                if (empty($contact['id'])) {
                        return $destination;
                }
@@ -2820,22 +2815,22 @@ class Contact
        }
 
        /**
-        * Returns a random, global contact of the current node
+        * Returns a random, global contact array of the current node
         *
-        * @return string The profile URL
+        * @return array The profile array
         * @throws Exception
         */
-       public static function getRandomUrl()
+       public static function getRandomContact()
        {
-               $r = DBA::selectFirst('contact', ['url'], [
+               $contact = DBA::selectFirst('contact', ['id', 'network', 'url', 'uid'], [
                        "`uid` = ? AND `network` = ? AND NOT `failed` AND `last-item` > ?",
                        0, Protocol::DFRN, DateTimeFormat::utc('now - 1 month'),
                ], ['order' => ['RAND()']]);
 
-               if (DBA::isResult($r)) {
-                       return $r['url'];
+               if (DBA::isResult($contact)) {
+                       return $contact;
                }
 
-               return '';
+               return [];
        }
 }