From 08c64387d702ce52471482c530a0069aa1412476 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 9 Aug 2021 19:49:06 +0000 Subject: [PATCH] "getUserNickname" is now "getLoggedInUserNickname" --- ifttt/ifttt.php | 2 +- jappixmini/jappixmini.php | 2 +- langfilter/langfilter.php | 2 +- xmpp/xmpp.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php index 7ce21e614..593c0e086 100644 --- a/ifttt/ifttt.php +++ b/ifttt/ifttt.php @@ -57,7 +57,7 @@ function ifttt_settings(App $a, &$s) $s .= '
'; $s .= '

' . DI::l10n()->t('Create an account at IFTTT. Create three Facebook recipes that are connected with Maker (In the form "if Facebook then Maker") with the following parameters:') . '

'; $s .= '

URL

'; - $s .= '

' . DI::baseUrl()->get() . '/ifttt/' . $a->getUserNickname() . '

'; + $s .= '

' . DI::baseUrl()->get() . '/ifttt/' . $a->getLoggedInUserNickname() . '

'; $s .= '

Method

'; $s .= '

POST

'; $s .= '

Content Type

'; diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index 1740923b3..0e0abfc89 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -283,7 +283,7 @@ function jappixmini_settings(App $a, &$s) } if (($username == "") && DI::config()->get("jappixmini", "default_user")) { - $username = $a->getUserNickname(); + $username = $a->getLoggedInUserNickname(); } $info_text = DI::config()->get("jappixmini", "infotext"); diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php index 9bde281ec..aeb53eebd 100644 --- a/langfilter/langfilter.php +++ b/langfilter/langfilter.php @@ -105,7 +105,7 @@ function langfilter_prepare_body_content_filter(App $a, &$hook_data) // Never filter own messages // TODO: find a better way to extract this - $logged_user_profile = DI::baseUrl()->get() . '/profile/' . $a->getUserNickname(); + $logged_user_profile = DI::baseUrl()->get() . '/profile/' . $a->getLoggedInUserNickname(); if ($logged_user_profile == $hook_data['item']['author-link']) { return; } diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php index 510b2150c..2f359a7e8 100644 --- a/xmpp/xmpp.php +++ b/xmpp/xmpp.php @@ -153,7 +153,7 @@ function xmpp_converse(App $a) DI::pConfig()->set(local_user(), "xmpp", "password", $password); } - $jid = $a->getUserNickname() . "@" . DI::baseUrl()->getHostname() . "/converse-" . Strings::getRandomHex(5); + $jid = $a->getLoggedInUserNickname() . "@" . DI::baseUrl()->getHostname() . "/converse-" . Strings::getRandomHex(5); $auto_login = "auto_login: true, authentication: 'login',