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

Some more renamed functions

This commit is contained in:
Michael 2021-08-09 20:56:15 +00:00
parent c81e81dc8d
commit 28cfdec7c4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/App.php
View File

@ -132,7 +132,7 @@ class App
* @param int $user_id * @param int $user_id
* @return void * @return void
*/ */
public function setUserId(int $user_id) public function setLoggedInUserId(int $user_id)
{ {
$this->user_id = $user_id; $this->user_id = $user_id;
} }
@ -143,7 +143,7 @@ class App
* @param int $user_id * @param int $user_id
* @return void * @return void
*/ */
public function setNickname(string $nickname) public function setLoggedInUserNickname(string $nickname)
{ {
$this->nickname = $nickname; $this->nickname = $nickname;
} }

4
src/Security/Authentication.php
View File

@ -352,8 +352,8 @@ class Authentication
} }
} }
$a->setUserId($user_record['uid']); $a->setLoggedInUserId($user_record['uid']);
$a->setNickname($user_record['nickname']); $a->setLoggedInUserNickname($user_record['nickname']);
if ($login_initial) { if ($login_initial) {
Hook::callAll('logged_in', $user_record); Hook::callAll('logged_in', $user_record);

8
tests/legacy/ApiTest.php
View File

@ -1949,7 +1949,7 @@ class ApiTest extends FixtureTest
*/ */
public function testApiStatusesMentions() public function testApiStatusesMentions()
{ {
$this->app->setNickname($this->selfUser['nick']); $this->app->setLoggedInUserNickname($this->selfUser['nick']);
$_REQUEST['max_id'] = 10; $_REQUEST['max_id'] = 10;
$result = api_statuses_mentions('json'); $result = api_statuses_mentions('json');
self::assertEmpty($result['status']); self::assertEmpty($result['status']);
@ -2865,7 +2865,7 @@ class ApiTest extends FixtureTest
*/ */
public function testApiDirectMessagesNewWithScreenName() public function testApiDirectMessagesNewWithScreenName()
{ {
$this->app->setNickname($this->selfUser['nick']); $this->app->setLoggedInUserNickname($this->selfUser['nick']);
$_POST['text'] = 'message_text'; $_POST['text'] = 'message_text';
$_POST['screen_name'] = $this->friendUser['nick']; $_POST['screen_name'] = $this->friendUser['nick'];
$result = api_direct_messages_new('json'); $result = api_direct_messages_new('json');
@ -2881,7 +2881,7 @@ class ApiTest extends FixtureTest
*/ */
public function testApiDirectMessagesNewWithTitle() public function testApiDirectMessagesNewWithTitle()
{ {
$this->app->setNickname($this->selfUser['nick']); $this->app->setLoggedInUserNickname($this->selfUser['nick']);
$_POST['text'] = 'message_text'; $_POST['text'] = 'message_text';
$_POST['screen_name'] = $this->friendUser['nick']; $_POST['screen_name'] = $this->friendUser['nick'];
$_REQUEST['title'] = 'message_title'; $_REQUEST['title'] = 'message_title';
@ -2899,7 +2899,7 @@ class ApiTest extends FixtureTest
*/ */
public function testApiDirectMessagesNewWithRss() public function testApiDirectMessagesNewWithRss()
{ {
$this->app->setNickname($this->selfUser['nick']); $this->app->setLoggedInUserNickname($this->selfUser['nick']);
$_POST['text'] = 'message_text'; $_POST['text'] = 'message_text';
$_POST['screen_name'] = $this->friendUser['nick']; $_POST['screen_name'] = $this->friendUser['nick'];
$result = api_direct_messages_new('rss'); $result = api_direct_messages_new('rss');