Rework Profile::sidebar profile link conditions

- Now show Follow, Unfollow, Atom Feed and Message in profile sidebar more consistently with the status of the current visitor
- Remove pseudo-field contact.remoteconnect

diff --git a/mod/display.php b/mod/display.php
index fa5b2e1962d3d0df161315f6010a4074d52f3f64..017b3545b6c9a3cddb032726cf5e3686a5316412 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -186,16 +186,7 @@ function display_fetchauthor($a, $item)
 
        $profiledata["photo"] = System::removedBaseUrl($profiledata["photo"]);
 
-       if (local_user()) {
-               if (in_array($profiledata["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
-                       $profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
-               }
-       } elseif ($profiledata["network"] == Protocol::DFRN) {
-               $connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);
-               $profiledata["remoteconnect"] = $connect;
-       }
-
-       return($profiledata);
+       return $profiledata;
 }
 
 function display_content(App $a, $update = false, $update_uid = 0)

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 36a424b98321f1470f1ea23de90082341dc669bd..73118be0d04e92807f99e06bb2e1fc09551afbd8 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -124,6 +124,20 @@ class Contact extends BaseObject
                return DBA::toArray($statement);
        }
 
+       /**
+        * @param array $fields    Array of selected fields, empty for all
+        * @param array $condition Array of fields for condition
+        * @param array $params    Array of several parameters
+        * @return array
+        * @throws \Exception
+        */
+       public static function selectFirst(array $fields = [], array $condition = [], array $params = [])
+       {
+               $contact = DBA::selectFirst('contact', $fields, $condition, $params);
+
+               return $contact;
+       }
+
        /**
         * @param integer $id     Contact ID
         * @param array   $fields Array of selected fields, empty for all

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 36a33876e722dc523dd8ddf494d9283cda91752f..4cda6e452a32306403173376b64c232a7d8db88c 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -18,6 +18,7 @@ use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
+use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -302,127 +303,102 @@ class Profile
 
                Hook::callAll('profile_sidebar_enter', $profile);
 
-
-               // don't show connect link to yourself
-               $connect = $profile['uid'] != local_user() ? L10n::t('Connect') : false;
-
-               // don't show connect link to authenticated visitors either
-               if (remote_user() && !empty($_SESSION['remote'])) {
-                       foreach ($_SESSION['remote'] as $visitor) {
-                               if ($visitor['uid'] == $profile['uid']) {
-                                       $connect = false;
-                                       break;
-                               }
-                       }
-               }
-
-               if (!$show_connect) {
-                       $connect = false;
+               if (isset($profile['url'])) {
+                       $profile_url = $profile['url'];
+               } else {
+                       $profile_url = System::baseUrl() . '/profile/' . $profile['nickname'];
                }
 
-               $profile_url = '';
+               $follow_link = null;
+               $unfollow_link = null;
+               $subscribe_feed_link = null;
+               $wallmessage_link = null;
 
-               // Is the local user already connected to that user?
-               if ($connect && local_user()) {
-                       if (isset($profile['url'])) {
-                               $profile_url = Strings::normaliseLink($profile['url']);
-                       } else {
-                               $profile_url = Strings::normaliseLink(System::baseUrl() . '/profile/' . $profile['nickname']);
-                       }
-
-                       if (DBA::exists('contact', ['pending' => false, 'uid' => local_user(), 'nurl' => $profile_url])) {
-                               $connect = false;
-                       }
-               }
 
-               // Is the remote user already connected to that user?
-               if ($connect && Contact::isFollower(remote_user(), $profile['uid'])) {
-                       $connect = false;
-               }
 
-               if ($connect && ($profile['network'] != Protocol::DFRN) && !isset($profile['remoteconnect'])) {
-                       $connect = false;
+               $visitor_contact = [];
+               if ($profile['uid'] && self::getMyURL()) {
+                       $visitor_contact = Contact::selectFirst(['rel'], ['uid' => $profile['uid'], 'nurl' => Strings::normaliseLink(self::getMyURL())]);
                }
 
-               $remoteconnect = null;
-               if (isset($profile['remoteconnect'])) {
-                       $remoteconnect = $profile['remoteconnect'];
+               $profile_contact = [];
+               if ($profile['cid'] && self::getMyURL()) {
+                       $profile_contact = Contact::selectFirst(['rel'], ['id' => $profile['cid']]);
                }
 
-               if ($connect && ($profile['network'] == Protocol::DFRN) && !isset($remoteconnect)) {
-                       $subscribe_feed = L10n::t('Atom feed');
-               } else {
-                       $subscribe_feed = false;
-               }
+               $profile_is_dfrn = $profile['network'] == Protocol::DFRN;
+               $profile_is_native = in_array($profile['network'], Protocol::NATIVE_SUPPORT);
+               $local_user_is_self = local_user() && local_user() == ($profile['profile_uid'] ?? 0);
+               $visitor_is_authenticated = (bool)self::getMyURL();
+               $visitor_is_following =
+                       in_array($visitor_contact['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND])
+                       || in_array($profile_contact['rel'] ?? 0, [Contact::SHARING, Contact::FRIEND]);
+               $visitor_is_followed =
+                       in_array($visitor_contact['rel'] ?? 0, [Contact::SHARING, Contact::FRIEND])
+                       || in_array($profile_contact['rel'] ?? 0, [Contact::FOLLOWER, Contact::FRIEND]);
+               $visitor_base_path = self::getMyURL() ? preg_replace('=/profile/(.*)=ism', '', self::getMyURL()) : '';
 
-               $wallmessage = false;
-               $wallmessage_link = false;
-
-               // See issue https://github.com/friendica/friendica/issues/3838
-               // Either we remove the message link for remote users or we enable creating messages from remote users
-               if (remote_user() || (self::getMyURL() && !empty($profile['unkmail']) && ($profile['uid'] != local_user()))) {
-                       $wallmessage = L10n::t('Message');
+               if (!$local_user_is_self) {
+                       if (!$visitor_is_authenticated) {
+                               $follow_link = 'dfrn_request/' . $profile['nickname'];
+                       } elseif ($profile_is_native) {
+                               if ($visitor_is_following) {
+                                       $unfollow_link = $visitor_base_path . '/unfollow?url=' . urlencode($profile_url);
+                               } else {
+                                       $follow_link =  $visitor_base_path .'/follow?url=' . urlencode($profile_url);
+                               }
+                       }
 
-                       if (remote_user()) {
-                               $r = q(
-                                       "SELECT `url` FROM `contact` WHERE `uid` = %d AND `id` = '%s' AND `rel` = %d",
-                                       intval($profile['uid']),
-                                       intval(remote_user()),
-                                       intval(Contact::FRIEND)
-                               );
-                       } else {
-                               $r = q(
-                                       "SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d",
-                                       intval($profile['uid']),
-                                       DBA::escape(Strings::normaliseLink(self::getMyURL())),
-                                       intval(Contact::FRIEND)
-                               );
+                       if ($profile_is_dfrn) {
+                               $subscribe_feed_link = 'dfrn_poll/' . $profile['nickname'];
                        }
-                       if ($r) {
-                               $remote_url = $r[0]['url'];
-                               $message_path = preg_replace('=(.*)/profile/(.*)=ism', '$1/message/new/', $remote_url);
-                               $wallmessage_link = $message_path . base64_encode(defaults($profile, 'addr', ''));
-                       } else if (!empty($profile['nickname'])) {
-                               $wallmessage_link = 'wallmessage/' . $profile['nickname'];
+
+                       if (Contact::canReceivePrivateMessages($profile)) {
+                               if ($visitor_is_followed || $visitor_is_following) {
+                                       $wallmessage_link = $visitor_base_path . '/message/new/' . base64_encode(defaults($profile, 'addr', ''));
+                               } elseif ($visitor_is_authenticated && !empty($profile['unkmail'])) {
+                                       $wallmessage_link = 'wallmessage/' . $profile['nickname'];
+                               }
                        }
                }
 
                // show edit profile to yourself
-               if (!$is_contact && $profile['uid'] == local_user() && Feature::isEnabled(local_user(), 'multi_profiles')) {
-                       $profile['edit'] = [System::baseUrl() . '/profiles', L10n::t('Profiles'), '', L10n::t('Manage/edit profiles')];
-                       $r = q(
-                               "SELECT * FROM `profile` WHERE `uid` = %d",
-                               local_user()
-                       );
+               if (!$is_contact && $local_user_is_self) {
+                       if (Feature::isEnabled(local_user(), 'multi_profiles')) {
+                               $profile['edit'] = [System::baseUrl() . '/profiles', L10n::t('Profiles'), '', L10n::t('Manage/edit profiles')];
+                               $r = q(
+                                       "SELECT * FROM `profile` WHERE `uid` = %d",
+                                       local_user()
+                               );
 
-                       $profile['menu'] = [
-                               'chg_photo' => L10n::t('Change profile photo'),
-                               'cr_new' => L10n::t('Create New Profile'),
-                               'entries' => [],
-                       ];
+                               $profile['menu'] = [
+                                       'chg_photo' => L10n::t('Change profile photo'),
+                                       'cr_new' => L10n::t('Create New Profile'),
+                                       'entries' => [],
+                               ];
 
-                       if (DBA::isResult($r)) {
-                               foreach ($r as $rr) {
-                                       $profile['menu']['entries'][] = [
-                                               'photo' => $rr['thumb'],
-                                               'id' => $rr['id'],
-                                               'alt' => L10n::t('Profile Image'),
-                                               'profile_name' => $rr['profile-name'],
-                                               'isdefault' => $rr['is-default'],
-                                               'visibile_to_everybody' => L10n::t('visible to everybody'),
-                                               'edit_visibility' => L10n::t('Edit visibility'),
-                                       ];
+                               if (DBA::isResult($r)) {
+                                       foreach ($r as $rr) {
+                                               $profile['menu']['entries'][] = [
+                                                       'photo' => $rr['thumb'],
+                                                       'id' => $rr['id'],
+                                                       'alt' => L10n::t('Profile Image'),
+                                                       'profile_name' => $rr['profile-name'],
+                                                       'isdefault' => $rr['is-default'],
+                                                       'visibile_to_everybody' => L10n::t('visible to everybody'),
+                                                       'edit_visibility' => L10n::t('Edit visibility'),
+                                               ];
+                                       }
                                }
+                       } else {
+                               $profile['edit'] = [System::baseUrl() . '/profiles/' . $profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')];
+                               $profile['menu'] = [
+                                       'chg_photo' => L10n::t('Change profile photo'),
+                                       'cr_new' => null,
+                                       'entries' => [],
+                               ];
                        }
                }
-               if (!$is_contact && $profile['uid'] == local_user() && !Feature::isEnabled(local_user(), 'multi_profiles')) {
-                       $profile['edit'] = [System::baseUrl() . '/profiles/' . $profile['id'], L10n::t('Edit profile'), '', L10n::t('Edit profile')];
-                       $profile['menu'] = [
-                               'chg_photo' => L10n::t('Change profile photo'),
-                               'cr_new' => null,
-                               'entries' => [],
-                       ];
-               }
 
                // Fetch the account type
                $account_type = Contact::getAccountType($profile);
@@ -523,10 +499,13 @@ class Profile
                $o .= Renderer::replaceMacros($tpl, [
                        '$profile' => $p,
                        '$xmpp' => $xmpp,
-                       '$connect' => $connect,
-                       '$remoteconnect' => $remoteconnect,
-                       '$subscribe_feed' => $subscribe_feed,
-                       '$wallmessage' => $wallmessage,
+                       '$follow' => L10n::t('Follow'),
+                       '$follow_link' => $follow_link,
+                       '$unfollow' => L10n::t('Unfollow'),
+                       '$unfollow_link' => $unfollow_link,
+                       '$subscribe_feed' => L10n::t('Atom feed'),
+                       '$subscribe_feed_link' => $subscribe_feed_link,
+                       '$wallmessage' => L10n::t('Message'),
                        '$wallmessage_link' => $wallmessage_link,
                        '$account_type' => $account_type,
                        '$location' => $location,
@@ -996,10 +975,7 @@ class Profile
         */
        public static function getMyURL()
        {
-               if (!empty($_SESSION['my_url'])) {
-                       return $_SESSION['my_url'];
-               }
-               return null;
+               return Session::get('my_url');
        }
 
        /**

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 847455f498927f0d6444c5a88dcbc858cd780c18..989896ef73b2ca00530697e969c6bf66cc80328a 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -944,10 +944,6 @@ class Contact extends BaseModule
 
                        $profiledata = Model\Contact::getDetailsByURL($contact['url']);
 
-                       if (local_user() && in_array($profiledata['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
-                               $profiledata['remoteconnect'] = System::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
-                       }
-
                        Model\Profile::load($a, '', 0, $profiledata, true);
                        $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
                }

diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
index 192c860de8a0e626b756ab88f32fcb680a1e6a07..1ee33026690971072427c645fc9c9b1742e7975c 100644 (file)
--- a/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@ -50,21 +50,20 @@
        {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
 
        {{include file="diaspora_vcard.tpl"}}
-       
+
        <div id="profile-extra-links">
                <ul>
-                       {{if $connect}}
-                               {{if $remoteconnect}}
-                                       <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-                               {{else}}
-                                       <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-                               {{/if}}
+                       {{if $unfollow_link}}
+                               <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+                       {{/if}}
+                       {{if $follow_link}}
+                               <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
                        {{/if}}
-                       {{if $wallmessage}}
+                       {{if $wallmessage_link}}
                                <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
                        {{/if}}
-                       {{if $subscribe_feed}}
-                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{if $subscribe_feed_link}}
+                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
                        {{/if}}
                </ul>
        </div>

diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl
index d80b8feed221c0b54d7ac12bfaa2c726023a45d7..3c933c8333552bf5a13dfcaa3a84eae3df98334b 100644 (file)
--- a/view/theme/duepuntozero/templates/profile_vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile_vcard.tpl
@@ -36,21 +36,20 @@
 
        {{include file="diaspora_vcard.tpl"}}
 
-       <div id="profile-vcard-break"></div>    
+       <div id="profile-vcard-break"></div>
        <div id="profile-extra-links">
                <ul>
-                       {{if $connect}}
-                               {{if $remoteconnect}}
-                                       <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-                               {{else}}
-                                       <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-                               {{/if}}
+                       {{if $unfollow_link}}
+                               <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
                        {{/if}}
-                       {{if $wallmessage}}
+                       {{if $follow_link}}
+                               <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
+                       {{/if}}
+                       {{if $wallmessage_link}}
                                <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
                        {{/if}}
-                       {{if $subscribe_feed}}
-                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{if $subscribe_feed_link}}
+                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
                        {{/if}}
                </ul>
        </div>

diff --git a/view/theme/frio/templates/profile_vcard.tpl b/view/theme/frio/templates/profile_vcard.tpl
index b00e8232179ba1953981e5a4055db7b9996a8e5d..d256a17dada3018cf4312928a281ebfca0369c6b 100644 (file)
--- a/view/theme/frio/templates/profile_vcard.tpl
+++ b/view/theme/frio/templates/profile_vcard.tpl
@@ -46,23 +46,24 @@
                        {{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
                </div>
 
+               {{if $follow_link || $unfollow_link || $wallmessage_link}}
                <div id="profile-extra-links">
-                       {{if $connect}}
+                       {{if $follow_link || $unfollow_link}}
                        <div id="dfrn-request-link-button">
-                               {{if $remoteconnect}}
-                               <a id="dfrn-request-link" class="btn btn-primary btn-sm" href="{{$remoteconnect}}">
-                                       <span class=""><i class="fa fa-user-plus"></i></span>
-                                       <span class="">{{$connect}}</span>
+                               {{if $unfollow_link}}
+                               <a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$unfollow_link}}">
+                                       <span class=""><i class="fa fa-user-times"></i></span>
+                                       <span class="">{{$unfollow}}</span>
                                </a>
                                {{else}}
-                               <a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="dfrn_request/{{$profile.nickname}}">
+                               <a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$follow_link}}">
                                        <span class=""><i class="fa fa-user-plus"></i></span>
-                                       <span class="">{{$connect}}</span>
+                                       <span class="">{{$follow}}</span>
                                </a>
                                {{/if}}
                        </div>
                        {{/if}}
-                       {{if $wallmessage}}
+                       {{if $wallmessage_link}}
                        <div id="wallmessage-link-botton">
                                <button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
                                        <span class=""><i class="fa fa-envelope"></i></span>
@@ -71,6 +72,7 @@
                        </div>
                        {{/if}}
                </div>
+               {{/if}}
 
                <div class="clear"></div>
 

diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
index 927047cd332d950cc071bb0d96fb98992e2be360..cd8bd6ee7c978a6554ec391d14812add6ffaf3aa 100644 (file)
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ b/view/theme/quattro/templates/profile_vcard.tpl
@@ -69,21 +69,20 @@
        {{/if}}
 
        {{include file="diaspora_vcard.tpl"}}
-       
+
        <div id="profile-extra-links">
                <ul>
-                       {{if $connect}}
-                               {{if $remoteconnect}}
-                                       <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-                               {{else}}
-                                       <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-                               {{/if}}
+                       {{if $unfollow_link}}
+                               <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+                       {{/if}}
+                       {{if $follow_link}}
+                               <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
                        {{/if}}
-                       {{if $wallmessage}}
+                       {{if $wallmessage_link}}
                                <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
                        {{/if}}
-                       {{if $subscribe_feed}}
-                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{if $subscribe_feed_link}}
+                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
                        {{/if}}
                </ul>
        </div>

diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
index 70bc13e82bb41d01588c5160066f4e450f0db72a..6331e84c4e6f0e90d5d4b2bee1c092ca46d065ba 100644 (file)
--- a/view/theme/vier/templates/profile_vcard.tpl
+++ b/view/theme/vier/templates/profile_vcard.tpl
@@ -61,21 +61,20 @@
        {{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
 
        {{include file="diaspora_vcard.tpl"}}
-       
+
        <div id="profile-extra-links">
                <ul>
-                       {{if $connect}}
-                               {{if $remoteconnect}}
-                                       <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-                               {{else}}
-                                       <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-                               {{/if}}
+                       {{if $unfollow_link}}
+                               <li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
+                       {{/if}}
+                       {{if $follow_link}}
+                               <li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
                        {{/if}}
-                       {{if $wallmessage}}
+                       {{if $wallmessage_link}}
                                <li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
                        {{/if}}
-                       {{if $subscribe_feed}}
-                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{if $subscribe_feed_link}}
+                               <li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
                        {{/if}}
                </ul>
        </div>