Merge branch 'develop' of https://github.com/friendica/friendica into develop

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

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 4d44a56a04c5286bb941ba9dcb6da13665679d63..f328453e9b52f3df5a2e657f91a2cb21b97b2b5b 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -166,7 +166,7 @@ class Profile
                        }
                }
 
-               $profile = User::getOwnerDataById($user['uid'], false);
+               $profile = !empty($user['uid']) ? User::getOwnerDataById($user['uid'], false) : [];
 
                if (empty($profile) && empty($profiledata)) {
                        Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);
@@ -322,9 +322,9 @@ class Profile
                                }
                        } elseif ($profile_is_native) {
                                if ($visitor_is_following) {
-                                       $unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url);
+                                       $unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url) . '&auto=1';
                                } else {
-                                       $follow_link =  $visitor_base_path .'/follow?url=' . urlencode($profile_url);
+                                       $follow_link =  $visitor_base_path .'/follow?url=' . urlencode($profile_url) . '&auto=1';
                                }
                        }
 
@@ -406,6 +406,7 @@ class Profile
                                        'pending' => false,
                                        'hidden' => false,
                                        'archive' => false,
+                                       'failed' => false,
                                        'network' => Protocol::FEDERATED,
                                ]);
                        }
@@ -538,7 +539,7 @@ class Profile
 
                                        $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
 
-                                       $rr['link'] = Contact::magicLink($rr['url']);
+                                       $rr['link'] = Contact::magicLinkById($rr['cid']);
                                        $rr['title'] = $rr['name'];
                                        $rr['date'] = DI::l10n()->getDay(DateTimeFormat::convert($rr['start'], $a->timezone, 'UTC', $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ? ' ' . DI::l10n()->t('[today]') : '');
                                        $rr['startime'] = null;
@@ -591,7 +592,7 @@ class Profile
                                $condition = ['parent-uri' => $rr['uri'], 'uid' => $rr['uid'], 'author-id' => public_contact(),
                                        'vid' => [Verb::getID(Activity::ATTEND), Verb::getID(Activity::ATTENDMAYBE)],
                                        'visible' => true, 'deleted' => false];
-                               if (!Item::exists($condition)) {
+                               if (!Post::exists($condition)) {
                                        continue;
                                }