From 7939cacc44099f10fc3ee8ef47bbb812eb83ebd9 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 10 Feb 2019 17:19:10 +0000
Subject: [PATCH] The function moved from the user to the contact class

---
 src/Model/Contact.php | 17 +++++++++++++++++
 src/Model/Item.php    |  4 ++--
 src/Model/User.php    | 14 --------------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index cf90406e24..2d6bc716bb 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -155,6 +155,23 @@ class Contact extends BaseObject
 		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
 	 *
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 3f2f3c1752..54bd4a0ef7 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -1462,8 +1462,8 @@ class Item extends BaseObject
 		}
 
 		if ($item['verb'] == ACTIVITY_FOLLOW) {
-			if (!$item['origin'] && ($item['author-id'] == User::getPublicContactById($uid))) {
-				// Our own follow request can be relayed to us. We don't store them to avoid notification chaos.
+			if (!$item['origin'] && ($item['author-id'] == Contact::getPublicIdByUserId($uid))) {
+				// 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);
 				return 0;
 			}
diff --git a/src/Model/User.php b/src/Model/User.php
index 841c81f741..59ca4c90a4 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -99,20 +99,6 @@ class User
 		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
 	 *