summaryrefslogtreecommitdiffstats
path: root/apps/settings/lib
diff options
context:
space:
mode:
authorCarl Schwan <carl@carlschwan.eu>2022-11-03 13:31:03 +0100
committerCarl Schwan <carl@carlschwan.eu>2022-11-21 16:28:56 +0100
commit86d9626901b619223eda77aeb2f2197c8c65da69 (patch)
tree968b236db7d4423e4463ddc339eca0c273849ff1 /apps/settings/lib
parentd0c72cc11a14f4c1d9ca9db82ed4f2b19346bfb6 (diff)
downloadnextcloud-server-86d9626901b619223eda77aeb2f2197c8c65da69.tar.gz
nextcloud-server-86d9626901b619223eda77aeb2f2197c8c65da69.zip
Add mastodon personal info field
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Diffstat (limited to 'apps/settings/lib')
-rw-r--r--apps/settings/lib/Controller/UsersController.php9
-rw-r--r--apps/settings/lib/Settings/Personal/PersonalInfo.php1
2 files changed, 8 insertions, 2 deletions
diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php
index 6be93d6a3a0..b3d75faab40 100644
--- a/apps/settings/lib/Controller/UsersController.php
+++ b/apps/settings/lib/Controller/UsersController.php
@@ -358,6 +358,8 @@ class UsersController extends Controller {
* @param string|null $addressScope
* @param string|null $twitter
* @param string|null $twitterScope
+ * @param string|null $mastodon
+ * @param string|null $mastodonScope
*
* @return DataResponse
*/
@@ -372,8 +374,8 @@ class UsersController extends Controller {
?string $websiteScope = null,
?string $address = null,
?string $addressScope = null,
- ?string $twitter = null,
- ?string $twitterScope = null
+ ?string $mastodon = null,
+ ?string $mastodonScope = null
) {
$user = $this->userSession->getUser();
if (!$user instanceof IUser) {
@@ -412,6 +414,7 @@ class UsersController extends Controller {
IAccountManager::PROPERTY_ADDRESS => ['value' => $address, 'scope' => $addressScope],
IAccountManager::PROPERTY_PHONE => ['value' => $phone, 'scope' => $phoneScope],
IAccountManager::PROPERTY_TWITTER => ['value' => $twitter, 'scope' => $twitterScope],
+ IAccountManager::PROPERTY_MASTODON => ['value' => $mastodon, 'scope' => $mastodonScope],
];
$allowUserToChangeDisplayName = $this->config->getSystemValueBool('allow_user_to_change_display_name', true);
foreach ($updatable as $property => $data) {
@@ -451,6 +454,8 @@ class UsersController extends Controller {
'addressScope' => $userAccount->getProperty(IAccountManager::PROPERTY_ADDRESS)->getScope(),
'twitter' => $userAccount->getProperty(IAccountManager::PROPERTY_TWITTER)->getValue(),
'twitterScope' => $userAccount->getProperty(IAccountManager::PROPERTY_TWITTER)->getScope(),
+ 'mastodon' => $userAccount->getProperty(IAccountManager::PROPERTY_TWITTER)->getValue(),
+ 'mastodonScope' => $userAccount->getProperty(IAccountManager::PROPERTY_MASTODON)->getScope(),
'message' => $this->l10n->t('Settings saved'),
],
],
diff --git a/apps/settings/lib/Settings/Personal/PersonalInfo.php b/apps/settings/lib/Settings/Personal/PersonalInfo.php
index 0a65ebe2c74..539667ca32d 100644
--- a/apps/settings/lib/Settings/Personal/PersonalInfo.php
+++ b/apps/settings/lib/Settings/Personal/PersonalInfo.php
@@ -157,6 +157,7 @@ class PersonalInfo implements ISettings {
'location' => $this->getProperty($account, IAccountManager::PROPERTY_ADDRESS),
'website' => $this->getProperty($account, IAccountManager::PROPERTY_WEBSITE),
'twitter' => $this->getProperty($account, IAccountManager::PROPERTY_TWITTER),
+ 'mastodon' => $this->getProperty($account, IAccountManager::PROPERTY_MASTODON),
'languageMap' => $this->getLanguageMap($user),
'localeMap' => $this->getLocaleMap($user),
'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(),