friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

The function moved from the user to the contact class

This commit is contained in:
Michael 2019-02-10 17:19:10 +00:00
parent 758eabd2f6
commit 7939cacc44
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Model/Contact.php
View File

@ -155,6 +155,23 @@ class Contact extends BaseObject
return PortableContact::detectServer($url); return PortableContact::detectServer($url);
} }
/**
* Returns the public contact id of the given user id
*
* @param integer $uid User ID
*
* @return integer|boolean Public contact id for given user id
* @throws Exception
*/
public static function getPublicIdByUserId($uid)
{
$self = DBA::selectFirst('contact', ['url'], ['self' => true, 'uid' => $uid]);
if (!DBA::isResult($self)) {
return false;
}
return self::getIdForURL($self['url'], 0, true);
}
/** /**
* @brief Returns the contact id for the user and the public contact id for a given contact id * @brief Returns the contact id for the user and the public contact id for a given contact id
* *

4
src/Model/Item.php
View File

@ -1462,8 +1462,8 @@ class Item extends BaseObject
} }
if ($item['verb'] == ACTIVITY_FOLLOW) { if ($item['verb'] == ACTIVITY_FOLLOW) {
if (!$item['origin'] && ($item['author-id'] == User::getPublicContactById($uid))) { if (!$item['origin'] && ($item['author-id'] == Contact::getPublicIdByUserId($uid))) {
// Our own follow request can be relayed to us. We don't store them to avoid notification chaos. // Our own follow request can be relayed to us. We don't store it to avoid notification chaos.
Logger::log("Follow: Don't store not origin follow request from us for " . $item['parent-uri'], Logger::DEBUG); Logger::log("Follow: Don't store not origin follow request from us for " . $item['parent-uri'], Logger::DEBUG);
return 0; return 0;
} }

14
src/Model/User.php
View File

@ -99,20 +99,6 @@ class User
return DBA::selectFirst('user', [], ['uid' => $uid]); return DBA::selectFirst('user', [], ['uid' => $uid]);
} }
/**
* @param integer $uid
* @return array|boolean User record if it exists, false otherwise
* @throws Exception
*/
public static function getPublicContactById($uid)
{
$self = DBA::selectFirst('contact', ['url'], ['self' => true, 'uid' => $uid]);
if (!DBA::isResult($self)) {
return false;
}
return Contact::getIdForURL($self['url'], 0, true);
}
/** /**
* @brief Returns the user id of a given profile URL * @brief Returns the user id of a given profile URL
* *