jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix message button using a more targeted approach.

Browse source
This commit is contained in:
very-ape 2021-05-21 14:28:01 -07:00
parent 97a9ec4e40
commit c22ef3e79e
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/Model/Profile.php
View file

@ -145,7 +145,7 @@ class Profile
*/ */
public static function load(App $a, $nickname, array $profiledata = [], $show_connect = true) public static function load(App $a, $nickname, array $profiledata = [], $show_connect = true)
{ {
$user = User::getByNickname($nickname); $user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname, 'account_removed' => false]);
if (!DBA::isResult($user) && empty($profiledata)) { if (!DBA::isResult($user) && empty($profiledata)) {
Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG); Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);
@ -166,17 +166,7 @@ class Profile
} }
} }
if (empty($user['uid'])) { $profile = !empty($user['uid']) ? User::getOwnerDataById($user['uid'], false) : [];
$profile = [];
} else {
$contact_id = Contact::getIdForURL(Strings::normaliseLink(DI::baseurl() . '/profile/' . $nickname), local_user());
$profile = array_merge(
$user,
Contact::getById($contact_id),
Profile::getByUID($user['uid']),
);
$profile['cid'] = $contact_id;
}
if (empty($profile) && empty($profiledata)) { if (empty($profile) && empty($profiledata)) {
Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG); Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);
@ -273,8 +263,17 @@ class Profile
$o = ''; $o = '';
$location = false; $location = false;
// This function can also use contact information in $profile // This function can also use contact information in $profile, but the 'cid'
$is_contact = !empty($profile['cid']); // value is going to be coming from 'owner-view', which means it's the wrong
// contact ID for the user viewing this page. Use 'nurl' to look up the
// correct contact table entry for the logged-in user.
$is_contact = !empty($profile['nurl']);
$contact = [];
if ($is_contact) {
$contact_id = Contact::getIdForURL($profile['nurl'], local_user());
$contact = Contact::getById($contact_id);
}
if (empty($profile['nickname'])) { if (empty($profile['nickname'])) {
Logger::warning('Received profile with no nickname', ['profile' => $profile, 'callstack' => System::callstack(10)]); Logger::warning('Received profile with no nickname', ['profile' => $profile, 'callstack' => System::callstack(10)]);
@ -302,14 +301,16 @@ class Profile
$subscribe_feed_link = null; $subscribe_feed_link = null;
$wallmessage_link = null; $wallmessage_link = null;
// Who is the logged-in user to this profile?
$visitor_contact = []; $visitor_contact = [];
if (!empty($profile['uid']) && self::getMyURL()) { if (!empty($profile['uid']) && self::getMyURL()) {
$visitor_contact = Contact::selectFirst(['rel'], ['uid' => $profile['uid'], 'nurl' => Strings::normaliseLink(self::getMyURL())]); $visitor_contact = Contact::selectFirst(['rel'], ['uid' => $profile['uid'], 'nurl' => Strings::normaliseLink(self::getMyURL())]);
} }
// Who is this profile to the logged-in user?
$profile_contact = []; $profile_contact = [];
if (!empty($profile['cid']) && self::getMyURL()) { if (!empty($contact) && self::getMyURL()) {
$profile_contact = Contact::selectFirst(['rel'], ['id' => $profile['cid']]); $profile_contact = $contact['rel'];
} }
$profile_is_dfrn = $profile['network'] == Protocol::DFRN; $profile_is_dfrn = $profile['network'] == Protocol::DFRN;
@ -342,9 +343,9 @@ class Profile
$subscribe_feed_link = 'dfrn_poll/' . $profile['nickname']; $subscribe_feed_link = 'dfrn_poll/' . $profile['nickname'];
} }
if (Contact::canReceivePrivateMessages($profile)) { if (Contact::canReceivePrivateMessages($contact)) {
if ($visitor_is_followed || $visitor_is_following) { if ($visitor_is_followed || $visitor_is_following) {
$wallmessage_link = $visitor_base_path . '/message/new/' . $profile['cid']; $wallmessage_link = $visitor_base_path . '/message/new/' . $contact['id'];
} elseif ($visitor_is_authenticated && !empty($profile['unkmail'])) { } elseif ($visitor_is_authenticated && !empty($profile['unkmail'])) {
$wallmessage_link = 'wallmessage/' . $profile['nickname']; $wallmessage_link = 'wallmessage/' . $profile['nickname'];
} }