From 28cfdec7c44c17e4a8483959d69bcfa198510f82 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 9 Aug 2021 20:56:15 +0000
Subject: [PATCH] Some more renamed functions

---
 src/App.php                     | 4 ++--
 src/Security/Authentication.php | 4 ++--
 tests/legacy/ApiTest.php        | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/App.php b/src/App.php
index 69167e98f1..6e9f7c3184 100644
--- a/src/App.php
+++ b/src/App.php
@@ -132,7 +132,7 @@ class App
 	 * @param int $user_id
 	 * @return void
 	 */
-	public function setUserId(int $user_id)
+	public function setLoggedInUserId(int $user_id)
 	{
 		$this->user_id = $user_id;
 	}
@@ -143,7 +143,7 @@ class App
 	 * @param int $user_id
 	 * @return void
 	 */
-	public function setNickname(string $nickname)
+	public function setLoggedInUserNickname(string $nickname)
 	{
 		$this->nickname = $nickname;
 	}
diff --git a/src/Security/Authentication.php b/src/Security/Authentication.php
index 074cfc2bae..e894c6ddaf 100644
--- a/src/Security/Authentication.php
+++ b/src/Security/Authentication.php
@@ -352,8 +352,8 @@ class Authentication
 			}
 		}
 
-		$a->setUserId($user_record['uid']);
-		$a->setNickname($user_record['nickname']);
+		$a->setLoggedInUserId($user_record['uid']);
+		$a->setLoggedInUserNickname($user_record['nickname']);
 
 		if ($login_initial) {
 			Hook::callAll('logged_in', $user_record);
diff --git a/tests/legacy/ApiTest.php b/tests/legacy/ApiTest.php
index 2e6d49ebf2..eaf596fb6a 100644
--- a/tests/legacy/ApiTest.php
+++ b/tests/legacy/ApiTest.php
@@ -1949,7 +1949,7 @@ class ApiTest extends FixtureTest
 	 */
 	public function testApiStatusesMentions()
 	{
-		$this->app->setNickname($this->selfUser['nick']);
+		$this->app->setLoggedInUserNickname($this->selfUser['nick']);
 		$_REQUEST['max_id'] = 10;
 		$result             = api_statuses_mentions('json');
 		self::assertEmpty($result['status']);
@@ -2865,7 +2865,7 @@ class ApiTest extends FixtureTest
 	 */
 	public function testApiDirectMessagesNewWithScreenName()
 	{
-		$this->app->setNickname($this->selfUser['nick']);
+		$this->app->setLoggedInUserNickname($this->selfUser['nick']);
 		$_POST['text']        = 'message_text';
 		$_POST['screen_name'] = $this->friendUser['nick'];
 		$result               = api_direct_messages_new('json');
@@ -2881,7 +2881,7 @@ class ApiTest extends FixtureTest
 	 */
 	public function testApiDirectMessagesNewWithTitle()
 	{
-		$this->app->setNickname($this->selfUser['nick']);
+		$this->app->setLoggedInUserNickname($this->selfUser['nick']);
 		$_POST['text']        = 'message_text';
 		$_POST['screen_name'] = $this->friendUser['nick'];
 		$_REQUEST['title']    = 'message_title';
@@ -2899,7 +2899,7 @@ class ApiTest extends FixtureTest
 	 */
 	public function testApiDirectMessagesNewWithRss()
 	{
-		$this->app->setNickname($this->selfUser['nick']);
+		$this->app->setLoggedInUserNickname($this->selfUser['nick']);
 		$_POST['text']        = 'message_text';
 		$_POST['screen_name'] = $this->friendUser['nick'];
 		$result               = api_direct_messages_new('rss');