Fix missing Update activity add cover and avatar removal (#1492)

BentiGorlich · melroy89 · web-flow · commit 4e005cb71ab6 · 2025-03-04T16:19:27.000Z
Co-authored-by: Melroy van den Berg &lt;melroy@melroy.org&gt;
diff --git a/src/Controller/Api/User/UserDeleteImagesApi.php b/src/Controller/Api/User/UserDeleteImagesApi.php
@@ -5,6 +5,7 @@
 namespace App\Controller\Api\User;
 
 use App\DTO\UserResponseDto;
+use App\Event\User\UserEditedEvent;
 use App\Factory\UserFactory;
 use App\Service\UserManager;
 use Nelmio\ApiDocBundle\Attribute\Model;
@@ -51,7 +52,12 @@ public function avatar(
     ): JsonResponse {
         $headers = $this->rateLimit($apiImageLimiter);
 
-        $manager->detachAvatar($this->getUserOrThrow());
+        $user = $this->getUserOrThrow();
+        $manager->detachAvatar($user);
+        /*
+         * Call edit so the @see UserEditedEvent is triggered and the changes are federated
+         */
+        $manager->edit($user, $manager->createDto($user));
 
         return new JsonResponse(
             $this->serializeUser($factory->createDto($this->getUserOrThrow())),
@@ -94,7 +100,12 @@ public function cover(
     ): JsonResponse {
         $headers = $this->rateLimit($apiImageLimiter);
 
-        $manager->detachCover($this->getUserOrThrow());
+        $user = $this->getUserOrThrow();
+        $manager->detachCover($user);
+        /*
+         * Call edit so the @see UserEditedEvent is triggered and the changes are federated
+         */
+        $manager->edit($user, $manager->createDto($user));
 
         return new JsonResponse(
             $this->serializeUser($factory->createDto($this->getUserOrThrow())),
diff --git a/src/Controller/User/Profile/UserEditController.php b/src/Controller/User/Profile/UserEditController.php
@@ -6,9 +6,11 @@
 
 use App\Controller\AbstractController;
 use App\DTO\UserDto;
+use App\Exception\ImageDownloadTooLargeException;
 use App\Form\UserBasicType;
 use App\Form\UserEmailType;
 use App\Form\UserPasswordType;
+use App\Service\SettingsManager;
 use App\Service\UserManager;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Form\FormError;
@@ -27,6 +29,7 @@ public function __construct(
         private readonly UserPasswordHasherInterface $userPasswordHasher,
         private readonly TranslatorInterface $translator,
         private readonly Security $security,
+        private readonly SettingsManager $settingsManager,
     ) {
     }
 
@@ -176,6 +179,10 @@ private function handleForm(
             }
 
             return $form;
+        } catch (ImageDownloadTooLargeException $e) {
+            $this->addFlash('error', $this->translator->trans('flash_image_download_too_large_error', ['%bytes%' => $this->settingsManager->getMaxImageByteString()]));
+
+            return null;
         } catch (\Exception $e) {
             return null;
         }
diff --git a/src/Controller/User/UserAvatarDeleteController.php b/src/Controller/User/UserAvatarDeleteController.php
@@ -22,7 +22,12 @@ public function __invoke(Request $request): Response
     {
         $this->denyAccessUnlessGranted('edit_profile', $this->getUserOrThrow());
 
-        $this->userManager->detachAvatar($this->getUserOrThrow());
+        $user = $this->getUserOrThrow();
+        $this->userManager->detachAvatar($user);
+        /*
+         * Call edit so the @see UserEditedEvent is triggered and the changes are federated
+         */
+        $this->userManager->edit($user, $this->userManager->createDto($user));
 
         if ($request->isXmlHttpRequest()) {
             return new JsonResponse(
diff --git a/src/Controller/User/UserCoverDeleteController.php b/src/Controller/User/UserCoverDeleteController.php
@@ -22,7 +22,12 @@ public function __invoke(Request $request): Response
     {
         $this->denyAccessUnlessGranted('edit_profile', $this->getUserOrThrow());
 
-        $this->userManager->detachCover($this->getUserOrThrow());
+        $user = $this->getUserOrThrow();
+        $this->userManager->detachCover($user);
+        /*
+         * Call edit so the @see UserEditedEvent is triggered and the changes are federated
+         */
+        $this->userManager->edit($user, $this->userManager->createDto($user));
 
         if ($request->isXmlHttpRequest()) {
             return new JsonResponse(
diff --git a/src/MessageHandler/ActivityPub/Outbox/UpdateHandler.php b/src/MessageHandler/ActivityPub/Outbox/UpdateHandler.php
@@ -23,6 +23,7 @@
 use App\Service\DeliverManager;
 use App\Service\SettingsManager;
 use Doctrine\ORM\EntityManagerInterface;
+use Psr\Log\LoggerInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
@@ -38,6 +39,7 @@ public function __construct(
         private readonly DeliverManager $deliverManager,
         private readonly UpdateWrapper $updateWrapper,
         private readonly KernelInterface $kernel,
+        private readonly LoggerInterface $logger,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -88,6 +90,7 @@ public function doWork(MessageInterface $message): void
             $activity = $this->updateWrapper->buildForActor($entity, $editedByUser);
             if ($entity instanceof User) {
                 $inboxes = $this->userRepository->findAudience($entity);
+                $this->logger->debug('[UpdateHandler::doWork] sending update user activity for user {u} to {i}', ['u' => $entity->username, 'i' => join(', ', $inboxes)]);
             } elseif ($entity instanceof Magazine) {
                 if ('random' === $entity->name) {
                     // do not federate the random magazine
diff --git a/src/Service/ActivityPubManager.php b/src/Service/ActivityPubManager.php
@@ -409,6 +409,9 @@ private function updateUser(string $actorUrl): ?User
                     $this->bus->dispatch(new DeleteImageMessage($user->avatar->getId()));
                 }
                 $user->avatar = $newImage;
+            } elseif (null !== $user->avatar) {
+                $this->bus->dispatch(new DeleteImageMessage($user->avatar->getId()));
+                $user->avatar = null;
             }
 
             // Only update cover if image is set
@@ -421,6 +424,9 @@ private function updateUser(string $actorUrl): ?User
                     $this->bus->dispatch(new DeleteImageMessage($user->cover->getId()));
                 }
                 $user->cover = $newImage;
+            } elseif (null !== $user->cover) {
+                $this->bus->dispatch(new DeleteImageMessage($user->cover->getId()));
+                $user->cover = null;
             }
 
             if (null !== $user->apFollowersUrl) {
@@ -565,6 +571,9 @@ private function updateMagazine(string $actorUrl): ?Magazine
                     $this->bus->dispatch(new DeleteImageMessage($magazine->icon->getId()));
                 }
                 $magazine->icon = $newImage;
+            } elseif (null !== $magazine->icon) {
+                $this->bus->dispatch(new DeleteImageMessage($magazine->icon->getId()));
+                $magazine->icon = null;
             }
 
             if ($actor['name']) {
diff --git a/templates/user/settings/profile.html.twig b/templates/user/settings/profile.html.twig
@@ -29,20 +29,54 @@
             {{ form_start(form) }}
             {{ component('editor_toolbar', {id: 'user_basic_about'}) }}
             {{ form_row(form.about, {label: false, attr: {
-                placeholder: 'about', 
-                'data-controller': 'input-length rich-textarea autogrow', 
+                placeholder: 'about',
+                'data-controller': 'input-length rich-textarea autogrow',
                 'data-entry-link-create-target': 'user_about',
                 'data-action' : 'input-length#updateDisplay',
                 'data-input-length-max-value' : constant('App\\DTO\\UserDto::MAX_ABOUT_LENGTH')
                 }}) }}
             {{ form_row(form.username, {label: 'username', attr: {
-                'data-controller': 'input-length autogrow', 
+                'data-controller': 'input-length autogrow',
                 'data-entry-link-create-target': 'user_about',
                 'data-action' : 'input-length#updateDisplay',
                 'data-input-length-max-value' : constant('App\\DTO\\UserDto::MAX_USERNAME_LENGTH')
             }}) }}
             {{ form_row(form.avatar, {label: 'avatar'}) }}
+            {% if app.user.avatar is not same as null %}
+                <div class="actions">
+                    <ul style="width: 100%">
+                        <img width="40"
+                             height="40"
+                             src="{{ asset(app.user.avatar.filePath)|imagine_filter('entry_thumb') }}"
+                             alt="{{ app.user.avatar.altText }}" />
+                        <button formaction="{{ path('user_settings_avatar_delete') }}"
+                                class="btn-link"
+                                aria-label="{{ 'remove_user_avatar'|trans }}"
+                                title="{{ 'remove_user_avatar'|trans }}"
+                                data-action="confirmation#ask" data-confirmation-message-param="{{ 'are_you_sure'|trans }}">
+                            <i class="fa-solid fa-xmark" aria-hidden="true"></i>
+                        </button>
+                    </ul>
+                </div>
+            {% endif %}
             {{ form_row(form.cover, {label: 'cover'}) }}
+            {% if app.user.cover is not same as null %}
+                <div class="actions">
+                    <ul style="width: 100%">
+                        <img width="40"
+                             height="40"
+                             src="{{ asset(app.user.cover.filePath)|imagine_filter('entry_thumb') }}"
+                             alt="{{ app.user.cover.altText }}" />
+                        <button formaction="{{ path('user_settings_cover_delete') }}"
+                                class="btn-link"
+                                aria-label="{{ 'remove_user_cover'|trans }}"
+                                title="{{ 'remove_user_cover'|trans }}"
+                                data-action="confirmation#ask" data-confirmation-message-param="{{ 'are_you_sure'|trans }}">
+                            <i class="fa-solid fa-xmark" aria-hidden="true"></i>
+                        </button>
+                    </ul>
+                </div>
+            {% endif %}
             <div class="row actions">
                 {{ form_row(form.submit, {label: 'save', attr: {class: 'btn btn__primary'}}) }}
             </div>
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
@@ -53,6 +53,8 @@ add_comment: Add comment
 add_post: Add post
 add_media: Add media
 remove_media: Remove media
+remove_user_avatar: Remove avatar
+remove_user_cover: Remove cover
 markdown_howto: How does the editor work?
 enter_your_comment: Enter your comment
 enter_your_post: Enter your post

Original file line number	Diff line number	Diff line change
`@@ -409,6 +409,9 @@ private function updateUser(string $actorUrl): ?User`
`409`	`409`	`$this->bus->dispatch(new DeleteImageMessage($user->avatar->getId()));`
`410`	`410`	`}`
`411`	`411`	`$user->avatar = $newImage;`
	`412`	`+ } elseif (null !== $user->avatar) {`
	`413`	`+ $this->bus->dispatch(new DeleteImageMessage($user->avatar->getId()));`
	`414`	`+ $user->avatar = null;`
`412`	`415`	`}`
`413`	`416`
`414`	`417`	`// Only update cover if image is set`
`@@ -421,6 +424,9 @@ private function updateUser(string $actorUrl): ?User`
`421`	`424`	`$this->bus->dispatch(new DeleteImageMessage($user->cover->getId()));`
`422`	`425`	`}`
`423`	`426`	`$user->cover = $newImage;`
	`427`	`+ } elseif (null !== $user->cover) {`
	`428`	`+ $this->bus->dispatch(new DeleteImageMessage($user->cover->getId()));`
	`429`	`+ $user->cover = null;`
`424`	`430`	`}`
`425`	`431`
`426`	`432`	`if (null !== $user->apFollowersUrl) {`
`@@ -565,6 +571,9 @@ private function updateMagazine(string $actorUrl): ?Magazine`
`565`	`571`	`$this->bus->dispatch(new DeleteImageMessage($magazine->icon->getId()));`
`566`	`572`	`}`
`567`	`573`	`$magazine->icon = $newImage;`
	`574`	`+ } elseif (null !== $magazine->icon) {`
	`575`	`+ $this->bus->dispatch(new DeleteImageMessage($magazine->icon->getId()));`
	`576`	`+ $magazine->icon = null;`
`568`	`577`	`}`
`569`	`578`
`570`	`579`	`if ($actor['name']) {`