Merge pull request #34940 from nextcloud/feat/add-mastodon

Add mastodon and reorganize profile info section

7 files changed, 120 insertions, 2 deletions

diff --git a/lib/composer/autoload.php b/lib/composer/autoload.php
index fe5311f43f1..b3b39129e7a 100644
--- a/lib/composer/autoload.php
+++ b/lib/composer/autoload.php
@@ -3,8 +3,21 @@
 // autoload.php @generated by Composer
 
 if (PHP_VERSION_ID < 50600) {
-    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
-    exit(1);
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index b6bcf40aeb3..6f2d7ceaf6a 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -1418,6 +1418,7 @@ return array(
     'OC\\Preview\\WebP' => $baseDir . '/lib/private/Preview/WebP.php',
     'OC\\Preview\\XBitmap' => $baseDir . '/lib/private/Preview/XBitmap.php',
     'OC\\Profile\\Actions\\EmailAction' => $baseDir . '/lib/private/Profile/Actions/EmailAction.php',
+    'OC\\Profile\\Actions\\FediverseAction' => $baseDir . '/lib/private/Profile/Actions/FediverseAction.php',
     'OC\\Profile\\Actions\\PhoneAction' => $baseDir . '/lib/private/Profile/Actions/PhoneAction.php',
     'OC\\Profile\\Actions\\TwitterAction' => $baseDir . '/lib/private/Profile/Actions/TwitterAction.php',
     'OC\\Profile\\Actions\\WebsiteAction' => $baseDir . '/lib/private/Profile/Actions/WebsiteAction.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index d5f534cdf72..7c2ba76d29b 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -1451,6 +1451,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Preview\\WebP' => __DIR__ . '/../../..' . '/lib/private/Preview/WebP.php',
         'OC\\Preview\\XBitmap' => __DIR__ . '/../../..' . '/lib/private/Preview/XBitmap.php',
         'OC\\Profile\\Actions\\EmailAction' => __DIR__ . '/../../..' . '/lib/private/Profile/Actions/EmailAction.php',
+        'OC\\Profile\\Actions\\FediverseAction' => __DIR__ . '/../../..' . '/lib/private/Profile/Actions/FediverseAction.php',
         'OC\\Profile\\Actions\\PhoneAction' => __DIR__ . '/../../..' . '/lib/private/Profile/Actions/PhoneAction.php',
         'OC\\Profile\\Actions\\TwitterAction' => __DIR__ . '/../../..' . '/lib/private/Profile/Actions/TwitterAction.php',
         'OC\\Profile\\Actions\\WebsiteAction' => __DIR__ . '/../../..' . '/lib/private/Profile/Actions/WebsiteAction.php',
diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php
index 20e0add1ccb..8fc16d5ce1a 100644
--- a/lib/private/Accounts/AccountManager.php
+++ b/lib/private/Accounts/AccountManager.php
@@ -131,6 +131,7 @@ class AccountManager implements IAccountManager {
 		self::PROPERTY_AVATAR => self::SCOPE_FEDERATED,
 		self::PROPERTY_PHONE => self::SCOPE_LOCAL,
 		self::PROPERTY_TWITTER => self::SCOPE_LOCAL,
+		self::PROPERTY_FEDIVERSE => self::SCOPE_LOCAL,
 		self::PROPERTY_ORGANISATION => self::SCOPE_LOCAL,
 		self::PROPERTY_ROLE => self::SCOPE_LOCAL,
 		self::PROPERTY_HEADLINE => self::SCOPE_LOCAL,
@@ -525,6 +526,7 @@ class AccountManager implements IAccountManager {
 	protected function updateVerificationStatus(IAccount $updatedAccount, array $oldData): void {
 		static $propertiesVerifiableByLookupServer = [
 			self::PROPERTY_TWITTER,
+			self::PROPERTY_FEDIVERSE,
 			self::PROPERTY_WEBSITE,
 			self::PROPERTY_EMAIL,
 		];
@@ -724,6 +726,13 @@ class AccountManager implements IAccountManager {
 			],
 
 			[
+				'name' => self::PROPERTY_FEDIVERSE,
+				'value' => '',
+				'scope' => $scopes[self::PROPERTY_FEDIVERSE],
+				'verified' => self::NOT_VERIFIED,
+			],
+
+			[
 				'name' => self::PROPERTY_ORGANISATION,
 				'value' => '',
 				'scope' => $scopes[self::PROPERTY_ORGANISATION],
diff --git a/lib/private/Profile/Actions/FediverseAction.php b/lib/private/Profile/Actions/FediverseAction.php
new file mode 100644
index 00000000000..ed3fcd80b52
--- /dev/null
+++ b/lib/private/Profile/Actions/FediverseAction.php
@@ -0,0 +1,90 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2021 Christopher Ng <chrng8@gmail.com>
+ *
+ * @author Christopher Ng <chrng8@gmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC\Profile\Actions;
+
+use function Safe\substr;
+use OCP\Accounts\IAccountManager;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\L10N\IFactory;
+use OCP\Profile\ILinkAction;
+
+class FediverseAction implements ILinkAction {
+	private ?string $value = null;
+	private IAccountManager $accountManager;
+	private IFactory $l10nFactory;
+	private IURLGenerator $urlGenerator;
+
+	public function __construct(
+		IAccountManager $accountManager,
+		IFactory $l10nFactory,
+		IURLGenerator $urlGenerator
+	) {
+		$this->accountManager = $accountManager;
+		$this->l10nFactory = $l10nFactory;
+		$this->urlGenerator = $urlGenerator;
+	}
+
+	public function preload(IUser $targetUser): void {
+		$account = $this->accountManager->getAccount($targetUser);
+		$this->value = $account->getProperty(IAccountManager::PROPERTY_FEDIVERSE)->getValue();
+	}
+
+	public function getAppId(): string {
+		return 'core';
+	}
+
+	public function getId(): string {
+		return IAccountManager::PROPERTY_FEDIVERSE;
+	}
+
+	public function getDisplayId(): string {
+		return $this->l10nFactory->get('lib')->t('Fediverse');
+	}
+
+	public function getTitle(): string {
+		$displayUsername = $this->value[0] === '@' ? $this->value : '@' . $this->value;
+		return $this->l10nFactory->get('lib')->t('View %s on the fediverse', [$displayUsername]);
+	}
+
+	public function getPriority(): int {
+		return 50;
+	}
+
+	public function getIcon(): string {
+		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/mastodon.svg'));
+	}
+
+	public function getTarget(): ?string {
+		if (empty($this->value)) {
+			return null;
+		}
+		$username = $this->value[0] === '@' ? substr($this->value, 1) : $this->value;
+		[$username, $instance] = explode('@', $username);
+		return 'https://' . $instance . '/@' . $username;
+	}
+}
diff --git a/lib/private/Profile/ProfileManager.php b/lib/private/Profile/ProfileManager.php
index f038986cf6d..ab1af1c1c16 100644
--- a/lib/private/Profile/ProfileManager.php
+++ b/lib/private/Profile/ProfileManager.php
@@ -35,6 +35,7 @@ use OC\KnownUser\KnownUserService;
 use OC\Profile\Actions\EmailAction;
 use OC\Profile\Actions\PhoneAction;
 use OC\Profile\Actions\TwitterAction;
+use OC\Profile\Actions\FediverseAction;
 use OC\Profile\Actions\WebsiteAction;
 use OCP\Accounts\IAccountManager;
 use OCP\Accounts\PropertyDoesNotExistException;
@@ -95,6 +96,7 @@ class ProfileManager {
 		PhoneAction::class,
 		WebsiteAction::class,
 		TwitterAction::class,
+		FediverseAction::class,
 	];
 
 	/**
diff --git a/lib/public/Accounts/IAccountManager.php b/lib/public/Accounts/IAccountManager.php
index e41327171b4..77c32d6ff4e 100644
--- a/lib/public/Accounts/IAccountManager.php
+++ b/lib/public/Accounts/IAccountManager.php
@@ -112,6 +112,7 @@ interface IAccountManager {
 	public const PROPERTY_WEBSITE = 'website';
 	public const PROPERTY_ADDRESS = 'address';
 	public const PROPERTY_TWITTER = 'twitter';
+	public const PROPERTY_FEDIVERSE = 'fediverse';
 
 	/**
 	 * @since 23.0.0
@@ -151,6 +152,7 @@ interface IAccountManager {
 		self::PROPERTY_WEBSITE,
 		self::PROPERTY_ADDRESS,
 		self::PROPERTY_TWITTER,
+		self::PROPERTY_FEDIVERSE,
 		self::PROPERTY_ORGANISATION,
 		self::PROPERTY_ROLE,
 		self::PROPERTY_HEADLINE,