fixup! Make possible to define custom avatar types

Signed-off-by: Daniel Calviño Sánchez <[email protected]>

core/Controller/GenericAvatarController.php

@@ -31,6 +31,7 @@
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\FileDisplayResponse;
 use OCP\AppFramework\Http\Response;
+use OCP\AvatarProviderException;
 use OCP\Files\NotFoundException;
 use OCP\IAvatarManager;
 use OCP\IL10N;
@@ -90,6 +91,8 @@ public function getAvatar(string $avatarType, string $avatarId, int $size): Resp
 			);
 		} catch (\InvalidArgumentException $e) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
+		} catch (AvatarProviderException $e) {
+			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		} catch (NotFoundException $e) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		} catch (\Exception $e) {

lib/composer/composer/autoload_classmap.php

@@ -105,6 +105,7 @@
     'OCP\\Authentication\\TwoFactorAuth\\TwoFactorException' => $baseDir . '/lib/public/Authentication/TwoFactorAuth/TwoFactorException.php',
     'OCP\\Authentication\\TwoFactorAuth\\TwoFactorProviderDisabled' => $baseDir . '/lib/public/Authentication/TwoFactorAuth/TwoFactorProviderDisabled.php',
     'OCP\\AutoloadNotAllowedException' => $baseDir . '/lib/public/AutoloadNotAllowedException.php',
+    'OCP\\AvatarProviderException' => $baseDir . '/lib/public/AvatarProviderException.php',
     'OCP\\BackgroundJob' => $baseDir . '/lib/public/BackgroundJob.php',
     'OCP\\BackgroundJob\\IJob' => $baseDir . '/lib/public/BackgroundJob/IJob.php',
     'OCP\\BackgroundJob\\IJobList' => $baseDir . '/lib/public/BackgroundJob/IJobList.php',

lib/composer/composer/autoload_static.php

@@ -134,6 +134,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OCP\\Authentication\\TwoFactorAuth\\TwoFactorException' => __DIR__ . '/../../..' . '/lib/public/Authentication/TwoFactorAuth/TwoFactorException.php',
         'OCP\\Authentication\\TwoFactorAuth\\TwoFactorProviderDisabled' => __DIR__ . '/../../..' . '/lib/public/Authentication/TwoFactorAuth/TwoFactorProviderDisabled.php',
         'OCP\\AutoloadNotAllowedException' => __DIR__ . '/../../..' . '/lib/public/AutoloadNotAllowedException.php',
+        'OCP\\AvatarProviderException' => __DIR__ . '/../../..' . '/lib/public/AvatarProviderException.php',
         'OCP\\BackgroundJob' => __DIR__ . '/../../..' . '/lib/public/BackgroundJob.php',
         'OCP\\BackgroundJob\\IJob' => __DIR__ . '/../../..' . '/lib/public/BackgroundJob/IJob.php',
         'OCP\\BackgroundJob\\IJobList' => __DIR__ . '/../../..' . '/lib/public/BackgroundJob/IJobList.php',

lib/public/AvatarProviderException.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2020, Daniel Calviño Sánchez ([email protected])
+ *
+ * @author Daniel Calviño Sánchez <[email protected]>
+ *
+ * @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 OCP;
+
+/**
+ * Generic exception thrown when an AvatarProvider can not perform an action
+ *
+ * @since 21.0.0
+ */
+class AvatarProviderException extends \RuntimeException {
+
+	public function __construct(string $message = "", int $code = 0, \Exception $previous = null) {
+		parent::__construct($message, $code, $previous);
+	}
+}

lib/public/IAvatarProvider.php

@@ -38,7 +38,8 @@ interface IAvatarProvider {
 	 *
 	 * @param string $id the identifier of the avatar
 	 * @return IAvatar the avatar instance
-	 * @throws \Exception if an error occurred while getting the avatar
+	 * @throws AvatarProviderException if an error occurred while getting the
+	 *         avatar
 	 * @since 21.0.0
 	 */
 	public function getAvatar(string $id): IAvatar;