diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-11-21 16:44:55 +0100 |
|---|---|---|
| committer | Carl Schwan <carl@carlschwan.eu> | 2022-11-22 08:40:12 +0100 |
| commit | d1209d83023aaae7b844f4fc3b3668643718de14 (patch) | |
| tree | ffb2682d6cde4542a2e8eec34604759e8669c323 /apps/settings/lib | |
| parent | d847eacfbde90a2d4532f9c541d427be17b078bd (diff) | |
| download | nextcloud-server-d1209d83023aaae7b844f4fc3b3668643718de14.tar.gz nextcloud-server-d1209d83023aaae7b844f4fc3b3668643718de14.zip | |
Rename mastodon to fediverse
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Diffstat (limited to 'apps/settings/lib')
| -rw-r--r-- | apps/settings/lib/Controller/UsersController.php | 16 | ||||
| -rw-r--r-- | apps/settings/lib/Settings/Personal/PersonalInfo.php | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php index b3d75faab40..7c543508496 100644 --- a/apps/settings/lib/Controller/UsersController.php +++ b/apps/settings/lib/Controller/UsersController.php @@ -358,8 +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 + * @param string|null $fediverse + * @param string|null $fediverseScope * * @return DataResponse */ @@ -374,8 +374,10 @@ class UsersController extends Controller { ?string $websiteScope = null, ?string $address = null, ?string $addressScope = null, - ?string $mastodon = null, - ?string $mastodonScope = null + ?string $twitter = null, + ?string $twitterScope = null, + ?string $fediverse = null, + ?string $fediverseScope = null ) { $user = $this->userSession->getUser(); if (!$user instanceof IUser) { @@ -414,7 +416,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], + IAccountManager::PROPERTY_FEDIVERSE => ['value' => $fediverse, 'scope' => $fediverseScope], ]; $allowUserToChangeDisplayName = $this->config->getSystemValueBool('allow_user_to_change_display_name', true); foreach ($updatable as $property => $data) { @@ -454,8 +456,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(), + 'fediverse' => $userAccount->getProperty(IAccountManager::PROPERTY_FEDIVERSE)->getValue(), + 'fediverseScope' => $userAccount->getProperty(IAccountManager::PROPERTY_FEDIVERSE)->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 539667ca32d..cf7b704e98b 100644 --- a/apps/settings/lib/Settings/Personal/PersonalInfo.php +++ b/apps/settings/lib/Settings/Personal/PersonalInfo.php @@ -157,7 +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), + 'fediverse' => $this->getProperty($account, IAccountManager::PROPERTY_FEDIVERSE), 'languageMap' => $this->getLanguageMap($user), 'localeMap' => $this->getLocaleMap($user), 'profileEnabledGlobally' => $this->profileManager->isProfileEnabled(), |