[PLUGIN][ActivityPub][TESTS] Add GoToSocial test fixtures

Thanks to tsmethurst <tobi.smethurst@protonmail.com> for finding the error

.env.test

@@ -3,4 +3,4 @@ KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
 SYMFONY_DEPRECATIONS_HELPER=999999
 PANTHER_APP_ENV=panther
-DATABASE_URL=postgresql://postgres:password@db:5432/social
+DATABASE_URL=postgresql://postgres:password@db:5432/test

.php-cs-fixer.php

@@ -178,7 +178,7 @@ return $config
         // There MUST NOT be a space after the opening parenthesis. There MUST NOT be a space before the closing parenthesis.
         'no_spaces_inside_parenthesis' => true,
         // Removes `@param`, `@return` and `@var` tags that don't provide any useful information.
-        'no_superfluous_phpdoc_tags' => true,
+        'no_superfluous_phpdoc_tags' => false,
         // Remove trailing commas in list function calls.
         'no_trailing_comma_in_list_call' => true,
         // PHP single-line arrays should not have trailing comma.

Makefile

@@ -37,10 +37,16 @@ database-force-schema-update:
 	docker exec -it $(call translate-container-name,$(strip $(DIR))_php_1) sh -c "/var/www/social/bin/console doctrine:schema:update --dump-sql --force"
 
 tooling-docker: .PHONY
-	@cd docker/tooling && docker-compose up -d > /dev/null 2>&1
+	@cd docker/tooling && docker-compose up -d --build > /dev/null 2>&1
 
-accessibility: .PHONY
-	@cd docker/accessibility && docker-compose up
+stop-tooling: .PHONY
+	cd docker/tooling && docker-compose down
+
+tooling-php-shell: tooling-docker
+	docker exec -it $(call translate-container-name,tooling_php_1) sh
+
+test-accesibility: tooling-docker
+	cd docker/tooling && docker-compose run pa11y /accessibility.sh
 
 test: tooling-docker
 	docker exec $(call translate-container-name,tooling_php_1) /var/tooling/coverage.sh $(call args,'')
@@ -54,16 +60,63 @@ doc-check: tooling-docker
 phpstan: tooling-docker
 	bin/phpstan
 
-stop-tooling: .PHONY
-	cd docker/tooling && docker-compose down
-
 remove-var:
 	rm -rf var/*
 
 remove-file:
-	rm -rf file/*
+	sudo rm -rf file/*
 
 flush-redis-cache:
 	docker exec -it $(call translate-container-name,$(strip $(DIR))_redis_1) sh -c 'redis-cli flushall'
 
-force-nuke-everything: down up flush-redis-cache database-force-nuke remove-var remove-file
+install-plugins:
+	docker exec -it $(call translate-container-name,$(strip $(DIR))_php_1) /var/www/social/bin/install_plugins.sh
+
+update-dependencies:
+	docker exec -it $(call translate-container-name,$(strip $(DIR))_php_1) sh -c 'cd /var/www/social && composer update'
+
+update-autocode:
+	docker exec -it $(call translate-container-name,$(strip $(DIR))_php_1) sh -c 'cd /var/www/social && bin/update_autocode'
+
+backup-actors:
+	docker exec -it $(call translate-container-name,$(strip $(DIR))_db_1) \
+	sh -c 'su postgres -c "mkdir -p /tmp/backup"' && \
+	docker exec -it $(call translate-container-name,$(strip $(DIR))_php_1) \
+	sh -c "cd /var/www/social && bin/console doctrine:query:sql \"\
+	copy actor to '/tmp/backup/actor.csv';\
+	copy local_user to '/tmp/backup/local_user.csv';\
+	copy local_group to '/tmp/backup/local_group.csv';\
+	\
+	copy activitypub_actor to '/tmp/backup/ap_actor.csv';\
+	copy activitypub_rsa to '/tmp/backup/ap_rsa.csv';\
+	\
+	copy actor_subscription to '/tmp/backup/actor_subscription.csv';\
+	copy group_member to '/tmp/backup/group_member.csv';\
+	\
+	copy feed to '/tmp/backup/feed.csv';\
+	copy (SELECT 'ALTER SEQUENCE ' || c.relname || ' RESTART WITH ' || nextval(c.relname::regclass) || ';'\
+	FROM pg_class c WHERE c.relkind = 'S') to '/tmp/backup/sequences';\"" && \
+	mkdir -p /tmp/social-sql-backup && \
+	docker cp $(call translate-container-name,$(strip $(DIR))_db_1):/tmp/backup/. /tmp/social-sql-backup
+
+restore-actors:
+	docker cp /tmp/social-sql-backup/. $(call translate-container-name,$(strip $(DIR))_db_1):/tmp/backup
+	docker exec -it $(call translate-container-name,$(strip $(DIR))_db_1) sh -c 'chown postgres /tmp/backup' && \
+	docker exec -it $(call translate-container-name,$(strip $(DIR))_php_1) \
+	sh -c "cd /var/www/social && bin/console doctrine:query:sql \"\
+	copy actor from '/tmp/backup/actor.csv';\
+	copy local_user from '/tmp/backup/local_user.csv';\
+	copy local_group from '/tmp/backup/local_group.csv';\
+	\
+	copy activitypub_actor from '/tmp/backup/ap_actor.csv';\
+	copy activitypub_rsa from '/tmp/backup/ap_rsa.csv';\
+	\
+	copy actor_subscription from '/tmp/backup/actor_subscription.csv';\
+	copy group_member from '/tmp/backup/group_member.csv';\
+	\
+	copy feed from '/tmp/backup/feed.csv';\
+	`cat /tmp/social-sql-backup/sequences`\""
+
+force-nuke-everything: down remove-var remove-file up flush-redis-cache database-force-nuke install-plugins
+
+force-delete-content: backup-actors force-nuke-everything restore-actors

bin/configure

@@ -352,8 +352,8 @@ SOCIAL_DBMS=${DBMS}
 SOCIAL_DB=${DB_NAME}
 SOCIAL_USER=${DB_USER}
 SOCIAL_PASSWORD=${DB_PASSWORD}
-SOCIAL_DOMAIN=${DOMAIN}
-SOCIAL_NODE_NAME=${NODE_NAME}
+CONFIG_DOMAIN=${DOMAIN}
+CONFIG_NODE_NAME=${NODE_NAME}
 SOCIAL_ADMIN_EMAIL=${EMAIL}
 SOCIAL_SITE_PROFILE=${PROFILE}
 MAILER_DSN=${MAILER_DSN}

bin/install_plugins.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+for plugin in plugins/*; do
+    install="${plugin}/bin/install.sh"
+    if [ -x "${install}" ]; then
+        ( # subshell, to clear options/environment
+            set -x
+            "${install}"
+        )
+    fi
+done

bin/update_autocode

@@ -20,26 +20,23 @@ const types = [
     'text'         => 'string',
     'varchar'      => 'string',
     'phone_number' => 'PhoneNumber',
+    'float'        => 'float', // TODO REMOVE THIS
 ];
 
 $files = array_merge(glob(ROOT . '/src/Entity/*.php'),
                      array_merge(glob(ROOT . '/components/*/Entity/*.php'),
                                  glob(ROOT . '/plugins/*/Entity/*.php')));
 
-$classes = [];
 $nullable_no_defaults_warning = [];
 
 foreach ($files as $file) {
 
     require_once $file;
 
-    $declared = get_declared_classes();
-    foreach ($declared as $dc) {
-        if (preg_match('/(App|(Component|Plugin)\\\\[^\\\\]+)\\\\Entity/', $dc) && !in_array($dc, $classes)) {
-            $class = $dc;
-            $classes[] = $class;
-            break;
-        }
+    $class = str_replace(['/', 'src', 'components', 'plugins'], ['\\', 'App', 'Component', 'Plugin'], substr($file, strlen(ROOT) + 1, -4));
+
+    if (!method_exists($class, 'schemaDef')) {
+        continue;
     }
 
     $no_ns_class  = preg_replace('/.*?\\\\/', '', $class);

components/Attachment/Attachment.php

@@ -22,10 +22,10 @@ declare(strict_types = 1);
 namespace Component\Attachment;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Modules\Component;
-use App\Core\Router\RouteLoader;
+use App\Core\Router;
 use App\Entity\Actor;
 use App\Entity\Note;
 use App\Util\Formatting;
@@ -34,10 +34,11 @@ use Component\Attachment\Entity as E;
 use Doctrine\Common\Collections\ExpressionBuilder;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
+use EventResult;
 
 class Attachment extends Component
 {
-    public function onAddRoute(RouteLoader $r): bool
+    public function onAddRoute(Router $r): EventResult
     {
         $r->connect('note_attachment_show', '/object/note/{note_id<\d+>}/attachment/{attachment_id<\d+>}', [C\Attachment::class, 'attachmentShowWithNote']);
         $r->connect('note_attachment_view', '/object/note/{note_id<\d+>}/attachment/{attachment_id<\d+>}/view', [C\Attachment::class, 'attachmentViewWithNote']);
@@ -51,13 +52,13 @@ class Attachment extends Component
      *
      * This can be used in the future to deduplicate images by visual content
      */
-    public function onHashFile(string $filename, ?string &$out_hash): bool
+    public function onHashFile(string $filename, ?string &$out_hash): EventResult
     {
         $out_hash = hash_file(E\Attachment::FILEHASH_ALGO, $filename);
         return Event::stop;
     }
 
-    public function onNoteDeleteRelated(Note &$note, Actor $actor): bool
+    public function onNoteDeleteRelated(Note &$note, Actor $actor): EventResult
     {
         Cache::delete("note-attachments-{$note->getId()}");
         foreach ($note->getAttachments() as $attachment) {
@@ -68,16 +69,23 @@ class Attachment extends Component
         return Event::next;
     }
 
-    public function onSearchQueryAddJoins(QueryBuilder &$note_qb, QueryBuilder &$actor_qb): bool
+    public function onCollectionQueryAddJoins(QueryBuilder &$note_qb, QueryBuilder &$actor_qb): EventResult
     {
-        $note_qb->leftJoin(E\AttachmentToNote::class, 'attachment_to_note', Expr\Join::WITH, 'note.id = attachment_to_note.note_id');
+        if (!\in_array('attachment_to_note', $note_qb->getAllAliases())) {
+            $note_qb->leftJoin(
+                join: E\AttachmentToNote::class,
+                alias: 'attachment_to_note',
+                conditionType: Expr\Join::WITH,
+                condition: 'note.id = attachment_to_note.note_id',
+            );
+        }
         return Event::next;
     }
 
     /**
      * Populate $note_expr with the criteria for looking for notes with attachments
      */
-    public function onSearchCreateExpression(ExpressionBuilder $eb, string $term, ?string $language, ?Actor $actor, &$note_expr, &$actor_expr): bool
+    public function onCollectionQueryCreateExpression(ExpressionBuilder $eb, string $term, ?string $locale, ?Actor $actor, &$note_expr, &$actor_expr): EventResult
     {
         $include_term = str_contains($term, ':') ? explode(':', $term)[1] : $term;
         if (Formatting::startsWith($term, ['note-types:', 'notes-incude:', 'note-filter:'])) {

components/Attachment/Controller/Attachment.php

@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Attachment\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\GSFile;
 use function App\Core\I18n\_m;
@@ -35,6 +35,7 @@ use App\Util\Exception\NoSuchFileException;
 use App\Util\Exception\NotFoundException;
 use App\Util\Exception\ServerException;
 use Component\Attachment\Entity\AttachmentThumbnail;
+use Component\Attachment\Entity\AttachmentToNote;
 use Symfony\Component\HttpFoundation\HeaderUtils;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -50,7 +51,12 @@ class Attachment extends Controller
         $attachment = DB::findOneBy('attachment', ['id' => $attachment_id]);
         $note       = \is_int($note) ? Note::getById($note) : $note;
 
-        // Before anything, ensure proper scope
+        // Before anything, two very important things!
+        // first: ensure this attachment is associated with this note
+        if (DB::count(AttachmentToNote::class, ['attachment_id' => $attachment->getId(), 'note_id' => $note->getId()]) <= 0) {
+            throw new ClientException(_m('No such attachment.'), 404);
+        }
+        // second: ensure proper scope
         if (!$note->isVisibleTo(Common::actor())) {
             throw new ClientException(_m('You don\'t have permissions to view this attachment.'), 401);
         }
@@ -89,7 +95,7 @@ class Attachment extends Controller
         try {
             return $this->attachment($attachment_id, $note_id, function ($res) use ($note_id, $attachment_id) {
                 return [
-                    '_template'        => '/cards/attachments/show.html.twig',
+                    '_template'        => 'attachment/view.html.twig',
                     'download'         => $res['attachment']->getDownloadUrl(note: $note_id),
                     'title'            => $res['title'],
                     'attachment'       => $res['attachment'],
@@ -145,12 +151,18 @@ class Attachment extends Controller
      */
     public function attachmentThumbnailWithNote(Request $request, int $note_id, int $attachment_id, string $size = 'small'): Response
     {
-        // Before anything, ensure proper scope
-        if (!Note::getById($note_id)->isVisibleTo(Common::actor())) {
-            throw new ClientException(_m('You don\'t have permissions to view this thumbnail.'), 401);
-        }
-
         $attachment = DB::findOneBy('attachment', ['id' => $attachment_id]);
+        $note       = Note::getById($note_id);
+
+        // Before anything, two very important things!
+        // first: ensure this attachment is associated with this note
+        if (DB::count(AttachmentToNote::class, ['attachment_id' => $attachment->getId(), 'note_id' => $note->getId()]) <= 0) {
+            throw new ClientException(_m('No such attachment.'), 404);
+        }
+        // second: ensure proper scope
+        if (!$note->isVisibleTo(Common::actor())) {
+            throw new ClientException(_m('You don\'t have permissions to view this attachment.'), 401);
+        }
 
         $crop = Common::config('thumbnail', 'smart_crop');
 

components/Attachment/Entity/ActorToAttachment.php

@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Attachment\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use DateTimeInterface;
 

components/Attachment/Entity/Attachment.php

@@ -24,17 +24,18 @@ declare(strict_types = 1);
 namespace Component\Attachment\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
 use App\Core\GSFile;
 use function App\Core\I18n\_m;
 use App\Core\Log;
-use App\Core\Router\Router;
+use App\Core\Router;
 use App\Entity\Note;
 use App\Util\Common;
 use App\Util\Exception\ClientException;
 use App\Util\Exception\DuplicateFoundException;
+use App\Util\Exception\NoSuchFileException;
 use App\Util\Exception\NotFoundException;
 use App\Util\Exception\ServerException;
 use DateTimeInterface;
@@ -223,8 +224,7 @@ class Attachment extends Entity
                     $this->setFilename(null);
                     $this->setSize(null);
                     // Important not to null neither width nor height
-                    DB::persist($this);
-                    DB::flush();
+                    DB::wrapInTransaction(fn () => DB::persist($this));
                 }
             } else {
                 // @codeCoverageIgnoreStart
@@ -339,7 +339,11 @@ class Attachment extends Entity
      */
     public function getThumbnails()
     {
-        return DB::findBy('attachment_thumbnail', ['attachment_id' => $this->id]);
+        return DB::findBy(
+            AttachmentThumbnail::class,
+            ['attachment_id' => $this->id],
+            order_by: ['size' => 'ASC', 'mimetype' => 'ASC'],
+        );
     }
 
     public function getPath()
@@ -367,15 +371,17 @@ class Attachment extends Entity
      * @throws ClientException
      * @throws NotFoundException
      * @throws ServerException
-     *
-     * @return AttachmentThumbnail
      */
     public function getThumbnail(?string $size = null, bool $crop = false): ?AttachmentThumbnail
     {
-        return AttachmentThumbnail::getOrCreate(attachment: $this, size: $size, crop: $crop);
+        try {
+            return AttachmentThumbnail::getOrCreate(attachment: $this, size: $size, crop: $crop);
+        } catch (NoSuchFileException) {
+            return null;
+        }
     }
 
-    public function getThumbnailUrl(Note|int $note, ?string $size = null)
+    public function getThumbnailUrl(Note|int $note, ?string $size = null): string
     {
         return Router::url('note_attachment_thumbnail', ['note_id' => \is_int($note) ? $note : $note->getId(), 'attachment_id' => $this->getId(), 'size' => $size ?? Common::config('thumbnail', 'default_size')]);
     }

components/Attachment/Entity/AttachmentThumbnail.php

@@ -24,12 +24,13 @@ declare(strict_types = 1);
 namespace Component\Attachment\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
 use App\Core\GSFile;
 use App\Core\Log;
-use App\Core\Router\Router;
+use App\Core\Router;
+use App\Entity\Note;
 use App\Util\Common;
 use App\Util\Exception\ClientException;
 use App\Util\Exception\NotFoundException;
@@ -179,7 +180,7 @@ class AttachmentThumbnail extends Entity
         if (isset($this->attachment) && !\is_null($this->attachment)) {
             return $this->attachment;
         } else {
-            return $this->attachment = DB::findOneBy('attachment', ['id' => $this->attachment_id]);
+            return $this->attachment = DB::findOneBy(Attachment::class, ['id' => $this->attachment_id]);
         }
     }
 
@@ -204,7 +205,7 @@ class AttachmentThumbnail extends Entity
         try {
             return Cache::get(
                 self::getCacheKey($attachment->getId(), $size_int),
-                fn () => DB::findOneBy('attachment_thumbnail', ['attachment_id' => $attachment->getId(), 'size' => $size_int]),
+                fn () => DB::findOneBy(self::class, ['attachment_id' => $attachment->getId(), 'size' => $size_int]),
             );
         } catch (NotFoundException) {
             if (\is_null($attachment->getWidth()) || \is_null($attachment->getHeight())) {
@@ -213,7 +214,7 @@ class AttachmentThumbnail extends Entity
             [$predicted_width, $predicted_height] = self::predictScalingValues($attachment->getWidth(), $attachment->getHeight(), $size, $crop);
             if (\is_null($attachment->getPath()) || !file_exists($attachment->getPath())) {
                 // Before we quit, check if there's any other thumb
-                $alternative_thumbs = DB::findBy('attachment_thumbnail', ['attachment_id' => $attachment->getId()]);
+                $alternative_thumbs = DB::findBy(self::class, ['attachment_id' => $attachment->getId()]);
                 usort($alternative_thumbs, fn ($l, $r) => $r->getSize() <=> $l->getSize());
                 if (empty($alternative_thumbs)) {
                     throw new NotStoredLocallyException();
@@ -253,14 +254,14 @@ class AttachmentThumbnail extends Entity
         }
     }
 
-    public function getPath()
+    public function getPath(): string
     {
         return Common::config('thumbnail', 'dir') . \DIRECTORY_SEPARATOR . $this->getFilename();
     }
 
-    public function getUrl()
+    public function getUrl(Note|int $note): string
     {
-        return Router::url('attachment_thumbnail', ['id' => $this->getAttachmentId(), 'size' => self::sizeIntToStr($this->getSize())]);
+        return Router::url('note_attachment_thumbnail', ['note_id' => \is_int($note) ? $note : $note->getId(), 'attachment_id' => $this->getAttachmentId(), 'size' => self::sizeIntToStr($this->getSize())]);
     }
 
     /**
@@ -277,9 +278,10 @@ class AttachmentThumbnail extends Entity
             }
         }
         Cache::delete(self::getCacheKey($this->getAttachmentId(), $this->getSize()));
-        DB::remove($this);
         if ($flush) {
-            DB::flush();
+            DB::wrapInTransaction(fn () => DB::remove($this));
+        } else {
+            DB::remove($this);
         }
     }
 

components/Attachment/Entity/AttachmentToLink.php

@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Attachment\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use DateTimeInterface;
 

components/Attachment/Entity/AttachmentToNote.php

@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Attachment\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use DateTimeInterface;
 

components/Attachment/tests/Controller/AttachmentTest.php

@@ -21,10 +21,12 @@ declare(strict_types = 1);
 
 // }}}
 
-namespace App\Tests\Controller;
+namespace Component\Attachment\tests\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Util\GNUsocialTestCase;
+use Component\Attachment\Entity\Attachment;
+use Component\Attachment\Entity\AttachmentToNote;
 
 class AttachmentTest extends GNUsocialTestCase
 {
@@ -32,31 +34,33 @@ class AttachmentTest extends GNUsocialTestCase
     {
         // This calls static::bootKernel(), and creates a "client" that is acting as the browser
         $client = static::createClient();
-        $client->request('GET', '/attachment');
+        //$client->request('GET', '/attachment');
+        //$this->assertResponseStatusCodeSame(404);
+        $client->request('GET', '/object/note/1/attachment/-1');
         $this->assertResponseStatusCodeSame(404);
-        $client->request('GET', '/attachment/-1');
+        $client->request('GET', '/object/note/1/attachment/asd');
         $this->assertResponseStatusCodeSame(404);
-        $client->request('GET', '/attachment/asd');
-        $this->assertResponseStatusCodeSame(404);
-        $client->request('GET', '/attachment/0');
+        $client->request('GET', '/object/note/1/attachment/0');
         // In the meantime, throwing ClientException doesn't actually result in the reaching the UI, as it's intercepted
         // by the helpful framework that displays the stack traces and such. This should be easily fixable when we have
         // our own error pages
-        $this->assertSelectorTextContains('.stacktrace', 'ClientException');
+        $this->assertResponseStatusCodeSame(500); // TODO (exception page) 404
+        $this->assertSelectorTextContains('.stacktrace', 'No such attachment.');
     }
 
     private function testAttachment(string $suffix = '')
     {
-        $client  = static::createClient();
-        $id      = DB::findOneBy('attachment', ['filehash' => '5d8ee7ead51a28803b4ee5cb2306a0b90b6ba570f1e5bcc2209926f6ab08e7ea'])->getId();
-        $crawler = $client->request('GET', "/attachment/{$id}{$suffix}");
+        $client        = static::createClient();
+        $attachment_id = DB::findOneBy(Attachment::class, ['filehash' => '5d8ee7ead51a28803b4ee5cb2306a0b90b6ba570f1e5bcc2209926f6ab08e7ea'])->getId();
+        $note_id       = DB::findOneBy(AttachmentToNote::class, ['attachment_id' => $attachment_id])->getNoteId();
+        $crawler       = $client->request('GET', "/object/note/{$note_id}/attachment/{$attachment_id}{$suffix}");
     }
 
     public function testAttachmentShow()
     {
         $this->testAttachment();
         $this->assertResponseIsSuccessful();
-        $this->assertSelectorTextContains('figure figcaption', '5d8ee7ead51a28803b4ee5cb2306a0b90b6ba570f1e5bcc2209926f6ab08e7ea');
+        $this->assertSelectorTextContains('figure figcaption', 'image.jpg');
     }
 
     public function testAttachmentView()
@@ -65,16 +69,6 @@ class AttachmentTest extends GNUsocialTestCase
         $this->assertResponseIsSuccessful();
     }
 
-    public function testAttachmentViewNotStored()
-    {
-        $client          = static::createClient();
-        $last_attachment = DB::findBy('attachment', [], order_by: ['id' => 'DESC'], limit: 1)[0];
-        $id              = $last_attachment->getId() + 1;
-        $crawler         = $client->request('GET', "/attachment/{$id}/view");
-        $this->assertResponseStatusCodeSame(500); // TODO (exception page) 404
-        $this->assertSelectorTextContains('.stacktrace', 'ClientException');
-    }
-
     public function testAttachmentDownload()
     {
         $this->testAttachment('/download');

components/Attachment/tests/Entity/AttachmentTest.php

@@ -19,15 +19,17 @@ declare(strict_types = 1);
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
 // }}}
 
-namespace App\Tests\Entity;
+namespace Component\Attachment\tests\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\GSFile;
+use App\Core\Router;
 use App\Entity\Note;
 use App\Util\GNUsocialTestCase;
 use App\Util\TemporaryFile;
 use Component\Attachment\Entity\AttachmentToNote;
+use Component\Conversation\Conversation;
 use Jchook\AssertThrows\AssertThrows;
 use SplFileInfo;
 use Symfony\Component\HttpFoundation\File\File;
@@ -105,8 +107,9 @@ class AttachmentTest extends GNUsocialTestCase
         static::assertSame('Untitled attachment', $attachment->getBestTitle());
         $attachment->setFilename($filename);
 
-        $actor = DB::findOneBy('actor', ['nickname' => 'taken_user']);
+        $actor            = DB::findOneBy('actor', ['nickname' => 'taken_user']);
         DB::persist($note = Note::create(['actor_id' => $actor->getId(), 'content' => 'attachment: some content', 'content_type' => 'text/plain', 'is_local' => true]));
+        Conversation::assignLocalConversation($note, null);
         DB::persist(AttachmentToNote::create(['attachment_id' => $attachment->getId(), 'note_id' => $note->getId(), 'title' => 'A title']));
         DB::flush();
 
@@ -118,7 +121,7 @@ class AttachmentTest extends GNUsocialTestCase
         static::bootKernel();
         $attachment = DB::findBy('attachment', ['mimetype' => 'image/png'], limit: 1)[0];
         $id         = $attachment->getId();
-        static::assertSame("/attachment/{$id}/view", $attachment->getUrl());
+        static::assertSame("/object/note/42/attachment/{$id}/view", $attachment->getUrl(note: 42, type: Router::ABSOLUTE_PATH));
     }
 
     public function testMimetype()

components/Attachment/tests/Entity/AttachmentThumbnailTest.php

@@ -19,12 +19,13 @@ declare(strict_types = 1);
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
 // }}}
 
-namespace App\Tests\Entity;
+namespace Component\Attachment\tests\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Util\Exception\NotStoredLocallyException;
 use App\Util\GNUsocialTestCase;
+use Component\Attachment\Entity\Attachment;
 use Component\Attachment\Entity\AttachmentThumbnail;
 use Functional as F;
 use Jchook\AssertThrows\AssertThrows;
@@ -42,9 +43,9 @@ class AttachmentThumbnailTest extends GNUsocialTestCase
         $file = new SplFileInfo(INSTALLDIR . '/tests/sample-uploads/attachment-lifecycle-target.jpg');
         $hash = null;
         Event::handle('HashFile', [$file->getPathname(), &$hash]);
-        $attachment = DB::findOneBy('attachment', ['filehash' => $hash]);
+        $attachment = DB::findOneBy(Attachment::class, ['filehash' => $hash]);
 
-        $thumbs = [
+        $expected = [
             AttachmentThumbnail::getOrCreate($attachment, 'small', crop: false),
             AttachmentThumbnail::getOrCreate($attachment, 'medium', crop: false),
             $thumb = AttachmentThumbnail::getOrCreate($attachment, 'big', crop: false),
@@ -54,21 +55,29 @@ class AttachmentThumbnailTest extends GNUsocialTestCase
         $thumb->setAttachment(null);
         static::assertSame($attachment, $thumb->getAttachment());
 
-        $sort      = fn ($l, $r) => [$l->getWidth(), $l->getHeight()] <=> [$r->getWidth(), $r->getHeight()];
-        $at_thumbs = F\sort($attachment->getThumbnails(), $sort);
-        static::assertSame($thumbs, $at_thumbs);
-        array_pop($thumbs);
-        $thumb->delete(flush: true);
-        $at_thumbs = F\sort($attachment->getThumbnails(), $sort);
-        static::assertSame($thumbs, $at_thumbs);
+        $actual = $attachment->getThumbnails();
+        static::assertSame(\count($expected), \count($actual));
+        foreach ($expected as $e) {
+            $a = array_shift($actual);
+            static::assertObjectEquals($e, $a);
+        }
+
+        array_pop($expected);
+        $thumb->delete();
+        $actual = $attachment->getThumbnails();
+        static::assertSame(\count($expected), \count($actual));
+        foreach ($expected as $e) {
+            $a = array_shift($actual);
+            static::assertObjectEquals($e, $a);
+        }
 
         $attachment->deleteStorage();
 
-        foreach (array_reverse($thumbs) as $t) {
+        foreach (array_reverse($attachment->getThumbnails()) as $t) {
             // Since we still have thumbnails, those will be used as the new thumbnail, even though we don't have the original
             $new = AttachmentThumbnail::getOrCreate($attachment, 'big', crop: false);
             static::assertSame([$t->getFilename(), $t->getSize()], [$new->getFilename(), $new->getSize()]);
-            $t->delete(flush: true);
+            $t->delete();
         }
 
         // Since the backed storage was deleted and we don't have any more previous thumnbs, we can't generate another thumbnail
@@ -159,10 +168,10 @@ class AttachmentThumbnailTest extends GNUsocialTestCase
     public function testGetUrl()
     {
         parent::bootKernel();
-        $attachment = DB::findBy('attachment', ['mimetype' => 'image/png'], limit: 1)[0];
+        $attachment = DB::findBy(Attachment::class, ['mimetype' => 'image/png'], limit: 1)[0];
         $thumb      = AttachmentThumbnail::getOrCreate($attachment, 'big', crop: false);
         $id         = $attachment->getId();
-        $url        = "/attachment/{$id}/thumbnail/big";
-        static::assertSame($url, $thumb->getUrl());
+        $expected   = "/object/note/42/attachment/{$id}/thumbnail/big";
+        static::assertSame($expected, $thumb->getUrl(note: 42));
     }
 }

components/Avatar/Avatar.php

@@ -22,26 +22,27 @@ declare(strict_types = 1);
 namespace Component\Avatar;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\GSFile;
 use App\Core\Modules\Component;
-use App\Core\Router\RouteLoader;
-use App\Core\Router\Router;
+use App\Core\Router;
 use App\Util\Common;
 use Component\Attachment\Entity\Attachment;
 use Component\Attachment\Entity\AttachmentThumbnail;
 use Component\Avatar\Controller as C;
 use Component\Avatar\Exception\NoAvatarException;
+use EventResult;
 use Symfony\Component\HttpFoundation\Request;
 
 class Avatar extends Component
 {
-    public function onInitializeComponent()
+    public function onInitializeComponent(): EventResult
     {
+        return EventResult::next;
     }
 
-    public function onAddRoute(RouteLoader $r): bool
+    public function onAddRoute(Router $r): EventResult
     {
         $r->connect('avatar_actor', '/actor/{actor_id<\d+>}/avatar/{size<full|big|medium|small>?medium}', [Controller\Avatar::class, 'avatar_view']);
         $r->connect('avatar_default', '/avatar/default/{size<full|big|medium|small>?medium}', [Controller\Avatar::class, 'default_avatar_view']);
@@ -50,9 +51,11 @@ class Avatar extends Component
     }
 
     /**
+     * @param SettingsTabsType $tabs
+     *
      * @throws \App\Util\Exception\ClientException
      */
-    public function onPopulateSettingsTabs(Request $request, string $section, &$tabs): bool
+    public function onPopulateSettingsTabs(Request $request, string $section, &$tabs): EventResult
     {
         if ($section === 'profile') {
             $tabs[] = [
@@ -65,7 +68,7 @@ class Avatar extends Component
         return Event::next;
     }
 
-    public function onAvatarUpdate(int $actor_id): bool
+    public function onAvatarUpdate(int $actor_id): EventResult
     {
         Cache::delete("avatar-{$actor_id}");
         foreach (['full', 'big', 'medium', 'small'] as $size) {
@@ -128,6 +131,8 @@ class Avatar extends Component
      *
      * Returns the avatar file's hash, mimetype, title and path.
      * Ensures exactly one cached value exists
+     *
+     * @return array{id: null|int, filename: null|string, title: string, mimetype: string, filepath?: string}
      */
     public static function getAvatarFileInfo(int $actor_id, string $size = 'medium'): array
     {

components/Avatar/Controller/Avatar.php

@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Avatar\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Form;
 use App\Core\GSFile;

components/Avatar/Entity/Avatar.php

@@ -24,10 +24,10 @@ declare(strict_types = 1);
 namespace Component\Avatar\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
-use App\Core\Router\Router;
+use App\Core\Router;
 use App\Util\Common;
 use Component\Attachment\Entity\Attachment;
 use Component\Attachment\Entity\AttachmentThumbnail;

components/Circle/Circle.php

@@ -0,0 +1,258 @@
+<?php
+
+declare(strict_types = 1);
+
+// {{{ License
+
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social 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.
+//
+// GNU social 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 GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+// }}}
+
+namespace Component\Circle;
+
+use App\Core\Cache;
+use App\Core\DB;
+use App\Core\Event;
+use function App\Core\I18n\_m;
+use App\Core\Modules\Component;
+use App\Core\Router;
+use App\Entity\Actor;
+use App\Entity\Feed;
+use App\Entity\LocalUser;
+use App\Util\Nickname;
+use Component\Circle\Controller as CircleController;
+use Component\Circle\Entity\ActorCircle;
+use Component\Circle\Entity\ActorCircleSubscription;
+use Component\Circle\Entity\ActorTag;
+use Component\Collection\Util\MetaCollectionTrait;
+use Component\Tag\Tag;
+use EventResult;
+use Functional as F;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Component responsible for handling and representing ActorCircles and ActorTags
+ *
+ * @author    Hugo Sales <hugo@hsal.es>
+ * @author    Phablulo <phablulo@gmail.com>
+ * @author    Diogo Peralta Cordeiro <@diogo.site>
+ * @copyright 2021 Free Software Foundation, Inc http://www.fsf.org
+ * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ */
+class Circle extends Component
+{
+    /** @phpstan-use MetaCollectionTrait<ActorCircle> */
+    use MetaCollectionTrait;
+    public const TAG_CIRCLE_REGEX = '/' . Nickname::BEFORE_MENTIONS . '@#([\pL\pN_\-\.]{1,64})/';
+    protected const SLUG          = 'circle';
+    protected const PLURAL_SLUG   = 'circles';
+
+    public function onAddRoute(Router $r): EventResult
+    {
+        $r->connect('actor_circle_view_by_circle_id', '/circle/{circle_id<\d+>}', [CircleController\Circle::class, 'circleById']);
+        // View circle members by (tagger id or nickname) and tag
+        $r->connect('actor_circle_view_by_circle_tagger_tag', '/circle/actor/{tagger_id<\d+>/{tag<' . Tag::TAG_SLUG_REGEX . '>}}', [CircleController\Circle::class, 'circleByTaggerIdAndTag']);
+        $r->connect('actor_circle_view_by_circle_tagger_tag', '/circle/@{nickname<' . Nickname::DISPLAY_FMT . '>}/{tag<' . Tag::TAG_SLUG_REGEX . '>}', [CircleController\Circle::class, 'circleByTaggerNicknameAndTag']);
+
+        // View all circles by actor id or nickname
+        $r->connect(
+            id: 'actor_circles_view_by_actor_id',
+            uri_path: '/actor/{tag<' . Tag::TAG_SLUG_REGEX . '>}/circles',
+            target: [CircleController\Circles::class, 'collectionsViewByActorId'],
+        );
+        $r->connect(
+            id: 'actor_circles_view_by_nickname',
+            uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}/circles',
+            target: [CircleController\Circles::class, 'collectionsViewByActorNickname'],
+        );
+
+        $r->connect('actor_circle_view_feed_by_circle_id', '/circle/{circle_id<\d+>}/feed', [CircleController\Circles::class, 'feedByCircleId']);
+        // View circle feed by (tagger id or nickname) and tag
+        $r->connect('actor_circle_view_feed_by_circle_tagger_tag', '/circle/actor/{tagger_id<\d+>/{tag<' . Tag::TAG_SLUG_REGEX . '>}}/feed', [CircleController\Circles::class, 'feedByTaggerIdAndTag']);
+        $r->connect('actor_circle_view_feed_by_circle_tagger_tag', '/circle/@{nickname<' . Nickname::DISPLAY_FMT . '>}/{tag<' . Tag::TAG_SLUG_REGEX . '>}/feed', [CircleController\Circles::class, 'feedByTaggerNicknameAndTag']);
+
+        return Event::next;
+    }
+
+    public static function cacheKeys(string $tag_single_or_multi): array
+    {
+        return [
+            'actor_single' => "actor-tag-feed-{$tag_single_or_multi}",
+            'actor_multi'  => "actor-tags-feed-{$tag_single_or_multi}",
+        ];
+    }
+
+    public function onPopulateSettingsTabs(Request $request, string $section, array &$tabs): EventResult
+    {
+        if ($section === 'profile' && \in_array($request->get('_route'), ['person_actor_settings', 'group_actor_settings'])) {
+            $tabs[] = [
+                'title'      => _m('Self tags'),
+                'desc'       => _m('Add or remove tags to this actor'),
+                'id'         => 'settings-self-tags',
+                'controller' => CircleController\SelfTagsSettings::settingsSelfTags($request, Actor::getById((int) $request->get('id')), 'settings-self-tags-details'),
+            ];
+        }
+        return Event::next;
+    }
+
+    /**
+     * @param Actor[] $targets
+     */
+    public function onPostingFillTargetChoices(Request $request, Actor $actor, array &$targets): EventResult
+    {
+        $circles = $actor->getCircles();
+        foreach ($circles as $circle) {
+            $tag                = $circle->getTag();
+            $targets["#{$tag}"] = $tag;
+        }
+        return Event::next;
+    }
+
+    // Meta Collection -------------------------------------------------------------------
+
+    /**
+     * @param array<string, mixed> $vars
+     */
+    private function getActorIdFromVars(array $vars): int
+    {
+        $id = $vars['request']->get('id', null);
+        if ($id) {
+            return (int) $id;
+        }
+        $nick = $vars['request']->get('nickname');
+        $user = LocalUser::getByNickname($nick);
+        return $user->getId();
+    }
+
+    public static function createCircle(Actor|int $tagger_id, string $tag): int|null
+    {
+        $tagger_id = \is_int($tagger_id) ? $tagger_id : $tagger_id->getId();
+        $circle    = ActorCircle::create([
+            'tagger'      => $tagger_id,
+            'tag'         => $tag,
+            'description' => null, // TODO
+            'private'     => false, // TODO
+        ]);
+        DB::persist($circle);
+
+        Cache::delete(Actor::cacheKeys($tagger_id)['circles']);
+
+        return $circle->getId();
+    }
+
+    /**
+     * @param array<string, mixed> $vars
+     */
+    protected function createCollection(Actor $owner, array $vars, string $name): void
+    {
+        $this->createCircle($owner, $name);
+        DB::persist(ActorTag::create([
+            'tagger' => $owner->getId(),
+            'tagged' => self::getActorIdFromVars($vars),
+            'tag'    => $name,
+        ]));
+    }
+
+    /**
+     * @param array<string, mixed> $vars
+     * @param array<int>           $items
+     * @param array<mixed>         $collections
+     */
+    protected function removeItem(Actor $owner, array $vars, array $items, array $collections): bool
+    {
+        $tagger_id                     = $owner->getId();
+        $tagged_id                     = $this->getActorIdFromVars($vars);
+        $circles_to_remove_tagged_from = DB::findBy(ActorCircle::class, ['id' => $items]);
+        foreach ($circles_to_remove_tagged_from as $circle) {
+            DB::removeBy(ActorCircleSubscription::class, ['actor_id' => $tagged_id, 'circle_id' => $circle->getId()]);
+        }
+        $tags = F\map($circles_to_remove_tagged_from, fn ($x) => $x->getTag());
+        foreach ($tags as $tag) {
+            DB::removeBy(ActorTag::class, ['tagger' => $tagger_id, 'tagged' => $tagged_id, 'tag' => $tag]);
+        }
+        Cache::delete(Actor::cacheKeys($tagger_id)['circles']);
+        return true;
+    }
+
+    /**
+     * @param array<string, mixed> $vars
+     * @param array<int>           $items
+     * @param array<mixed>         $collections
+     */
+    protected function addItem(Actor $owner, array $vars, array $items, array $collections): void
+    {
+        $tagger_id                = $owner->getId();
+        $tagged_id                = $this->getActorIdFromVars($vars);
+        $circles_to_add_tagged_to = DB::findBy(ActorCircle::class, ['id' => $items]);
+        foreach ($circles_to_add_tagged_to as $circle) {
+            DB::persist(ActorCircleSubscription::create(['actor_id' => $tagged_id, 'circle_id' => $circle->getId()]));
+        }
+        $tags = F\map($circles_to_add_tagged_to, fn ($x) => $x->getTag());
+        foreach ($tags as $tag) {
+            DB::persist(ActorTag::create(['tagger' => $tagger_id, 'tagged' => $tagged_id, 'tag' => $tag]));
+        }
+        Cache::delete(Actor::cacheKeys($tagger_id)['circles']);
+    }
+
+    /**
+     * @see MetaCollectionPlugin->shouldAddToRightPanel
+     *
+     * @param array<string, mixed> $vars
+     */
+    protected function shouldAddToRightPanel(Actor $user, array $vars, Request $request): bool
+    {
+        return \in_array($vars['path'], ['actor_view_nickname', 'actor_view_id']);
+    }
+
+    /**
+     * Retrieves an array of Collections owned by an Actor.
+     * In this case, Collections of those within Actor's own circle of Actors, aka ActorCircle.
+     *
+     * Differs from the overwritten method in MetaCollectionsTrait, since retrieved Collections come from the $owner
+     * itself, and from every Actor that is a part of its ActorCircle.
+     *
+     * @param Actor                     $owner    the Actor, and by extension its own circle of Actors
+     * @param null|array<string, mixed> $vars     Page vars sent by AppendRightPanelBlock event
+     * @param bool                      $ids_only true if only the Collections ids are to be returned
+     *
+     * @return ($ids_only is true ? int[] : ActorCircle[])
+     */
+    protected function getCollectionsBy(Actor $owner, ?array $vars = null, bool $ids_only = false): array
+    {
+        $tagged_id = !\is_null($vars) ? $this->getActorIdFromVars($vars) : null;
+        $circles   = \is_null($tagged_id) ? $owner->getCircles() : F\select($owner->getCircles(), function ($x) use ($tagged_id) {
+            foreach ($x->getActorTags() as $at) {
+                if ($at->getTagged() === $tagged_id) {
+                    return true;
+                }
+            }
+            return false;
+        });
+        return $ids_only ? array_map(fn ($x) => $x->getId(), $circles) : $circles;
+    }
+
+    public function onCreateDefaultFeeds(int $actor_id, LocalUser $user, int &$ordering): EventResult
+    {
+        DB::persist(Feed::create([
+            'actor_id' => $actor_id,
+            'url'      => Router::url($route = 'actor_circles_view_by_nickname', ['nickname' => $user->getNickname()]),
+            'route'    => $route,
+            'title'    => _m('Circles'),
+            'ordering' => $ordering++,
+        ]));
+        return Event::next;
+    }
+}

components/Circle/Controller/Circle.php

@@ -0,0 +1,77 @@
+<?php
+
+declare(strict_types = 1);
+
+// {{{ License
+
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social 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.
+//
+// GNU social 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 GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+// }}}
+
+namespace Component\Circle\Controller;
+
+use function App\Core\I18n\_m;
+use App\Entity\LocalUser;
+use App\Util\Exception\ClientException;
+use Component\Circle\Entity\ActorCircle;
+use Component\Collection\Util\Controller\CircleController;
+
+class Circle extends CircleController
+{
+    /**
+     * Render an existing ActorCircle with the given id as a Collection of Actors
+     *
+     * @param ActorCircle|int $circle_id the desired ActorCircle id
+     *
+     * @throws \App\Util\Exception\ServerException
+     * @throws ClientException
+     *
+     * @return ControllerResultType
+     */
+    public function circleById(int|ActorCircle $circle_id): array
+    {
+        $circle = \is_int($circle_id) ? ActorCircle::getByPK(['id' => $circle_id]) : $circle_id;
+        unset($circle_id);
+        if (\is_null($circle)) {
+            throw new ClientException(_m('No such circle.'), 404);
+        } else {
+            return [
+                '_template'        => 'collection/actors.html.twig',
+                'title'            => _m('Circle'),
+                'empty_message'    => _m('No members.'),
+                'sort_form_fields' => [],
+                'page'             => $this->int('page') ?? 1,
+                'actors'           => $circle->getTaggedActors(),
+            ];
+        }
+    }
+
+    /**
+     * @return ControllerResultType
+     */
+    public function circleByTaggerIdAndTag(int $tagger_id, string $tag): array
+    {
+        return $this->circleById(ActorCircle::getByPK(['tagger' => $tagger_id, 'tag' => $tag]));
+    }
+
+    /**
+     * @return ControllerResultType
+     */
+    public function circleByTaggerNicknameAndTag(string $tagger_nickname, string $tag): array
+    {
+        return $this->circleById(ActorCircle::getByPK(['tagger' => LocalUser::getByNickname($tagger_nickname)->getId(), 'tag' => $tag]));
+    }
+}

components/Circle/Controller/Circles.php

@@ -0,0 +1,120 @@
+<?php
+
+declare(strict_types = 1);
+
+// {{{ License
+
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social 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.
+//
+// GNU social 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 GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+// }}}
+
+namespace Component\Circle\Controller;
+
+use App\Core\Cache;
+use App\Core\DB;
+use App\Core\Router;
+use App\Entity\Actor;
+use App\Entity\LocalUser;
+use Component\Circle\Entity\ActorCircle;
+use Component\Collection\Util\Controller\MetaCollectionController;
+
+/**
+ * @extends MetaCollectionController<Circles>
+ */
+class Circles extends MetaCollectionController
+{
+    protected const SLUG         = 'circle';
+    protected const PLURAL_SLUG  = 'circles';
+    protected string $page_title = 'Actor circles';
+
+    public function createCollection(int $owner_id, string $name): bool
+    {
+        return !\is_null(\Component\Circle\Circle::createCircle($owner_id, $name));
+    }
+
+    public function getCollectionUrl(int $owner_id, ?string $owner_nickname, int $collection_id): string
+    {
+        return Router::url(
+            'actor_circle_view_by_circle_id',
+            ['circle_id' => $collection_id],
+        );
+    }
+
+    /**
+     * @return Circles[]
+     */
+    public function getCollectionItems(int $owner_id, int $collection_id): array
+    {
+        return []; // TODO
+    }
+
+    /**
+     * @return Circles[]
+     */
+    public function feedByCircleId(int $circle_id)
+    {
+        // Owner id isn't used
+        return $this->getCollectionItems(0, $circle_id);
+    }
+
+    /**
+     * @return Circles[]
+     */
+    public function feedByTaggerIdAndTag(int $tagger_id, string $tag)
+    {
+        // Owner id isn't used
+        $circle_id = ActorCircle::getByPK(['tagger' => $tagger_id, 'tag' => $tag])->getId();
+        return $this->getCollectionItems($tagger_id, $circle_id);
+    }
+
+    /**
+     * @return Circles[]
+     */
+    public function feedByTaggerNicknameAndTag(string $tagger_nickname, string $tag)
+    {
+        $tagger_id = LocalUser::getByNickname($tagger_nickname)->getId();
+        $circle_id = ActorCircle::getByPK(['tagger' => $tagger_id, 'tag' => $tag])->getId();
+        return $this->getCollectionItems($tagger_id, $circle_id);
+    }
+
+    public function getCollectionsByActorId(int $owner_id): array
+    {
+        return DB::findBy(ActorCircle::class, ['tagger' => $owner_id], order_by: ['id' => 'desc']);
+    }
+
+    public function getCollectionBy(int $owner_id, int $collection_id): self
+    {
+        return DB::findOneBy(ActorCircle::class, ['id' => $collection_id, 'actor_id' => $owner_id]);
+    }
+
+    public function setCollectionName(int $actor_id, string $actor_nickname, ActorCircle $collection, string $name): void
+    {
+        foreach ($collection->getActorTags(db_reference: true) as $at) {
+            $at->setTag($name);
+        }
+        $collection->setTag($name);
+        Cache::delete(Actor::cacheKeys($actor_id)['circles']);
+    }
+
+    public function removeCollection(int $actor_id, string $actor_nickname, ActorCircle $collection): void
+    {
+        foreach ($collection->getActorTags(db_reference: true) as $at) {
+            DB::remove($at);
+        }
+        DB::remove($collection);
+        Cache::delete(Actor::cacheKeys($actor_id)['circles']);
+    }
+}

components/Circle/Controller/SelfTagsSettings.php

@@ -0,0 +1,118 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Component\Circle\Controller;
+
+use App\Core\Cache;
+use App\Core\Controller;
+use App\Core\DB;
+use function App\Core\I18n\_m;
+use App\Entity as E;
+use App\Util\Common;
+use App\Util\Exception\ClientException;
+use App\Util\Exception\RedirectException;
+use Component\Circle\Entity\ActorCircle;
+use Component\Circle\Entity\ActorTag;
+use Component\Circle\Form\SelfTagsForm;
+use Component\Tag\Tag as CompTag;
+use Symfony\Component\Form\SubmitButton;
+use Symfony\Component\HttpFoundation\Request;
+
+class SelfTagsSettings extends Controller
+{
+    /**
+     * Generic settings page for an Actor's self tags
+     * TODO: We should have $actor->setSelfTags(), $actor->addSelfTags(), $actor->removeSelfTags()
+     */
+    public static function settingsSelfTags(Request $request, E\Actor $target, string $details_id)
+    {
+        $actor = Common::actor();
+        if (!$actor->canModerate($target)) {
+            throw new ClientException(_m('You don\'t have enough permissions to edit {nickname}\'s settings', ['{nickname}' => $target->getNickname()]));
+        }
+
+        $actor_self_tags            = $target->getSelfTags();
+        [$add_form, $existing_form] = SelfTagsForm::handleTags(
+            $request,
+            $actor_self_tags,
+            handle_new: /**
+             * Handle adding tags
+             */
+            function ($form) use ($request, $target, $details_id) {
+                $data = $form->getData();
+                $tags = $data['new-tags'];
+                foreach ($tags as $tag) {
+                    $tag = CompTag::sanitize($tag);
+
+                    [$actor_tag, $actor_tag_existed] = ActorTag::checkExistingAndCreateOrUpdate([
+                        'tagger' => $target->getId(), // self tag means tagger = tagger in ActorTag
+                        'tagged' => $target->getId(),
+                        'tag'    => $tag,
+                    ]);
+                    if (!$actor_tag_existed) {
+                        DB::persist($actor_tag);
+                        // Try to find the self-tag circle
+                        $actor_circle = DB::findOneBy(
+                            ActorCircle::class,
+                            [
+                                'tagger' => null, // Self-tag circle
+                                'tag'    => $tag,
+                            ],
+                            return_null: true,
+                        );
+                        // It is the first time someone uses this self-tag!
+                        if (\is_null($actor_circle)) {
+                            DB::persist(ActorCircle::create([
+                                'tagger'      => null, // Self-tag circle
+                                'tag'         => $tag,
+                                'private'     => false, // by definition
+                                'description' => null, // The controller can show this in every language as appropriate
+                            ]));
+                        }
+                    }
+                }
+                DB::flush();
+                Cache::delete(E\Actor::cacheKeys($target->getId())['self-tags']);
+                throw new RedirectException($request->get('_route'), ['nickname' => $target->getNickname(), 'open' => $details_id, '_fragment' => $details_id]);
+            },
+            handle_existing: /**
+             * Handle changes to the existing tags
+             */
+            function ($form, array $form_definition) use ($request, $target, $details_id) {
+                $changed = false;
+                foreach (array_chunk($form_definition, 2) as $entry) {
+                    $tag = CompTag::sanitize($entry[0][2]['data']);
+
+                    /** @var SubmitButton $remove */
+                    $remove = $form->get($entry[1][0]);
+                    if ($remove->isClicked()) {
+                        $changed = true;
+                        DB::removeBy(
+                            'actor_tag',
+                            [
+                                'tagger' => $target->getId(),
+                                'tagged' => $target->getId(),
+                                'tag'    => $tag,
+                            ],
+                        );
+                        // We intentionally leave the self-tag actor circle, even if it is now empty
+                    }
+                }
+                if ($changed) {
+                    DB::flush();
+                    Cache::delete(E\Actor::cacheKeys($target->getId())['self-tags']);
+                    throw new RedirectException($request->get('_route'), ['nickname' => $target->getNickname(), 'open' => $details_id, '_fragment' => $details_id]);
+                }
+            },
+            remove_label: _m('Remove self tag'),
+            add_label: _m('Add self tag'),
+        );
+
+        return [
+            '_template'               => 'self_tags_settings.fragment.html.twig',
+            'add_self_tags_form'      => $add_form->createView(),
+            'existing_self_tags_form' => $existing_form?->createView(),
+        ];
+    }
+}

components/Circle/Entity/ActorCircle.php

@@ -19,12 +19,13 @@ declare(strict_types = 1);
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
 // }}}
 
-namespace App\Entity;
+namespace Component\Circle\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
-use App\Core\Router\Router;
+use App\Core\Router;
+use App\Entity\Actor;
 use DateTimeInterface;
 
 /**
@@ -50,13 +51,11 @@ class ActorCircle extends Entity
     // @codeCoverageIgnoreStart
     private int $id;
     private ?int $tagger = null;
-    private int $tagged;
     private string $tag;
-    private bool $use_canonical;
     private ?string $description = null;
-    private ?bool $private = false;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private ?bool $private       = false;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setId(int $id): self
     {
@@ -80,20 +79,9 @@ class ActorCircle extends Entity
         return $this->tagger;
     }
 
-    public function setTagged(int $tagged): self
-    {
-        $this->tagged = $tagged;
-        return $this;
-    }
-
-    public function getTagged(): int
-    {
-        return $this->tagged;
-    }
-
     public function setTag(string $tag): self
     {
-        $this->tag = \mb_substr($tag, 0, 64);
+        $this->tag = mb_substr($tag, 0, 64);
         return $this;
     }
 
@@ -102,17 +90,6 @@ class ActorCircle extends Entity
         return $this->tag;
     }
 
-    public function setUseCanonical(bool $use_canonical): self
-    {
-        $this->use_canonical = $use_canonical;
-        return $this;
-    }
-
-    public function getUseCanonical(): bool
-    {
-        return $this->use_canonical;
-    }
-
     public function setDescription(?string $description): self
     {
         $this->description = $description;
@@ -135,24 +112,24 @@ class ActorCircle extends Entity
         return $this->private;
     }
 
-    public function setCreated(\DateTimeInterface $created): self
+    public function setCreated(DateTimeInterface $created): self
     {
         $this->created = $created;
         return $this;
     }
 
-    public function getCreated(): \DateTimeInterface
+    public function getCreated(): DateTimeInterface
     {
         return $this->created;
     }
 
-    public function setModified(\DateTimeInterface $modified): self
+    public function setModified(DateTimeInterface $modified): self
     {
         $this->modified = $modified;
         return $this;
     }
 
-    public function getModified(): \DateTimeInterface
+    public function getModified(): DateTimeInterface
     {
         return $this->modified;
     }
@@ -160,64 +137,95 @@ class ActorCircle extends Entity
     // @codeCoverageIgnoreEnd
     // }}} Autocode
 
-    public function getActorTag()
+    /**
+     * For use with MetaCollection trait only
+     */
+    public function getName(): string
     {
+        return $this->tag;
+    }
+
+    /**
+     * @return ActorTag[]
+     */
+    public function getActorTags(bool $db_reference = false): array
+    {
+        $handle = fn () => DB::findBy('actor_tag', ['tagger' => $this->getTagger(), 'tag' => $this->getTag()]);
+        if ($db_reference) {
+            return $handle();
+        }
         return Cache::get(
-            "actor-tag-{$this->getTag()}",
-            fn () => DB::findBy('actor_tag', ['tagger' => $this->getTagger(), 'canonical' => $this->getTag()], limit: 1)[0], // TODO jank
+            "circle-{$this->getId()}-tagged",
+            $handle,
         );
     }
 
+    /**
+     * @return Actor[]
+     */
+    public function getTaggedActors(): array
+    {
+        return Cache::get(
+            "circle-{$this->getId()}-tagged-actors",
+            function () {
+                if ($this->getTagger()) {
+                    return DB::dql('SELECT a FROM actor AS a JOIN actor_tag AS at WITH at.tagged = a.id WHERE at.tag = :tag AND at.tagger = :tagger', ['tag' => $this->getTag(), 'tagger' => $this->getTagger()]);
+                } else { // Self-tag
+                    return DB::dql('SELECT a FROM actor AS a JOIN actor_tag AS at WITH at.tagged = a.id WHERE at.tag = :tag AND at.tagger = at.tagged', ['tag' => $this->getTag()]);
+                }
+            },
+        );
+    }
+
+    /**
+     * @return Actor[]
+     */
     public function getSubscribedActors(?int $offset = null, ?int $limit = null): array
     {
         return Cache::get(
-            "circle-{$this->getId()}",
+            "circle-{$this->getId()}-subscribers",
             fn () => DB::dql(
                 <<< 'EOQ'
                     SELECT a
-                    FROM App\Entity\Actor a
-                    JOIN App\Entity\ActorCircleSubscription s
+                    FROM actor a
+                    JOIN actor_circle_subscription s
                         WITH a.id = s.actor_id
                     ORDER BY s.created DESC, a.id DESC
                     EOQ,
-                options: ['offset' => $offset,
-                    'limit'        => $limit, ],
+                options: [
+                    'offset' => $offset,
+                    'limit'  => $limit,
+                ],
             ),
         );
     }
 
-    public function getUrl(int $type = Router::ABSOLUTE_PATH): string {
-        return Router::url('actor_circle', ['actor_id' => $this->getTagger(), 'tag' => $this->getTag()]);
+    public function getUrl(int $type = Router::ABSOLUTE_PATH): string
+    {
+        return Router::url('actor_circle_view_by_circle_id', ['circle_id' => $this->getId()], type: $type);
     }
 
     public static function schemaDef(): array
     {
         return [
             'name'        => 'actor_circle',
-            'description' => 'a actor can have lists of actors, to separate their feed',
+            'description' => 'An actor can have lists of actors, to separate their feed or quickly mention his friend',
             'fields'      => [
-                'id'            => ['type' => 'serial',    'not null' => true, 'description' => 'unique identifier'], // An actor can be tagged by many actors
-                'tagger'        => ['type' => 'int',       'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'many to one', 'name' => 'actor_list_tagger_fkey', 'description' => 'user making the tag'],
-                'tagged'        => ['type' => 'int',       'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'actor_tag_tagged_fkey', 'not null' => true, 'description' => 'actor tagged'],
-                'tag'           => ['type' => 'varchar',   'length' => 64, 'foreign key' => true, 'target' => 'ActorTag.tag', 'multiplicity' => 'many to one', 'not null' => true, 'description' => 'actor tag'], // Join with ActorTag // // so, Doctrine doesn't like that the target is not unique, even though the pair is  // Many Actor Circles can reference (and probably will) an Actor Tag
-                'use_canonical' => ['type' => 'bool',      'not null' => true, 'description' => 'whether the user wanted to block canonical tags'],
-                'description'   => ['type' => 'text',      'description' => 'description of the people tag'],
-                'private'       => ['type' => 'bool',      'default' => false, 'description' => 'is this tag private'],
-                'created'       => ['type' => 'datetime',  'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
-                'modified'      => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
+                'id'          => ['type' => 'serial',    'not null' => true, 'description' => 'unique identifier'], // An actor can be tagged by many actors
+                'tagger'      => ['type' => 'int',       'default' => null, 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'many to one', 'name' => 'actor_list_tagger_fkey', 'description' => 'user making the tag, null if self-tag. If null, is the special global self-tag circle'],
+                'tag'         => ['type' => 'varchar',   'length' => 64, 'foreign key' => true, 'target' => 'ActorTag.tag', 'multiplicity' => 'many to one', 'not null' => true, 'description' => 'actor tag'], // Join with ActorTag // // so, Doctrine doesn't like that the target is not unique, even though the pair is  // Many Actor Circles can reference (and probably will) an Actor Tag
+                'description' => ['type' => 'text',      'description' => 'description of the people tag'],
+                'private'     => ['type' => 'bool',      'default' => false, 'description' => 'is this tag private'],
+                'created'     => ['type' => 'datetime',  'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
+                'modified'    => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
             ],
-            'primary key' => ['id'],
+            'primary key' => ['id'], // But we will mostly refer to them with `tagger` and `tag`
             'indexes'     => [
                 'actor_list_modified_idx'   => ['modified'],
+                'actor_list_tagger_tag_idx' => ['tagger', 'tag'], // The actual identifier we will use the most
                 'actor_list_tag_idx'        => ['tag'],
-                'actor_list_tagger_tag_idx' => ['tagger', 'tag'],
                 'actor_list_tagger_idx'     => ['tagger'],
             ],
         ];
     }
-
-    public function __toString()
-    {
-        return $this->getTag();
-    }
 }

components/Circle/Entity/ActorCircleSubscription.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 // {{{ License
 // This file is part of GNU social - https://www.gnu.org/software/social
 //
@@ -17,7 +19,7 @@
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
 // }}}
 
-namespace App\Entity;
+namespace Component\Circle\Entity;
 
 use App\Core\Entity;
 use DateTimeInterface;
@@ -45,8 +47,8 @@ class ActorCircleSubscription extends Entity
     // @codeCoverageIgnoreStart
     private int $actor_id;
     private int $circle_id;
-    private \DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
 
     public function setActorId(int $actor_id): self
     {
@@ -70,24 +72,24 @@ class ActorCircleSubscription extends Entity
         return $this->circle_id;
     }
 
-    public function setCreated(\DateTimeInterface $created): self
+    public function setCreated(DateTimeInterface $created): self
     {
         $this->created = $created;
         return $this;
     }
 
-    public function getCreated(): \DateTimeInterface
+    public function getCreated(): DateTimeInterface
     {
         return $this->created;
     }
 
-    public function setModified(\DateTimeInterface $modified): self
+    public function setModified(DateTimeInterface $modified): self
     {
         $this->modified = $modified;
         return $this;
     }
 
-    public function getModified(): \DateTimeInterface
+    public function getModified(): DateTimeInterface
     {
         return $this->modified;
     }
@@ -98,18 +100,18 @@ class ActorCircleSubscription extends Entity
     public static function schemaDef(): array
     {
         return [
-            'name' => 'actor_circle_subscription',
+            'name'   => 'actor_circle_subscription',
             'fields' => [
-                'actor_id'  => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'actor_circle_subscription_actor_id_fkey', 'not null' => true, 'description' => 'foreign key to actor table'],
+                'actor_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'actor_circle_subscription_actor_id_fkey', 'not null' => true, 'description' => 'foreign key to actor table'],
                 // An actor subscribes many circles; A Circle is subscribed by many actors.
                 'circle_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'ActorCircle.id', 'multiplicity' => 'one to many', 'name' => 'actor_circle_subscription_actor_circle_fkey', 'not null' => true, 'description' => 'foreign key to actor_circle'],
                 'created'   => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
                 'modified'  => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
             ],
             'primary key' => ['circle_id', 'actor_id'],
-            'indexes' => [
+            'indexes'     => [
                 'actor_circle_subscription_actor_id_idx' => ['actor_id'],
-                'actor_circle_subscription_created_idx' => ['created'],
+                'actor_circle_subscription_created_idx'  => ['created'],
             ],
         ];
     }

components/Circle/Entity/ActorTag.php

@@ -19,12 +19,12 @@ declare(strict_types = 1);
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
 // }}}
 
-namespace App\Entity;
+namespace Component\Circle\Entity;
 
-use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
-use App\Core\Router\Router;
+use App\Core\Router;
+use App\Entity\Actor;
 use Component\Tag\Tag;
 use DateTimeInterface;
 
@@ -54,9 +54,7 @@ class ActorTag extends Entity
     private int $tagger;
     private int $tagged;
     private string $tag;
-    private string $canonical;
-    private bool $use_canonical;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
     public function setTagger(int $tagger): self
     {
@@ -82,7 +80,7 @@ class ActorTag extends Entity
 
     public function setTag(string $tag): self
     {
-        $this->tag = \mb_substr($tag, 0, 64);
+        $this->tag = mb_substr($tag, 0, 64);
         return $this;
     }
 
@@ -91,35 +89,13 @@ class ActorTag extends Entity
         return $this->tag;
     }
 
-    public function setCanonical(string $canonical): self
-    {
-        $this->canonical = \mb_substr($canonical, 0, 64);
-        return $this;
-    }
-
-    public function getCanonical(): string
-    {
-        return $this->canonical;
-    }
-
-    public function setUseCanonical(bool $use_canonical): self
-    {
-        $this->use_canonical = $use_canonical;
-        return $this;
-    }
-
-    public function getUseCanonical(): bool
-    {
-        return $this->use_canonical;
-    }
-
-    public function setModified(\DateTimeInterface $modified): self
+    public function setModified(DateTimeInterface $modified): self
     {
         $this->modified = $modified;
         return $this;
     }
 
-    public function getModified(): \DateTimeInterface
+    public function getModified(): DateTimeInterface
     {
         return $this->modified;
     }
@@ -127,18 +103,22 @@ class ActorTag extends Entity
     // @codeCoverageIgnoreEnd
     // }}} Autocode
 
-    public static function getByActorId(int $actor_id): array
+    public function getUrl(?Actor $actor = null, int $type = Router::ABSOLUTE_PATH): string
     {
-        return Cache::getList(Actor::cacheKeys($actor_id)['tags'], fn () => DB::dql('select at from actor_tag at join actor a with a.id = at.tagger where a.id = :id', ['id' => $actor_id]));
+        $params = ['tag' => $this->getTag()];
+        if (!\is_null($actor)) {
+            $params['locale'] = $actor->getTopLanguage()->getLocale();
+        }
+        return Router::url('single_actor_tag', $params, type: $type);
     }
 
-    public function getUrl(?Actor $actor = null): string
+    public function getCircle(): ActorCircle
     {
-        $params = ['canon' => $this->getCanonical(), 'tag' => $this->getTag()];
-        if (!\is_null($actor)) {
-            $params['lang'] = $actor->getTopLanguage()->getLocale();
+        if ($this->getTagger() === $this->getTagged()) { // Self-tag
+            return DB::findOneBy(ActorCircle::class, ['tagger' => null, 'tag' => $this->getTag()]);
+        } else {
+            return DB::findOneBy(ActorCircle::class, ['tagger' => $this->getTagger(), 'tag' => $this->getTag()]);
         }
-        return Router::url('single_actor_tag', $params);
     }
 
     public static function schemaDef(): array
@@ -146,24 +126,16 @@ class ActorTag extends Entity
         return [
             'name'   => 'actor_tag',
             'fields' => [
-                'tagger'        => ['type' => 'int',       'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'actor_tag_tagger_fkey', 'not null' => true, 'description' => 'actor making the tag'],
-                'tagged'        => ['type' => 'int',       'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'actor_tag_tagged_fkey', 'not null' => true, 'description' => 'actor tagged'],
-                'tag'           => ['type' => 'varchar',   'length' => Tag::MAX_TAG_LENGTH, 'not null' => true, 'description' => 'hash tag associated with this actor'],
-                'canonical'     => ['type' => 'varchar',   'length' => Tag::MAX_TAG_LENGTH, 'not null' => true, 'description' => 'ascii slug of tag'],
-                'use_canonical' => ['type' => 'bool',      'not null' => true, 'description' => 'whether the user wanted to block canonical tags'],
-                'modified'      => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
-            ],
-            'primary key' => ['tagger', 'tagged', 'tag', 'use_canonical'],
+                'tagger'   => ['type' => 'int',       'not null' => true, 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'actor_tag_tagger_fkey', 'description' => 'actor making the tag'],
+                'tagged'   => ['type' => 'int',       'not null' => true, 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'actor_tag_tagged_fkey', 'description' => 'actor tagged'],
+                'tag'      => ['type' => 'varchar',  'length' => Tag::MAX_TAG_LENGTH, 'not null' => true, 'description' => 'hashtag associated with this note'],
+                'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
+            ], // We will always assume the tagger's preferred language for tags and circles
+            'primary key' => ['tagger', 'tagged', 'tag'],
             'indexes'     => [
-                'actor_tag_modified_idx'   => ['modified'],
                 'actor_tag_tagger_tag_idx' => ['tagger', 'tag'], // For Circles
                 'actor_tag_tagged_idx'     => ['tagged'],
             ],
         ];
     }
-
-    public function __toString(): string
-    {
-        return $this->getTag();
-    }
 }

components/Circle/Form/SelfTagsForm.php

@@ -2,45 +2,43 @@
 
 declare(strict_types = 1);
 
-namespace Component\Tag\Form;
+namespace Component\Circle\Form;
 
 use App\Core\Form;
 use function App\Core\I18n\_m;
-use App\Entity as E;
 use App\Util\Form\ArrayTransformer;
-use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Component\Circle\Entity\ActorTag;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 
 abstract class SelfTagsForm
 {
     /**
-     * @param E\ActorTag[]|E\ActorTagBlock[]|E\NoteTagBlock[] $tags
+     * @param ActorTag[] $actor_self_tags
      *
-     * @return array [Form (add), ?Form (existing)]
+     * @return array{FormInterface, ?FormInterface} [Form (add), ?Form (existing)]
      */
     public static function handleTags(
         Request $request,
-        array $tags,
+        array $actor_self_tags,
         callable $handle_new,
         callable $handle_existing,
         string $remove_label,
         string $add_label,
     ): array {
         $form_definition = [];
-        foreach ($tags as $tag) {
-            $canon             = $tag->getCanonical();
-            $form_definition[] = ["{$canon}:old-tag", TextType::class, ['data' => '#' . $tag->getTag(), 'label' => ' ', 'disabled' => true]];
-            $form_definition[] = ["{$canon}:toggle-canon", SubmitType::class, ['attr' => ['data' => $tag->getUseCanonical()], 'label' => $tag->getUseCanonical() ? _m('Set non-canonical') : _m('Set canonical')]];
-            $form_definition[] = [$existing_form_name = "{$canon}:remove", SubmitType::class, ['label' => $remove_label]];
+        foreach ($actor_self_tags as $tag) {
+            $tag               = $tag->getTag();
+            $form_definition[] = ["{$tag}:old-tag", TextType::class, ['data' => $tag, 'label' => ' ', 'disabled' => true]];
+            $form_definition[] = [$existing_form_name = "{$tag}:remove", SubmitType::class, ['label' => $remove_label]];
         }
 
         $existing_form = !empty($form_definition) ? Form::create($form_definition) : null;
 
         $add_form = Form::create([
-            ['new-tags', TextType::class, ['label' => ' ', 'data' => [], 'required' => false, 'help' => _m('Tags for yourself (letters, numbers, -, ., and _), comma- or space-separated.'), 'transformer' => ArrayTransformer::class]],
-            ['new-tags-use-canon', CheckboxType::class, ['label' => _m('Use canonical'), 'help' => _m('Assume this tag is the same as similar tags'), 'required' => false, 'data' => true]],
+            ['new-tags', TextType::class, ['label' => ' ', 'data' => [], 'required' => false, 'help' => _m('Tags for this actor (letters, numbers, -, ., and _), comma- or space-separated.'), 'transformer' => ArrayTransformer::class]],
             [$add_form_name = 'new-tags-add', SubmitType::class, ['label' => $add_label]],
         ]);
 

components/Collection/Collection.php

@@ -4,8 +4,169 @@ declare(strict_types = 1);
 
 namespace Component\Collection;
 
+use App\Core\DB;
+use App\Core\Event;
 use App\Core\Modules\Component;
+use App\Entity\Actor;
+use App\Util\Formatting;
+use Component\Collection\Util\Parser;
+use Component\Subscription\Entity\ActorSubscription;
+use Doctrine\Common\Collections\ExpressionBuilder;
+use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\QueryBuilder;
+use EventResult;
 
 class Collection extends Component
 {
+    /**
+     * Perform a high level query on notes or actors
+     *
+     * Supports a variety of query terms and is used both in feeds and
+     * in search. Uses query builders to allow for extension
+     *
+     * @param array<string, OrderByType> $note_order_by
+     * @param array<string, OrderByType> $actor_order_by
+     *
+     * @return array{notes: null|Note[], actors: null|Actor[]}
+     */
+    public static function query(string $query, int $page, ?string $locale = null, ?Actor $actor = null, array $note_order_by = [], array $actor_order_by = []): array
+    {
+        $note_criteria  = null;
+        $actor_criteria = null;
+        if (!empty($query = trim($query))) {
+            [$note_criteria, $actor_criteria] = Parser::parse($query, $locale, $actor);
+        }
+
+        $note_qb  = DB::createQueryBuilder();
+        $actor_qb = DB::createQueryBuilder();
+        // TODO consider selecting note related stuff, to avoid separate queries (though they're cached, so maybe it's okay)
+        $note_qb->select('note')->from('App\Entity\Note', 'note');
+        $actor_qb->select('actor')->from('App\Entity\Actor', 'actor');
+        Event::handle('CollectionQueryAddJoins', [&$note_qb, &$actor_qb, $note_criteria, $actor_criteria]);
+
+        // Handle ordering
+        $note_order_by  = !empty($note_order_by) ? $note_order_by : ['note.created' => 'DESC', 'note.id' => 'DESC'];
+        $actor_order_by = !empty($actor_order_by) ? $actor_order_by : ['actor.created' => 'DESC', 'actor.id' => 'DESC'];
+        foreach ($note_order_by as $field => $order) {
+            $note_qb->addOrderBy($field, $order);
+        }
+        foreach ($actor_order_by as $field => $order) {
+            $actor_qb->addOrderBy($field, $order);
+        }
+
+        $notes  = [];
+        $actors = [];
+        if (!\is_null($note_criteria)) {
+            $note_qb->addCriteria($note_criteria);
+            $notes = $note_qb->getQuery()->execute();
+        }
+
+        if (!\is_null($actor_criteria)) {
+            $actor_qb->addCriteria($actor_criteria);
+            $actors = $actor_qb->getQuery()->execute();
+        }
+
+        // N.B.: Scope is only enforced at FeedController level
+        return ['notes' => $notes ?? null, 'actors' => $actors ?? null];
+    }
+
+    public function onCollectionQueryAddJoins(QueryBuilder &$note_qb, QueryBuilder &$actor_qb): EventResult
+    {
+        $note_aliases = $note_qb->getAllAliases();
+        if (!\in_array('subscription', $note_aliases)) {
+            $note_qb->leftJoin(ActorSubscription::class, 'subscription', Expr\Join::WITH, 'note.actor_id = subscription.subscribed_id');
+        }
+        if (!\in_array('note_actor', $note_aliases)) {
+            $note_qb->leftJoin(Actor::class, 'note_actor', Expr\Join::WITH, 'note.actor_id = note_actor.id');
+        }
+        return Event::next;
+    }
+
+    /**
+     * Convert $term to $note_expr and $actor_expr, search criteria. Handles searching for text
+     * notes, for different types of actors and for the content of text notes
+     *
+     * @param mixed $note_expr
+     * @param mixed $actor_expr
+     */
+    public function onCollectionQueryCreateExpression(ExpressionBuilder $eb, string $term, ?string $locale, ?Actor $actor, &$note_expr, &$actor_expr): EventResult
+    {
+        if (str_contains($term, ':')) {
+            $term = explode(':', $term);
+            if (Formatting::startsWith($term[0], 'note')) {
+                switch ($term[0]) {
+                    case 'notes-all':
+                        $note_expr = $eb->neq('note.created', null);
+                        break;
+                    case 'note-local':
+                        $note_expr = $eb->eq('note.is_local', filter_var($term[1], \FILTER_VALIDATE_BOOLEAN));
+                        break;
+                    case 'note-types':
+                    case 'notes-include':
+                    case 'note-filter':
+                        if (\is_null($note_expr)) {
+                            $note_expr = [];
+                        }
+                        if (array_intersect(explode(',', $term[1]), ['text', 'words']) !== []) {
+                            $note_expr[] = $eb->neq('note.content', null);
+                        } else {
+                            $note_expr[] = $eb->eq('note.content', null);
+                        }
+                        break;
+                    case 'note-conversation':
+                        $note_expr = $eb->eq('note.conversation_id', (int) trim($term[1]));
+                        break;
+                    case 'note-from':
+                    case 'notes-from':
+                        $subscribed_expr = $eb->eq('subscription.subscriber_id', $actor->getId());
+                        $type_consts     = [];
+                        if ($term[1] === 'subscribed') {
+                            $type_consts = null;
+                        }
+                        foreach (explode(',', $term[1]) as $from) {
+                            if (str_starts_with($from, 'subscribed-')) {
+                                [, $type] = explode('-', $from);
+                                if (\in_array($type, ['actor', 'actors'])) {
+                                    $type_consts = null;
+                                } else {
+                                    $type_consts[] = \constant(Actor::class . '::' . mb_strtoupper($type === 'organisation' ? 'group' : $type));
+                                }
+                            }
+                        }
+                        if (\is_null($type_consts)) {
+                            $note_expr = $subscribed_expr;
+                        } elseif (!empty($type_consts)) {
+                            $note_expr = $eb->andX($subscribed_expr, $eb->in('note_actor.type', $type_consts));
+                        }
+                        break;
+                }
+            } elseif (Formatting::startsWith($term, 'actor-')) {
+                switch ($term[0]) {
+                    case 'actor-types':
+                    case 'actors-include':
+                    case 'actor-filter':
+                    case 'actor-local':
+                        if (\is_null($actor_expr)) {
+                            $actor_expr = [];
+                        }
+                        foreach (
+                            [
+                                Actor::PERSON => ['person', 'people'],
+                                Actor::GROUP  => ['group', 'groups', 'org', 'orgs', 'organisation', 'organisations', 'organization', 'organizations'],
+                                Actor::BOT    => ['bot', 'bots'],
+                            ] as $type => $match) {
+                            if (array_intersect(explode(',', $term[1]), $match) !== []) {
+                                $actor_expr[] = $eb->eq('actor.type', $type);
+                            } else {
+                                $actor_expr[] = $eb->neq('actor.type', $type);
+                            }
+                        }
+                        break;
+                }
+            }
+        } else {
+            $note_expr = $eb->contains('note.content', $term);
+        }
+        return Event::next;
+    }
 }

components/Collection/Util/ActorControllerTrait.php

@@ -1,71 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-// {{{ License
-// This file is part of GNU social - https://www.gnu.org/software/social
-//
-// GNU social 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.
-//
-// GNU social 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 GNU social.  If not, see <http://www.gnu.org/licenses/>.
-// }}}
-
-/**
- * Base class for feed controllers
- *
- * @package  GNUsocial
- * @category Controller
- *
- * @author    Hugo Sales <hugo@hsal.es>
- * @copyright 2021 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
- */
-
-namespace Component\Collection\Util;
-
-use App\Core\DB\DB;
-use function App\Core\I18n\_m;
-use App\Core\Router\Router;
-use App\Util\Exception\ClientException;
-
-trait ActorControllerTrait
-{
-    /**
-     * Generic function that handles getting a representation for an actor from id
-     */
-    protected function handleActorById(int $id, callable $handle)
-    {
-        $actor = DB::findOneBy('actor', ['id' => $id]);
-        if ($actor->getIsLocal()) {
-            return ['_redirect' => $actor->getUrl(Router::ABSOLUTE_PATH), 'actor' => $actor];
-        }
-        if (empty($actor)) {
-            throw new ClientException(_m('No such actor.'), 404);
-        } else {
-            return $handle($actor);
-        }
-    }
-
-    /**
-     * Generic function that handles getting a representation for an actor from nickname
-     */
-    protected function handleActorByNickname(string $nickname, callable $handle)
-    {
-        $user  = DB::findOneBy('local_user', ['nickname' => $nickname]);
-        $actor = DB::findOneBy('actor', ['id' => $user->getId()]);
-        if (empty($actor)) {
-            throw new ClientException(_m('No such actor.'), 404);
-        } else {
-            return $handle($actor);
-        }
-    }
-}

components/Collection/Util/Controller/CircleController.php

@@ -4,6 +4,9 @@ declare(strict_types = 1);
 
 namespace Component\Collection\Util\Controller;
 
+/**
+ * @extends OrderedCollection<\Component\Circle\Entity\ActorCircle>
+ */
 class CircleController extends OrderedCollection
 {
 }

components/Collection/Util/Controller/Collection.php

@@ -6,15 +6,25 @@ namespace Component\Collection\Util\Controller;
 
 use App\Core\Controller;
 use App\Entity\Actor;
+use App\Entity\Note;
 use App\Util\Common;
-use Component\Feed\Feed;
+use Component\Collection\Collection as CollectionComponent;
 
-class Collection extends Controller
+/**
+ * @template T
+ */
+abstract class Collection extends Controller
 {
-    public function query(string $query, ?string $language = null, ?Actor $actor = null)
+    /**
+     * @param array<string, OrderByType> $note_order_by
+     * @param array<string, OrderByType> $actor_order_by
+     *
+     * @return array{notes: null|Note[], actors: null|Actor[]}
+     */
+    public function query(string $query, ?string $locale = null, ?Actor $actor = null, array $note_order_by = [], array $actor_order_by = []): array
     {
-        $actor    ??= Common::actor();
-        $language ??= $actor->getTopLanguage()->getLocale();
-        return Feed::query($query, $this->int('page') ?? 1, $language, $actor);
+        $actor  ??= Common::actor();
+        $locale ??= Common::currentLanguage()->getLocale();
+        return CollectionComponent::query($query, $this->int('page') ?? 1, $locale, $actor, $note_order_by, $actor_order_by);
     }
 }

components/Collection/Util/Controller/FeedController.php

@@ -38,19 +38,30 @@ use App\Entity\Note;
 use App\Util\Common;
 use Functional as F;
 
+/**
+ * @template T
+ *
+ * @extends OrderedCollection<T>
+ */
 abstract class FeedController extends OrderedCollection
 {
     /**
      * Post-processing of the result of a feed controller, to remove any
      * notes or actors the user specified, as well as format the raw
      * list of notes into a usable format
+     *
+     * @template NA of Note|Actor
+     *
+     * @param NA[] $result
+     *
+     * @return NA[]
      */
     protected function postProcess(array $result): array
     {
         $actor = Common::actor();
         if (\array_key_exists('notes', $result)) {
             $notes = $result['notes'];
-            self::enforceScope($notes, $actor);
+            self::enforceScope($notes, $actor, $result['actor'] ?? null);
             Event::handle('FilterNoteList', [$actor, &$notes, $result['request']]);
             Event::handle('FormatNoteList', [$notes, &$result['notes'], &$result['request']]);
         }
@@ -58,8 +69,11 @@ abstract class FeedController extends OrderedCollection
         return $result;
     }
 
-    private static function enforceScope(array &$notes, ?Actor $actor): void
+    /**
+     * @param Note[] $notes
+     */
+    private static function enforceScope(array &$notes, ?Actor $actor, ?Actor $in = null): void
     {
-        $notes = F\select($notes, fn (Note $n) => $n->isVisibleTo($actor));
+        $notes = F\select($notes, fn (Note $n) => $n->isVisibleTo($actor, $in));
     }
 }

components/Collection/Util/Controller/MetaCollectionController.php

@@ -31,7 +31,7 @@ declare(strict_types = 1);
 
 namespace Component\Collection\Util\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Entity\LocalUser;
@@ -39,26 +39,51 @@ use App\Util\Common;
 use App\Util\Exception\RedirectException;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormView;
 use Symfony\Component\HttpFoundation\Request;
 
+/**
+ * @template T of object
+ *
+ * @extends FeedController<T>
+ */
 abstract class MetaCollectionController extends FeedController
 {
-    protected string $slug        = 'collectionsEntry';
-    protected string $plural_slug = 'collectionsList';
-    protected string $page_title  = 'Collections';
+    protected const SLUG         = 'collectionsEntry';
+    protected const PLURAL_SLUG  = 'collectionsList';
+    protected string $page_title = 'Collections';
 
     abstract public function getCollectionUrl(int $owner_id, string $owner_nickname, int $collection_id): string;
-    abstract public function getCollectionItems(int $owner_id, $collection_id): array;
-    abstract public function getCollectionsByActorId(int $owner_id): array;
-    abstract public function getCollectionBy(int $owner_id, int $collection_id);
-    abstract public function createCollection(int $owner_id, string $name);
 
+    /**
+     * @return T[]
+     */
+    abstract public function getCollectionItems(int $owner_id, int $collection_id): array;
+
+    /**
+     * @return T[]
+     */
+    abstract public function getCollectionsByActorId(int $owner_id): array;
+
+    /**
+     * @return T A collection
+     */
+    abstract public function getCollectionBy(int $owner_id, int $collection_id): object;
+
+    abstract public function createCollection(int $owner_id, string $name): bool;
+
+    /**
+     * @return ControllerResultType
+     */
     public function collectionsViewByActorNickname(Request $request, string $nickname): array
     {
         $user = DB::findOneBy(LocalUser::class, ['nickname' => $nickname]);
         return self::collectionsView($request, $user->getId(), $nickname);
     }
 
+    /**
+     * @return ControllerResultType
+     */
     public function collectionsViewByActorId(Request $request, int $id): array
     {
         return self::collectionsView($request, $id, null);
@@ -70,14 +95,14 @@ abstract class MetaCollectionController extends FeedController
      * @param int     $id       actor id
      * @param ?string $nickname actor nickname
      *
-     * @return array twig template options
+     * @return ControllerResultType twig template options
      */
     public function collectionsView(Request $request, int $id, ?string $nickname): array
     {
         $collections = $this->getCollectionsByActorId($id);
 
-        $create_title      = _m('Create a ' . mb_strtolower(preg_replace('/([a-z0-9])([A-Z])/', '$1 $2', $this->slug)));
-        $collections_title = _m('Your ' . mb_strtolower(preg_replace('/([a-z0-9])([A-Z])/', '$1 $2', $this->plural_slug)));
+        $create_title      = _m('Create a ' . mb_strtolower(preg_replace('/([a-z0-9])([A-Z])/', '$1 $2', static::SLUG)));
+        $collections_title = _m('The ' . mb_strtolower(preg_replace('/([a-z0-9])([A-Z])/', '$1 $2', static::PLURAL_SLUG)));
         // create collection form
         $create = null;
         if (Common::user()?->getId() === $id) {
@@ -111,36 +136,25 @@ abstract class MetaCollectionController extends FeedController
         //
         // Instead, I'm using an anonymous class to encapsulate
         // the functions and passing that class to the template.
-        // This is suggested at https://stackoverflow.com/a/50364502.
-        $fn = new class($id, $nickname, $request, $this, $this->slug) {
-            private $id;
-            private $nick;
-            private $request;
-            private $parent;
-            private $slug;
-
-            public function __construct($id, $nickname, $request, $parent, $slug)
+        // This is suggested at https://web.archive.org/web/20220226132328/https://stackoverflow.com/questions/3595727/twig-pass-function-into-template/50364502
+        $fn = new class($id, $nickname, $request, $this, static::SLUG) {
+            public function __construct(private int $id, private string $nickname, private Request $request, private object $parent, private string $slug)
             {
-                $this->id      = $id;
-                $this->nick    = $nickname;
-                $this->request = $request;
-                $this->parent  = $parent;
-                $this->slug    = $slug;
             }
-            // there's already a injected function called path,
+            // there's already an injected function called path,
             // that maps to Router::url(name, args), but since
             // I want to preserve nicknames, I think it's better
             // to use that getUrl function
-            public function getUrl($cid)
+            public function getUrl(int $cid): string
             {
-                return $this->parent->getCollectionUrl($this->id, $this->nick, $cid);
+                return $this->parent->getCollectionUrl($this->id, $this->nickname, $cid);
             }
             // There are many collections in this page and we need two
             // forms for each one of them: one form to edit the collection's
             // name and another to remove the collection.
 
             // creating the edit form
-            public function editForm($collection)
+            public function editForm(object $collection): FormView
             {
                 $edit = Form::create([
                     ['name', TextType::class, [
@@ -159,8 +173,7 @@ abstract class MetaCollectionController extends FeedController
                 ]);
                 $edit->handleRequest($this->request);
                 if ($edit->isSubmitted() && $edit->isValid()) {
-                    $collection->setName($edit->getData()['name']);
-                    DB::persist($collection);
+                    $this->parent->setCollectionName($this->id, $this->nickname, $collection, $edit->getData()['name']);
                     DB::flush();
                     throw new RedirectException();
                 }
@@ -168,7 +181,7 @@ abstract class MetaCollectionController extends FeedController
             }
 
             // creating the remove form
-            public function rmForm($collection)
+            public function rmForm(object $collection): FormView
             {
                 $rm = Form::create([
                     ['remove_' . $collection->getId(), SubmitType::class, [
@@ -181,7 +194,7 @@ abstract class MetaCollectionController extends FeedController
                 ]);
                 $rm->handleRequest($this->request);
                 if ($rm->isSubmitted()) {
-                    DB::remove($collection);
+                    $this->parent->removeCollection($this->id, $this->nickname, $collection);
                     DB::flush();
                     throw new RedirectException();
                 }
@@ -199,12 +212,18 @@ abstract class MetaCollectionController extends FeedController
         ];
     }
 
+    /**
+     * @return ControllerResultType
+     */
     public function collectionsEntryViewNotesByNickname(Request $request, string $nickname, int $cid): array
     {
         $user = DB::findOneBy(LocalUser::class, ['nickname' => $nickname]);
         return self::collectionsEntryViewNotesByActorId($request, $user->getId(), $cid);
     }
 
+    /**
+     * @return ControllerResultType
+     */
     public function collectionsEntryViewNotesByActorId(Request $request, int $id, int $cid): array
     {
         $collection = $this->getCollectionBy($id, $cid);

components/Collection/Util/Controller/OrderedCollection.php

@@ -4,6 +4,11 @@ declare(strict_types = 1);
 
 namespace Component\Collection\Util\Controller;
 
-class OrderedCollection extends Collection
+/**
+ * @template T
+ *
+ * @extends Collection<T>
+ */
+abstract class OrderedCollection extends Collection
 {
 }

components/Collection/Util/MetaCollectionTrait.php

@@ -31,41 +31,81 @@ declare(strict_types = 1);
 
 namespace Component\Collection\Util;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Form;
 use function App\Core\I18n\_m;
-use App\Core\Modules\Plugin;
 use App\Entity\Actor;
 use App\Util\Common;
 use App\Util\Exception\RedirectException;
 use App\Util\Formatting;
+use EventResult;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\HttpFoundation\Request;
 
-abstract class MetaCollectionPlugin extends Plugin
+/**
+ * @template T
+ * */
+trait MetaCollectionTrait
 {
-    protected string $slug        = 'collection';
-    protected string $plural_slug = 'collections';
+    //protected const SLUG        = 'collection';
+    //protected const PLURAL_SLUG = 'collections';
 
-    abstract protected function createCollection(Actor $owner, array $vars, string $name);
-    abstract protected function removeItems(Actor $owner, array $vars, $items, array $collections);
-    abstract protected function addItems(Actor $owner, array $vars, $items, array $collections);
+    /**
+     * create a collection owned by Actor $owner.
+     *
+     * @param Actor                $owner The collection's owner
+     * @param array<string, mixed> $vars  Page vars sent by AppendRightPanelBlock event
+     * @param string               $name  Collection's name
+     */
+    abstract protected function createCollection(Actor $owner, array $vars, string $name): void;
+    /**
+     * remove item from collections.
+     *
+     * @param Actor                $owner       Current user
+     * @param array<string, mixed> $vars        Page vars sent by AppendRightPanelBlock event
+     * @param int[]                $items       Array of collections's ids to remove the current item from
+     * @param int[]                $collections List of ids of collections owned by $owner
+     */
+    abstract protected function removeItem(Actor $owner, array $vars, array $items, array $collections): bool;
+    /**
+     * add item to collections.
+     *
+     * @param Actor                $owner       Current user
+     * @param array<string, mixed> $vars        Page vars sent by AppendRightPanelBlock event
+     * @param int[]                $items       Array of collections's ids to add the current item to
+     * @param int[]                $collections List of ids of collections owned by $owner
+     */
+    abstract protected function addItem(Actor $owner, array $vars, array $items, array $collections): void;
 
     /**
      * Check the route to determine whether the widget should be added
+     *
+     * @param array<string, mixed> $vars
+     */
+    abstract protected function shouldAddToRightPanel(Actor $user, array $vars, Request $request): bool;
+    /**
+     * Get array of collections's owned by $actor
+     *
+     * @param Actor                     $owner    Collection's owner
+     * @param null|array<string, mixed> $vars     Page vars sent by AppendRightPanelBlock event
+     * @param bool                      $ids_only if true, the function must return only the primary key or each collections
+     *
+     * @return int[]|T[]
      */
-    abstract protected function shouldAddToRightPanel(Actor $user, $vars, Request $request): bool;
     abstract protected function getCollectionsBy(Actor $owner, ?array $vars = null, bool $ids_only = false): array;
 
     /**
      * Append Collections widget to the right panel.
      * It's compose of two forms: one to select collections to add
      * the current item to, and another to create a new collection.
+     *
+     * @param array<string, mixed> $vars
+     * @param string[]             $res
      */
-    public function onAppendRightPanelBlock($vars, Request $request, &$res): bool
+    public function onAppendRightPanelBlock(Request $request, array $vars, array &$res): EventResult
     {
         $user = Common::actor();
         if (\is_null($user)) {
@@ -98,9 +138,9 @@ abstract class MetaCollectionPlugin extends Plugin
                 },
             ]],
             ['add', SubmitType::class, [
-                'label' => _m('Add to ' . $this->plural_slug),
+                'label' => _m('Add to ' . static::PLURAL_SLUG),
                 'attr'  => [
-                    'title' => _m('Add to ' . $this->plural_slug),
+                    'title' => _m('Add to ' . static::PLURAL_SLUG),
                 ],
             ]],
         ]);
@@ -110,10 +150,10 @@ abstract class MetaCollectionPlugin extends Plugin
             $removed  = array_filter($already_selected, fn ($x) => !\in_array($x, $selected));
             $added    = array_filter($selected, fn ($x) => !\in_array($x, $already_selected));
             if (\count($removed) > 0) {
-                $this->removeItems($user, $vars, $removed, $collections);
+                $this->removeItem($user, $vars, $removed, $collections);
             }
             if (\count($added) > 0) {
-                $this->addItems($user, $vars, $added, $collections);
+                $this->addItem($user, $vars, $added, $collections);
             }
             DB::flush();
             throw new RedirectException();
@@ -122,17 +162,17 @@ abstract class MetaCollectionPlugin extends Plugin
         // form: add to new collection
         $create_form = Form::create([
             ['name', TextType::class, [
-                'label' => _m('Add to a new ' . $this->slug),
+                'label' => _m('Add to a new ' . static::SLUG),
                 'attr'  => [
-                    'placeholder' => _m('New ' . $this->slug . ' name'),
+                    'placeholder' => _m('New ' . static::SLUG . ' name'),
                     'required'    => 'required',
                 ],
                 'data' => '',
             ]],
             ['create', SubmitType::class, [
-                'label' => _m('Create a new ' . $this->slug),
+                'label' => _m('Create a new ' . static::SLUG),
                 'attr'  => [
-                    'title' => _m('Create a new ' . $this->slug),
+                    'title' => _m('Create a new ' . static::SLUG),
                 ],
             ]],
         ]);
@@ -147,7 +187,7 @@ abstract class MetaCollectionPlugin extends Plugin
         $res[] = Formatting::twigRenderFile(
             'collection/widget_add_to.html.twig',
             [
-                'ctitle'          => _m('Add to ' . $this->plural_slug),
+                'ctitle'          => _m('Add to ' . static::PLURAL_SLUG),
                 'user'            => $user,
                 'has_collections' => \count($collections) > 0,
                 'add_form'        => $add_form->createView(),
@@ -157,7 +197,10 @@ abstract class MetaCollectionPlugin extends Plugin
         return Event::next;
     }
 
-    public function onEndShowStyles(array &$styles, string $route): bool
+    /**
+     * @param string[] $styles
+     */
+    public function onEndShowStyles(array &$styles, string $route): EventResult
     {
         $styles[] = 'components/Collection/assets/css/widget.css';
         $styles[] = 'components/Collection/assets/css/pages.css';

components/Collection/Util/Parser.php

@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 // }}}
 
-namespace Component\Search\Util;
+namespace Component\Collection\Util;
 
 use App\Core\Event;
 use App\Entity\Actor;
@@ -32,6 +32,9 @@ abstract class Parser
 {
     /**
      * Merge $parts into $criteria_arr
+     *
+     * @param mixed[]    $parts
+     * @param Criteria[] $criteria_arr
      */
     private static function connectParts(array &$parts, array &$criteria_arr, string $last_op, mixed $eb, bool $force = false): void
     {
@@ -50,10 +53,11 @@ abstract class Parser
      * recognises either spaces (currently `or`, should be fuzzy match), `OR` or `|` (`or`) and `AND` or `&` (`and`)
      *
      * TODO: Better fuzzy match, implement exact match with quotes and nesting with parens
+     * TODO: Proper parser, tokenize better. Mostly a rewrite
      *
-     * @return Criteria[]
+     * @return array{?Criteria, ?Criteria} [?$note_criteria, ?$actor_criteria]
      */
-    public static function parse(string $input, ?string $language = null, ?Actor $actor = null, int $level = 0): array
+    public static function parse(string $input, ?string $locale = null, ?Actor $actor = null, int $level = 0): array
     {
         if ($level === 0) {
             $input = trim(preg_replace(['/\s+/', '/\s+AND\s+/', '/\s+OR\s+/'], [' ', '&', '|'], $input), ' |&');
@@ -78,17 +82,18 @@ abstract class Parser
                     $term      = mb_substr($input, $left, $end ? null : $right - $left);
                     $note_res  = null;
                     $actor_res = null;
-                    Event::handle('SearchCreateExpression', [$eb, $term, $language, $actor, &$note_res, &$actor_res]);
+                    Event::handle('CollectionQueryCreateExpression', [$eb, $term, $locale, $actor, &$note_res, &$actor_res]);
                     if (\is_null($note_res) && \is_null($actor_res)) { // @phpstan-ignore-line
-                        throw new ServerException("No one claimed responsibility for a match term: {$term}");
+                        //throw new ServerException("No one claimed responsibility for a match term: {$term}");
+                        // It's okay if the term doesn't exist, just perform a regular search
                     }
-                    if (!\is_null($note_res) && !empty($note_res)) { // @phpstan-ignore-line
+                    if (!empty($note_res)) { // @phpstan-ignore-line currently an open bug. See https://web.archive.org/web/20220226131651/https://github.com/phpstan/phpstan/issues/6234
                         if (\is_array($note_res)) {
                             $note_res = $eb->orX(...$note_res);
                         }
                         $note_parts[] = $note_res;
                     }
-                    if (!\is_null($actor_res) && !empty($actor_res)) {
+                    if (!empty($actor_res)) { // @phpstan-ignore-line currently an open bug. See https://web.archive.org/web/20220226131651/https://github.com/phpstan/phpstan/issues/6234
                         if (\is_array($actor_res)) {
                             $actor_res = $eb->orX(...$actor_res);
                         }
@@ -107,18 +112,18 @@ abstract class Parser
                 }
             }
             // TODO
-            if (!$match) { // @phpstan-ignore-line
+            if (!$match) {
                 ++$right;
             }
         }
 
         $note_criteria  = null;
         $actor_criteria = null;
-        if (!empty($note_parts)) { // @phpstan-ignore-line
+        if (!empty($note_parts)) {
             self::connectParts($note_parts, $note_criteria_arr, $last_op, $eb, force: true);
             $note_criteria = new Criteria($eb->orX(...$note_criteria_arr));
         }
-        if (!empty($actor_parts)) { // @phpstan-ignore-line
+        if (!empty($actor_parts)) { // @phpstan-ignore-line weird, but this whole thing needs a rewrite
             self::connectParts($actor_parts, $actor_criteria_arr, $last_op, $eb, force: true);
             $actor_criteria = new Criteria($eb->orX(...$actor_criteria_arr));
         }

components/Collection/templates/collection/actors.html.twig

@@ -3,31 +3,68 @@
 {% block title %}{{ title }}{% endblock %}
 
 {% block body %}
-<section class="section-widget section-padding">
-    <h2 class="section-title">{{ title }}</h2>
+<section class="frame-section frame-section-padding">
+    <header class="feed-header">
+        {% if actors_feed_title is defined %}
+            {{ actors_feed_title.getHtml() }}
+        {% endif %}
+    </header>
 
-    <div>
-        <p>{% trans %}Sort by:{% endtrans %}</p>
-        <form method="GET">
-            {% for field in sort_form_fields %}
-                <label for="order_by_{{ field.value }}">{{ field.label }}</label>
-                <input id="order_by_{{ field.value }}" type="radio" name="order_by" value="{{ field.value }}" {% if field.checked %}checked="checked"{% endif %}>
-            {% endfor %}
-            <button type="submit" name="order_op" value="ASC">{% trans %}Ascending{% endtrans %}</button>
-            <button type="submit" name="order_op" value="DESC">{% trans %}Descending{% endtrans %}</button>
+    {% set prepend_actors_collection = handle_event('PrependActorsCollection', request) %}
+    {% for widget in prepend_actors_collection %}
+        {{ widget | raw }}
+    {% endfor %}
+
+    <details class="frame-section section-details-title">
+        <summary class="details-summary-title">
+            <strong>
+                {% trans %}Ordering rules{% endtrans %}
+            </strong>
+        </summary>
+        <form method="GET" class="section-form">
+            <div class="container-grid">
+                <section class="frame-section frame-section-padding">
+                    <strong>{% trans %}Sort by{% endtrans %}</strong>
+                    <hr>
+                    <div class="container-block">
+                        {% for field in sort_form_fields %}
+                            <span class="container-block">
+                                <label for="order_by_{{ field.value }}">{{ field.label }}</label>
+                                <input id="order_by_{{ field.value }}" type="radio" name="order_by" value="{{ field.value }}" {% if field.checked %}checked="checked"{% endif %}>
+                            </span>
+                        {% endfor %}
+                    </div>
+                </section>
+                <section class="frame-section frame-section-padding">
+                    <strong class="section-title">{% trans %}Order{% endtrans %}</strong>
+                    <hr>
+                    <section class="container-block">
+                        <span class="container-block">
+                            <label for="order_op_asc">{% trans %}Ascending{% endtrans %}</label>
+                            <input id="order_op_asc" type="radio" name="order_op" value="ASC">
+                        </span>
+                        <span class="container-block">
+                            <label for="order_op_desc">{% trans %}Descending{% endtrans %}</label>
+                            <input id="order_op_desc" type="radio" name="order_op" value="DESC" checked="checked">
+                        </span>
+                    </section>
+                </section>
+            </div>
+            <button type="submit">{% trans %}Order{% endtrans %}</button>
         </form>
-    </div>
+    </details>
 
-    <div class="section-padding">
+    <section class="frame-section frame-section-padding">
+        <h2>{% trans %}Results{% endtrans %}</h2>
         {% if actors is defined and actors is not empty %}
             {% for actor in actors %}
-                {% block profile_view %}{% include 'cards/profile/view.html.twig' %}{% endblock profile_view %}
+                {% block profile_view %}{% include 'cards/blocks/profile.html.twig' %}{% endblock profile_view %}
                 <hr>
             {% endfor %}
-            <p>{% trans %}Page: %page%{% endtrans %}</p>
+            <span class="frame-section-button-like">{% trans %}Page: %page%{% endtrans %}</span>
         {% else %}
-            <h3>{{ empty_message }}</h3>
+            <span>{{ empty_message }}</span>
         {% endif %}
-    </div>
+    </section>
 </section>
 {% endblock body %}

components/Collection/templates/collection/collection_entry_view.html.twig

@@ -1,10 +1,10 @@
 {% extends '/collection/notes.html.twig' %}
 
-{% block title %}{{ page_title | trans }}{% endblock %}
+{% block title %}{% trans %}%page_title%{% endtrans %}{% endblock %}
 
 {% block body %}
-    <div class="section-widget section-padding">
-        <h2 class="section-widget-title">{{ page_title | trans }}</h2>
+    <div class="frame-section frame-section-padding">
+        <h2 class="frame-section-title">{% trans %}%page_title%{% endtrans %}</h2>
         {% block collection_items %}
         {% endblock collection_items %}
     </div>

components/Collection/templates/collection/meta_collections.html.twig

@@ -1,17 +1,17 @@
 {% extends 'stdgrid.html.twig' %}
 
-{% block title %}{{ page_title | trans }}{% endblock %}
+{% block title %}{% trans %}%page_title%{% endtrans %}{% endblock %}
 
 {% block body %}
-    <div class="section-widget section-padding">
-        <h2 class="section-widget-title">{{ page_title | trans }}</h2>
+    <div class="frame-section frame-section-padding">
+        <h2 class="frame-section-title">{% trans %}%page_title%{% endtrans %}</h2>
         {% if add_collection %}
-            <div class="section-widget section-form">
+            <div class="frame-section section-form">
                 {{ form(add_collection) }}
             </div>
         {% endif %}
-        <div class="section-widget collections-list">
-            <h3>{{ list_title | trans }}</h3>
+        <div class="frame-section collections-list">
+            <h3>{% trans %}%list_title%{% endtrans %}</h3>
             {% for col in collections %}
                 <div class="collection-item">
                     <a class="name" href="{{ fn.getUrl(col.id) }}">{{ col.name }}</a>

components/Collection/templates/collection/notes.html.twig

@@ -1,44 +1,58 @@
 {% extends 'stdgrid.html.twig' %}
-{% import '/cards/note/view.html.twig' as noteView %}
+{% import '/cards/macros/note/factory.html.twig' as NoteFactory %}
 
-{% block title %}{% if page_title is defined %}{{ page_title | trans }}{% endif %}{% endblock %}
+{% block title %}{% if page_title is defined %}{% trans %}%page_title%{% endtrans %}{% endif %}{% endblock %}
 
 {% block stylesheets %}
     {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('assets/default_theme/css/pages/feeds.css') }}" type="text/css">
+    <link rel="stylesheet" href="{{ asset('assets/default_theme/feeds.css') }}" type="text/css">
 {% endblock stylesheets %}
 
 {% block body %}
-<header class="feed-header">
-    {% if page_title is defined %}
-        <h1>{{ page_title | trans }}</h1>
-    {% endif %}
-    <nav class="feed-actions">
-        {% for block in handle_event('AddFeedActions', app.request, notes is defined and notes is not empty) %}
-            {{ block | raw }}
-        {% endfor %}
-    </nav>
-</header>
+    {% for block in handle_event('BeforeFeed', app.request) %}
+        {{ block | raw }}
+    {% endfor %}
 
-    {# Backwards compatibility with hAtom 0.1 #}
-    <main class="feed" tabindex="0" role="feed">
-        <div class="h-feed hfeed notes">
-            {% if notes is defined and notes is not empty %}
+    {% if notes is defined %}
+        <header class="feed-header">
+            {% set current_path = app.request.get('_route') %}
+            {% if notes_feed_title is defined %}
+                {{ notes_feed_title.getHtml() }}
+            {% endif %}
+            <nav class="feed-actions" title="{% trans %}Actions that change how the feed behaves{% endtrans %}">
+                <details class="feed-actions-details" role="group">
+                    <summary>
+                        {{ icon('filter', 'icon icon-feed-actions') | raw }} {# button-container #}
+                    </summary>
+                    <menu class="feed-actions-details-dropdown" role="toolbar">
+                        {% for block in handle_event('AddFeedActions', app.request, notes is defined and notes is not empty) %}
+                            {{ block | raw }}
+                        {% endfor %}
+                    </menu>
+                </details>
+            </nav>
+        </header>
+
+        {% if notes is not empty %}
+            {# Backwards compatibility with hAtom 0.1 #}
+            <section class="feed h-feed hfeed notes" role="feed" aria-busy="false" title="{% trans %}Feed content{% endtrans %}">
                 {% for conversation in notes %}
                     {% block current_note %}
                         {% if conversation is instanceof('array') %}
-                            {{ noteView.macro_note(conversation['note'], conversation['replies']) }}
-                        {% else %}
-                            {{ noteView.macro_note(conversation) }}
+                            {% set args = conversation | merge({'type': 'vanilla_full'}) %}
+                            {{ NoteFactory.constructor(args) }}
+{#                        {% else %}
+                            {% set args = { 'type': 'vanilla_full', 'note': conversation, 'extra': { 'depth': 0 } } %}
+                            {{ NoteFactory.constructor(args) }}#}
                         {% endif %}
-                        <hr tabindex="0" title="{{ 'End of note and replies.' | trans }}">
+                        <hr class="hr-replies-end" role="separator" aria-label="{% trans %}Marks the end of previous conversation's initial note{% endtrans %}">
                     {% endblock current_note %}
                 {% endfor %}
-            {% else %}
-                <div class="feed-empty">
-                    {{ icon('logo', 'icon feed-background') | raw }}
-                </div>
-            {% endif %}
-        </div>
-    </main>
+            </section>
+        {% else %}
+            <section class="feed h-feed hfeed notes" tabindex="0" role="feed">
+                <span>{% trans %}No notes here...{% endtrans %}</span>
+            </section>
+        {% endif %}
+    {% endif %}
 {% endblock body %}

components/Collection/templates/collection/widget_add_to.html.twig

@@ -1,28 +1,26 @@
-<section class="section-widget collections">
-    <details class="section-widget-title-details" title="Expand if you want to access more options.">
-        <summary class="section-title-summary">
-            <h2>{{ctitle}}</h2>
-            {{ icon('arrow-down', 'icon icon-details-open') | raw }}
+<section class="frame-section collections">
+    <details class="section-details-title" title="Expand if you want to access more options.">
+        <summary class="details-summary-title">
+            <span>{{ctitle}}</span>
         </summary>
         {% if has_collections %}
-            <fieldset class="section-form">
+            <section class="section-form">
                 {{ form(add_form) }}
-            </fieldset>
+            </section>
 
-            <details class="section-widget-subtitle-details section-padding"
+            <details class="frame-section-padding section-details-subtitle"
                      title="Expand if you want to access more options.">
-                <summary class="section-subtitle-summary">
+                <summary class="details-summary-subtitle">
                     <strong>{% trans %}Other options{% endtrans %}</strong>
-                    {{ icon('arrow-down', 'icon icon-details-close') | raw }}
                 </summary>
-                <fieldset class="section-form">
+                <section class="section-form">
                     {{ form(create_form) }}
-                </fieldset>
+                </section>
             </details>
         {% else %}
-            <fieldset class="section-form">
+            <section class="section-form">
                 {{ form(create_form) }}
-            </fieldset>
+            </section>
         {% endif %}
     </details>
 </section>

components/Conversation/Controller/Conversation.php

@@ -28,9 +28,11 @@ declare(strict_types = 1);
 namespace Component\Conversation\Controller;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
+use App\Core\Log;
+use App\Core\Router;
 use App\Entity\Note;
 use App\Util\Common;
 use App\Util\Exception\ClientException;
@@ -38,11 +40,15 @@ use App\Util\Exception\NoLoggedInUser;
 use App\Util\Exception\NoSuchNoteException;
 use App\Util\Exception\RedirectException;
 use App\Util\Exception\ServerException;
+use App\Util\HTML\Heading;
 use Component\Collection\Util\Controller\FeedController;
 use Component\Conversation\Entity\ConversationMute;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 
+/**
+ * @extends FeedController<\App\Entity\Note>
+ */
 class Conversation extends FeedController
 {
     /**
@@ -52,15 +58,24 @@ class Conversation extends FeedController
      *
      * @throws \App\Util\Exception\ServerException
      *
-     * @return array Array containing keys: 'notes' (all known notes in the given Conversation), 'should_format' (boolean, stating if onFormatNoteList events may or not format given notes), 'page_title' (used as the title header)
+     * @return ControllerResultType Array containing keys: 'notes' (all known
+     *                              notes in the given Conversation), 'should_format' (boolean, stating if
+     *                              onFormatNoteList events may or not format given notes), 'page_title'
+     *                              (used as the title header)
      */
     public function showConversation(Request $request, int $conversation_id): array
     {
+        $page_title = _m('Conversation');
+
         return [
-            '_template'     => 'collection/notes.html.twig',
-            'notes'         => $this->query(query: "note-conversation:{$conversation_id}")['notes'] ?? [],
-            'should_format' => false,
-            'page_title'    => _m('Conversation'),
+            '_template' => 'collection/notes.html.twig',
+            'notes'     => $this->query(
+                query: "note-conversation:{$conversation_id}",
+                note_order_by: ['note.created' => 'ASC', 'note.id' => 'ASC'],
+            )['notes'] ?? [],
+            'should_format'    => false,
+            'page_title'       => $page_title,
+            'notes_feed_title' => (new Heading(1, [], $page_title)),
         ];
     }
 
@@ -74,7 +89,7 @@ class Conversation extends FeedController
      * @throws NoSuchNoteException
      * @throws ServerException
      *
-     * @return array
+     * @return ControllerResultType
      */
     public function addReply(Request $request)
     {
@@ -94,31 +109,50 @@ class Conversation extends FeedController
      * @throws \App\Util\Exception\RedirectException
      * @throws \App\Util\Exception\ServerException
      *
-     * @return array Array containing templating where the form is to be rendered, and the form itself
+     * @return ControllerResultType Array containing templating where the form is to be rendered, and the form itself
      */
     public function muteConversation(Request $request, int $conversation_id)
     {
         $user     = Common::ensureLoggedIn();
         $is_muted = ConversationMute::isMuted($conversation_id, $user);
         $form     = Form::create([
-            ['mute_conversation', SubmitType::class, ['label' => $is_muted ? _m('Mute conversation') : _m('Unmute conversation')]],
+            ['mute_conversation', SubmitType::class, ['label' => $is_muted ? _m('Unmute') : _m('Mute'), 'attr' => ['class' => '']]],
         ]);
 
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
-            if ($is_muted) {
+            if (!$is_muted) {
                 DB::persist(ConversationMute::create(['conversation_id' => $conversation_id, 'actor_id' => $user->getId()]));
             } else {
                 DB::removeBy('conversation_mute', ['conversation_id' => $conversation_id, 'actor_id' => $user->getId()]);
             }
             DB::flush();
             Cache::delete(ConversationMute::cacheKeys($conversation_id, $user->getId())['mute']);
-            throw new RedirectException();
+
+            // Redirect user to where they came from
+            // Prevent open redirect
+            if (!\is_null($from = $this->string('from'))) {
+                if (Router::isAbsolute($from)) {
+                    Log::warning("Actor {$user->getId()} attempted to mute conversation {$conversation_id} and then get redirected to another host, or the URL was invalid ({$from})");
+                    throw new ClientException(_m('Can not redirect to outside the website from here'), 400); // 400 Bad request (deceptive)
+                } else {
+                    // TODO anchor on element id
+                    throw new RedirectException(url: $from);
+                }
+            } else {
+                // If we don't have a URL to return to, go to the instance root
+                throw new RedirectException('root');
+            }
         }
 
         return [
             '_template' => 'conversation/mute.html.twig',
-            'form'      => $form->createView(),
+            'notes'     => $this->query(
+                query: "note-conversation:{$conversation_id}",
+                note_order_by: ['note.created' => 'ASC', 'note.id' => 'ASC'],
+            )['notes'] ?? [],
+            'is_muted' => $is_muted,
+            'form'     => $form->createView(),
         ];
     }
 }

components/Conversation/Conversation.php

@@ -1,9 +1,7 @@
 <?php
 
 declare(strict_types = 1);
-
 // {{{ License
-
 // This file is part of GNU social - https://www.gnu.org/software/social
 //
 // GNU social is free software: you can redistribute it and/or modify
@@ -18,30 +16,37 @@ declare(strict_types = 1);
 //
 // You should have received a copy of the GNU Affero General Public License
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
-
 // }}}
 
+/**
+ * @author    Hugo Sales <hugo@hsal.es>
+ * @author    Eliseu Amaro <mail@eliseuama.ro>
+ * @copyright 2021-2022 Free Software Foundation, Inc http://www.fsf.org
+ * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ */
+
 namespace Component\Conversation;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\Component;
-use App\Core\Router\RouteLoader;
-use App\Core\Router\Router;
+use App\Core\Router;
 use App\Entity\Activity;
 use App\Entity\Actor;
 use App\Entity\Note;
 use App\Util\Common;
+use App\Util\Formatting;
 use Component\Conversation\Entity\Conversation as ConversationEntity;
 use Component\Conversation\Entity\ConversationMute;
+use EventResult;
 use Functional as F;
 use Symfony\Component\HttpFoundation\Request;
 
 class Conversation extends Component
 {
-    public function onAddRoute(RouteLoader $r): bool
+    public function onAddRoute(Router $r): EventResult
     {
         $r->connect('conversation', '/conversation/{conversation_id<\d+>}', [Controller\Conversation::class, 'showConversation']);
         $r->connect('conversation_mute', '/conversation/{conversation_id<\d+>}/mute', [Controller\Conversation::class, 'muteConversation']);
@@ -78,29 +83,29 @@ class Conversation extends Component
         } else {
             // It's a reply for sure
             // Set reply_to property in newly created Note to parent's id
-            $current_note->setReplyTo($parent_id);
-
             // Parent will have a conversation of its own, the reply should have the same one
             $parent_note = Note::getById($parent_id);
             $current_note->setConversationId($parent_note->getConversationId());
         }
 
-        DB::merge($current_note);
+        DB::persist($current_note);
     }
 
     /**
      * HTML rendering event that adds a reply link as a note
      * action, if a user is logged in.
      *
-     * @param \App\Entity\Note $note    The Note being rendered
-     * @param array            $actions Contains keys 'url' (linking 'conversation_reply_to'
-     *                                  route), 'title' (used as title for aforementioned url),
-     *                                  'classes' (CSS styling classes used to visually inform the user of action context),
-     *                                  'id' (HTML markup id used to redirect user to this anchor upon performing the action)
+     * @param \App\Entity\Note                                               $note    The Note being rendered
+     * @param array{url: string, title: string, classes: string, id: string} $actions
+     *                                                                                Contains keys 'url' (linking 'conversation_reply_to' route),
+     *                                                                                'title' (used as title for aforementioned url), 'classes' (CSS styling
+     *                                                                                classes used to visually inform the user of action context), 'id' (HTML
+     *                                                                                markup id used to redirect user to this anchor upon performing the
+     *                                                                                action)
      *
      * @throws \App\Util\Exception\ServerException
      */
-    public function onAddNoteActions(Request $request, Note $note, array &$actions): bool
+    public function onAddNoteActions(Request $request, Note $note, array &$actions): EventResult
     {
         if (\is_null(Common::user())) {
             return Event::next;
@@ -114,7 +119,8 @@ class Conversation extends Component
             'conversation_reply_to',
             [
                 'reply_to_id' => $note->getId(),
-                'from'        => $from . '#note-anchor-' . $note->getId(),
+                'from'        => $from,
+                '_fragment'   => 'note-anchor-' . $note->getId(),
             ],
             Router::ABSOLUTE_PATH,
         );
@@ -131,29 +137,21 @@ class Conversation extends Component
         return Event::next;
     }
 
-    /**
-     * Posting event to add extra info to a note
-     */
-    public function onPostingModifyData(Request $request, Actor $actor, array &$data): bool
-    {
-        $data['reply_to_id'] = $request->get('_route') === 'conversation_reply_to' && $request->query->has('reply_to_id')
-                             ? $request->query->getInt('reply_to_id')
-                             : null;
-
-        if (!\is_null($data['reply_to_id'])) {
-            Note::ensureCanInteract(Note::getById($data['reply_to_id']), $actor);
-        }
-        return Event::next;
-    }
-
     /**
      * Append on note information about user actions.
      *
-     * @param array $vars   Contains information related to Note currently being rendered
-     * @param array $result Contains keys 'actors', and 'action'. Needed to construct a string, stating who ($result['actors']), has already performed a reply ($result['action']), in the given Note (vars['note'])
+     * @param array<string, mixed>                   $vars   Contains information related to Note currently being rendered
+     * @param array{actors: Actor[], action: string} $result
+     *cContains keys 'actors', and 'action'. Needed to construct a string,
+     * stating who ($result['actors']), has already performed a reply
+     * ($result['action']), in the given Note (vars['note'])
      */
-    public function onAppendCardNote(array $vars, array &$result): bool
+    public function onAppendCardNote(array $vars, array &$result): EventResult
     {
+        if (str_contains($vars['request']->getPathInfo(), 'conversation')) {
+            return Event::next;
+        }
+
         // The current Note being rendered
         $note = $vars['note'];
 
@@ -175,6 +173,22 @@ class Conversation extends Component
         return Event::next;
     }
 
+    private function getReplyToIdFromRequest(Request $request): ?int
+    {
+        if (!\is_array($request->get('post_note')) || !\array_key_exists('_next', $request->get('post_note'))) {
+            return null;
+        }
+        $next = parse_url($request->get('post_note')['_next']);
+        if (!\array_key_exists('query', $next)) {
+            return null;
+        }
+        parse_str($next['query'], $query);
+        if (!\array_key_exists('reply_to_id', $query)) {
+            return null;
+        }
+        return (int) $query['reply_to_id'];
+    }
+
     /**
      * Informs **\App\Component\Posting::onAppendRightPostingBlock**, of the **current page context** in which the given
      * Actor is in. This is valuable when posting within a group route, allowing \App\Component\Posting to create a
@@ -183,9 +197,9 @@ class Conversation extends Component
      * @param \App\Entity\Actor      $actor         The Actor currently attempting to post a Note
      * @param null|\App\Entity\Actor $context_actor The 'owner' of the current route (e.g. Group or Actor), used to target it
      */
-    public function onPostingGetContextActor(Request $request, Actor $actor, ?Actor &$context_actor)
+    public function onPostingGetContextActor(Request $request, Actor $actor, ?Actor &$context_actor): EventResult
     {
-        $to_note_id = $request->query->get('reply_to_id');
+        $to_note_id = $this->getReplyToIdFromRequest($request);
         if (!\is_null($to_note_id)) {
             // Getting the actor itself
             $context_actor = Actor::getById(Note::getById((int) $to_note_id)->getActorId());
@@ -194,6 +208,36 @@ class Conversation extends Component
         return Event::next;
     }
 
+    /**
+     * Posting event to add extra information to Component\Posting form data
+     *
+     * @param array{reply_to_id: int} $data Transport data to be filled with reply_to_id
+     *
+     * @throws \App\Util\Exception\ClientException
+     * @throws \App\Util\Exception\NoSuchNoteException
+     */
+    public function onPostingModifyData(Request $request, Actor $actor, array &$data): EventResult
+    {
+        $to_note_id = $this->getReplyToIdFromRequest($request);
+        if (!\is_null($to_note_id)) {
+            Note::ensureCanInteract(Note::getById($to_note_id), $actor);
+            $data['reply_to_id'] = $to_note_id;
+        }
+
+        return Event::next;
+    }
+
+    /**
+     * Add minimal Note card to RightPanel template
+     *
+     * @param string[] $elements
+     */
+    public function onPrependPostingForm(Request $request, array &$elements): EventResult
+    {
+        $elements[] = Formatting::twigRenderFile('cards/blocks/note_compact_wrapper.html.twig', ['note' => Note::getById((int) $request->query->get('reply_to_id'))]);
+        return Event::next;
+    }
+
     /**
      * Event launched when deleting given Note, it's deletion implies further changes to object related to this Note.
      * Please note, **replies are NOT deleted**, their reply_to is only set to null since this Note no longer exists.
@@ -201,7 +245,7 @@ class Conversation extends Component
      * @param \App\Entity\Note  $note  Note being deleted
      * @param \App\Entity\Actor $actor Actor that performed the delete action
      */
-    public function onNoteDeleteRelated(Note &$note, Actor $actor): bool
+    public function onNoteDeleteRelated(Note &$note, Actor $actor): EventResult
     {
         // Ensure we have the most up to date replies
         Cache::delete(Note::cacheKeys($note->getId())['replies']);
@@ -213,29 +257,48 @@ class Conversation extends Component
     /**
      * Adds extra actions related to Conversation Component, that act upon/from the given Note.
      *
-     * @param \App\Entity\Note $note    Current Note being rendered
-     * @param array            $actions Containing 'url' (Controller connected route), 'title' (used in anchor link containing the url), ?'classes' (CSS classes required for styling, if needed)
+     * @param \App\Entity\Note                                    $note    Current Note being rendered
+     * @param array{url: string, title: string, classes?: string} $actions Containing 'url' (Controller connected
+     *                                                                     route), 'title' (used in anchor link containing the url), ?'classes' (CSS classes required for styling, if
+     *                                                                     needed)
      *
      * @throws \App\Util\Exception\ServerException
-     *
-     * @return bool EventHook
      */
-    public function onAddExtraNoteActions(Request $request, Note $note, array &$actions)
+    public function onAddExtraNoteActions(Request $request, Note $note, array &$actions): EventResult
     {
         if (\is_null($user = Common::user())) {
             return Event::next;
         }
 
+        $from = $request->query->has('from')
+            ? $request->query->get('from')
+            : $request->getPathInfo();
+
+        $mute_extra_action_url = Router::url(
+            'conversation_mute',
+            [
+                'conversation_id' => $note->getConversationId(),
+                'from'            => $from,
+                '_fragment'       => 'note-anchor-' . $note->getId(),
+            ],
+            Router::ABSOLUTE_PATH,
+        );
+
         $actions[] = [
-            'title'   => ConversationMute::isMuted($note, $user) ? _m('Mute conversation') : _m('Unmute conversation'),
+            'title'   => ConversationMute::isMuted($note, $user) ? _m('Unmute conversation') : _m('Mute conversation'),
             'classes' => '',
-            'url'     => Router::url('conversation_mute', ['conversation_id' => $note->getConversationId()]),
+            'url'     => $mute_extra_action_url,
         ];
 
         return Event::next;
     }
 
-    public function onNewNotificationShould(Activity $activity, Actor $actor)
+    /**
+     * Prevents new Notifications to appear for muted conversations
+     *
+     * @param Activity $activity Notification Activity
+     */
+    public function onNewNotificationShould(Activity $activity, Actor $actor): EventResult
     {
         if ($activity->getObjectType() === 'note' && ConversationMute::isMuted($activity, $actor)) {
             return Event::stop;

components/Conversation/Entity/Conversation.php

@@ -23,10 +23,9 @@ declare(strict_types = 1);
 
 namespace Component\Conversation\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
-use App\Core\Router\Router;
-use App\Entity\Note;
+use App\Core\Router;
 
 /**
  * Entity class for Conversations

components/Conversation/Entity/ConversationMute.php

@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Conversation\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Entity\Activity;
 use App\Entity\Actor;
@@ -118,11 +118,15 @@ class ConversationMute extends Entity
         return [
             'name'   => 'conversation_mute',
             'fields' => [
-                'conversation_id' => ['type' => 'int',       'foreign key' => true, 'target' => 'Conversation.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'The conversation being blocked'],
-                'actor_id'        => ['type' => 'int',       'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'Who blocked the conversation'],
-                'created'         => ['type' => 'datetime',  'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
+                'conversation_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Conversation.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'The conversation being blocked'],
+                'actor_id'        => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'Who blocked the conversation'],
+                'created'         => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
+            ],
+            'primary key'  => ['conversation_id', 'actor_id'],
+            'foreign keys' => [
+                'conversation_id_to_id_fkey' => ['conversation', ['conversation_id' => 'id']],
+                'actor_id_to_id_fkey'        => ['actor', ['actor_id' => 'id']],
             ],
-            'primary key' => ['conversation_id', 'actor_id'],
         ];
     }
 }

components/Conversation/templates/conversation/mute.html.twig

@@ -1,5 +1,21 @@
-{% extends 'base.html.twig' %}
+{% extends 'collection/notes.html.twig' %}
 
 {% block body %}
-    {{ form(form) }}
+    <div class="frame-section frame-section-padding">
+        {% if is_muted %}
+            <span class="frame-section-padding alert">
+            <label>Do you wish to <b>unmute</b> this conversation?</label>
+            {{ form(form) }}
+        </span>
+        {% else %}
+            <span class="frame-section-padding alert">
+            <label>Do you wish to <b>mute</b> this conversation?</label>
+            {{ form(form) }}
+        </span>
+        {% endif %}
+
+        <hr>
+
+        {{ parent() }}
+    </div>
 {% endblock body %}

components/Feed/Controller/Feeds.php

@@ -37,43 +37,46 @@ namespace Component\Feed\Controller;
 
 use function App\Core\I18n\_m;
 use App\Util\Common;
+use App\Util\HTML\Heading;
 use Component\Collection\Util\Controller\FeedController;
 use Symfony\Component\HttpFoundation\Request;
 
+/**
+ * @extends FeedController<\App\Entity\Note>
+ */
 class Feeds extends FeedController
 {
     /**
      * The Planet feed represents every local post. Which is what this instance has to share with the universe.
+     *
+     * @return ControllerResultType
      */
     public function public(Request $request): array
     {
-        $data = $this->query(
-            query: 'note-local:true',
-            language: Common::actor()?->getTopLanguage()?->getLocale(),
-        );
+        $data       = $this->query('note-local:true');
+        $page_title = _m(\is_null(Common::user()) ? 'Feed' : 'Planet');
         return [
-            '_template'  => 'collection/notes.html.twig',
-            'page_title' => _m(\is_null(Common::user()) ? 'Feed' : 'Planet'),
-            'notes'      => $data['notes'],
+            '_template'        => 'collection/notes.html.twig',
+            'page_title'       => $page_title,
+            'notes_feed_title' => (new Heading(level: 1, classes: ['feed-title'], text: $page_title)),
+            'notes'            => $data['notes'],
         ];
     }
 
     /**
      * The Home feed represents everything that concerns a certain actor (its subscriptions)
+     *
+     * @return ControllerResultType
      */
     public function home(Request $request): array
     {
-        $user  = Common::ensureLoggedIn();
-        $actor = $user->getActor();
-        $data  = $this->query(
-            query: 'note-from:subscribed-person,subscribed-group,subscribed-organization,subscribed-business',
-            language: $actor->getTopLanguage()->getLocale(),
-            actor: $actor,
-        );
+        Common::ensureLoggedIn();
+        $data = $this->query('note-from:subscribed-person,subscribed-group,subscribed-organisation');
         return [
-            '_template'  => 'collection/notes.html.twig',
-            'page_title' => _m('Home'),
-            'notes'      => $data['notes'],
+            '_template'        => 'collection/notes.html.twig',
+            'page_title'       => _m('Home'),
+            'notes_feed_title' => (new Heading(level: 1, classes: ['feed-title'], text: 'Home')),
+            'notes'            => $data['notes'],
         ];
     }
 }

components/Feed/Feed.php

@@ -23,151 +23,18 @@ declare(strict_types = 1);
 
 namespace Component\Feed;
 
-use App\Core\DB\DB;
 use App\Core\Event;
 use App\Core\Modules\Component;
-use App\Core\Router\RouteLoader;
-use App\Entity\Actor;
-use App\Util\Formatting;
+use App\Core\Router;
 use Component\Feed\Controller as C;
-use Component\Search\Util\Parser;
-use Component\Subscription\Entity\Subscription;
-use Doctrine\Common\Collections\ExpressionBuilder;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\QueryBuilder;
+use EventResult;
 
 class Feed extends Component
 {
-    public function onAddRoute(RouteLoader $r): bool
+    public function onAddRoute(Router $r): EventResult
     {
         $r->connect('feed_public', '/feed/public', [C\Feeds::class, 'public']);
         $r->connect('feed_home', '/feed/home', [C\Feeds::class, 'home']);
         return Event::next;
     }
-
-    /**
-     * Perform a high level query on notes or actors
-     *
-     * Supports a variety of query terms and is used both in feeds and
-     * in search. Uses query builders to allow for extension
-     */
-    public static function query(string $query, int $page, ?string $language = null, ?Actor $actor = null): array
-    {
-        $note_criteria  = null;
-        $actor_criteria = null;
-        if (!empty($query = trim($query))) {
-            [$note_criteria, $actor_criteria] = Parser::parse($query, $language, $actor);
-        }
-        $note_qb  = DB::createQueryBuilder();
-        $actor_qb = DB::createQueryBuilder();
-        $note_qb->select('note')->from('App\Entity\Note', 'note')->orderBy('note.created', 'DESC')->addOrderBy('note.id', 'DESC');
-        $actor_qb->select('actor')->from('App\Entity\Actor', 'actor')->orderBy('actor.created', 'DESC')->addOrderBy('actor.id', 'DESC');
-        Event::handle('SearchQueryAddJoins', [&$note_qb, &$actor_qb, $note_criteria, $actor_criteria]);
-
-        $notes  = [];
-        $actors = [];
-        if (!\is_null($note_criteria)) {
-            $note_qb->addCriteria($note_criteria);
-        }
-        $notes = $note_qb->getQuery()->execute();
-
-        if (!\is_null($actor_criteria)) {
-            $actor_qb->addCriteria($actor_criteria);
-        }
-        $actors = $actor_qb->getQuery()->execute();
-
-        // N.B.: Scope is only enforced at FeedController level
-        return ['notes' => $notes ?? null, 'actors' => $actors ?? null];
-    }
-
-    public function onSearchQueryAddJoins(QueryBuilder &$note_qb, QueryBuilder &$actor_qb): bool
-    {
-        $note_qb->leftJoin(Subscription::class, 'subscription', Expr\Join::WITH, 'note.actor_id = subscription.subscribed_id')
-            ->leftJoin(Actor::class, 'note_actor', Expr\Join::WITH, 'note.actor_id = note_actor.id');
-        return Event::next;
-    }
-
-    /**
-     * Convert $term to $note_expr and $actor_expr, search criteria. Handles searching for text
-     * notes, for different types of actors and for the content of text notes
-     */
-    public function onSearchCreateExpression(ExpressionBuilder $eb, string $term, ?string $language, ?Actor $actor, &$note_expr, &$actor_expr)
-    {
-        if (str_contains($term, ':')) {
-            $term = explode(':', $term);
-            if (Formatting::startsWith($term[0], 'note-')) {
-                switch ($term[0]) {
-                case 'note-local':
-                    $note_expr = $eb->eq('note.is_local', filter_var($term[1], \FILTER_VALIDATE_BOOLEAN));
-                    break;
-                case 'note-types':
-                case 'notes-include':
-                case 'note-filter':
-                    if (\is_null($note_expr)) {
-                        $note_expr = [];
-                    }
-                    if (array_intersect(explode(',', $term[1]), ['text', 'words']) !== []) {
-                        $note_expr[] = $eb->neq('note.content', null);
-                    } else {
-                        $note_expr[] = $eb->eq('note.content', null);
-                    }
-                    break;
-                case 'note-conversation':
-                    $note_expr = $eb->eq('note.conversation_id', (int) trim($term[1]));
-                    break;
-                case 'note-from':
-                case 'notes-from':
-                    $subscribed_expr = $eb->eq('subscription.subscriber_id', $actor->getId());
-                    $type_consts     = [];
-                    if ($term[1] === 'subscribed') {
-                        $type_consts = null;
-                    }
-                    foreach (explode(',', $term[1]) as $from) {
-                        if (str_starts_with($from, 'subscribed-')) {
-                            [, $type] = explode('-', $from);
-                            if (\in_array($type, ['actor', 'actors'])) {
-                                $type_consts = null;
-                            } else {
-                                $type_consts[] = \constant(Actor::class . '::' . mb_strtoupper($type));
-                            }
-                        }
-                    }
-                    if (\is_null($type_consts)) {
-                        $note_expr = $subscribed_expr;
-                    } elseif (!empty($type_consts)) {
-                        $note_expr = $eb->andX($subscribed_expr, $eb->in('note_actor.type', $type_consts));
-                    }
-                    break;
-                }
-            } elseif (Formatting::startsWith($term, 'actor-')) {
-                switch ($term[0]) {
-                    case 'actor-types':
-                    case 'actors-include':
-                    case 'actor-filter':
-                    case 'actor-local':
-                        if (\is_null($actor_expr)) {
-                            $actor_expr = [];
-                        }
-                        foreach (
-                            [
-                                Actor::PERSON => ['person', 'people'],
-                                Actor::GROUP => ['group', 'groups'],
-                                Actor::ORGANIZATION => ['org', 'orgs', 'organization', 'organizations', 'organisation', 'organisations'],
-                                Actor::BUSINESS => ['business', 'businesses'],
-                                Actor::BOT => ['bot', 'bots'],
-                            ] as $type => $match) {
-                            if (array_intersect(explode(',', $term[1]), $match) !== []) {
-                                $actor_expr[] = $eb->eq('actor.type', $type);
-                            } else {
-                                $actor_expr[] = $eb->neq('actor.type', $type);
-                            }
-                        }
-                        break;
-                }
-            }
-        } else {
-            $note_expr = $eb->contains('note.content', $term);
-        }
-        return Event::next;
-    }
 }

components/Feed/tests/Controller/FeedsTest.php

@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types = 1);
+
+// {{{ License
+
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social 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.
+//
+// GNU social 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 GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+// }}}
+
+namespace Component\Feed\tests\Controller;
+
+use App\Core\Router;
+use App\Util\GNUsocialTestCase;
+use Component\Feed\Controller\Feeds;
+use Jchook\AssertThrows\AssertThrows;
+
+class FeedsTest extends GNUsocialTestCase
+{
+    use AssertThrows;
+
+    public function testPublic()
+    {
+        // This calls static::bootKernel(), and creates a "client" that is acting as the browser
+        $client  = static::createClient();
+        $crawler = $client->request('GET', Router::url('feed_public'));
+        $this->assertResponseIsSuccessful();
+    }
+
+    public function testHome()
+    {
+        // This calls static::bootKernel(), and creates a "client" that is acting as the browser
+        $client  = static::createClient();
+        $crawler = $client->request('GET', Router::url('feed_home'));
+        $this->assertResponseStatusCodeSame(302);
+    }
+
+    // TODO: It would be nice to actually test whether the feeds are respecting scopes and spitting
+    // out the expected notes... The ActivityPub plugin have a somewhat obvious way of testing it so,
+    // for now, having that, might fill that need, let's see
+}

components/FreeNetwork/Controller/Feeds.php

@@ -34,7 +34,7 @@ declare(strict_types = 1);
 
 namespace Component\FreeNetwork\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use function App\Core\I18n\_m;
 use App\Util\Common;
 use Component\Collection\Util\Controller\FeedController;
@@ -51,10 +51,7 @@ class Feeds extends FeedController
     public function network(Request $request): array
     {
         Common::ensureLoggedIn();
-        $data = $this->query(
-            query: 'note-local:false',
-            language: Common::actor()?->getTopLanguage()?->getLocale(),
-        );
+        $data = $this->query('note-local:false');
         return [
             '_template'     => 'collection/notes.html.twig',
             'page_title'    => _m('Meteorites'),
@@ -71,6 +68,7 @@ class Feeds extends FeedController
     public function clique(Request $request): array
     {
         Common::ensureLoggedIn();
+        // TODO: maybe make this a Collection::query
         $notes = DB::dql(
             <<<'EOF'
                 SELECT n FROM \App\Entity\Note AS n
@@ -99,10 +97,7 @@ class Feeds extends FeedController
     public function federated(Request $request): array
     {
         Common::ensureLoggedIn();
-        $data = $this->query(
-            query: '',
-            language: Common::actor()?->getTopLanguage()?->getLocale(),
-        );
+        $data = $this->query('notes-all:yeah');
         return [
             '_template'     => 'collection/notes.html.twig',
             'page_title'    => _m('Galaxy'),

components/FreeNetwork/Entity/FreeNetworkActorProtocol.php

@@ -32,7 +32,7 @@ declare(strict_types = 1);
 
 namespace Component\FreeNetwork\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Entity\Actor;
 use Component\FreeNetwork\Util\Discovery;
@@ -125,7 +125,7 @@ class FreeNetworkActorProtocol extends Entity
         } else {
             $attributed_protocol->setProtocol($protocol);
         }
-        DB::wrapInTransaction(fn () => DB::persist($attributed_protocol));
+        DB::persist($attributed_protocol);
     }
 
     public static function canIActor(string $protocol, int|Actor $actor_id): bool

components/FreeNetwork/FreeNetwork.php

@@ -21,15 +21,14 @@ declare(strict_types = 1);
 
 namespace Component\FreeNetwork;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\GSFile;
 use App\Core\HTTPClient;
 use function App\Core\I18n\_m;
 use App\Core\Log;
 use App\Core\Modules\Component;
-use App\Core\Router\RouteLoader;
-use App\Core\Router\Router;
+use App\Core\Router;
 use App\Entity\Activity;
 use App\Entity\Actor;
 use App\Entity\LocalUser;
@@ -44,6 +43,7 @@ use App\Util\Exception\NicknameTakenException;
 use App\Util\Exception\NicknameTooLongException;
 use App\Util\Exception\NoSuchActorException;
 use App\Util\Exception\ServerException;
+use App\Util\Formatting;
 use App\Util\Nickname;
 use Component\FreeNetwork\Controller\Feeds;
 use Component\FreeNetwork\Controller\HostMeta;
@@ -53,6 +53,8 @@ use Component\FreeNetwork\Util\Discovery;
 use Component\FreeNetwork\Util\WebfingerResource;
 use Component\FreeNetwork\Util\WebfingerResource\WebfingerResourceActor;
 use Component\FreeNetwork\Util\WebfingerResource\WebfingerResourceNote;
+use Doctrine\Common\Collections\ExpressionBuilder;
+use EventResult;
 use Exception;
 use const PREG_SET_ORDER;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -76,8 +78,15 @@ class FreeNetwork extends Component
     public const OAUTH_ACCESS_TOKEN_REL  = 'http://apinamespace.org/oauth/access_token';
     public const OAUTH_REQUEST_TOKEN_REL = 'http://apinamespace.org/oauth/request_token';
     public const OAUTH_AUTHORIZE_REL     = 'http://apinamespace.org/oauth/authorize';
+    private static array $protocols      = [];
 
-    public function onAddRoute(RouteLoader $m): bool
+    public function onInitializeComponent(): EventResult
+    {
+        Event::handle('AddFreeNetworkProtocol', [&self::$protocols]);
+        return Event::next;
+    }
+
+    public function onAddRoute(Router $m): EventResult
     {
         // Feeds
         $m->connect('feed_network', '/feed/network', [Feeds::class, 'network']);
@@ -103,7 +112,7 @@ class FreeNetwork extends Component
         return Event::next;
     }
 
-    public function onCreateDefaultFeeds(int $actor_id, LocalUser $user, int &$ordering)
+    public function onCreateDefaultFeeds(int $actor_id, LocalUser $user, int &$ordering): EventResult
     {
         DB::persist(\App\Entity\Feed::create(['actor_id' => $actor_id, 'url' => Router::url($route = 'feed_network'), 'route' => $route, 'title' => _m('Meteorites'), 'ordering' => $ordering++]));
         DB::persist(\App\Entity\Feed::create(['actor_id' => $actor_id, 'url' => Router::url($route = 'feed_clique'), 'route' => $route, 'title' => _m('Planetary System'), 'ordering' => $ordering++]));
@@ -111,7 +120,7 @@ class FreeNetwork extends Component
         return Event::next;
     }
 
-    public function onStartGetProfileAcctUri(Actor $profile, &$acct): bool
+    public function onStartGetProfileAcctUri(Actor $profile, &$acct): EventResult
     {
         $wfr = new WebFingerResourceActor($profile);
         try {
@@ -139,7 +148,7 @@ class FreeNetwork extends Component
      * @throws NoSuchActorException
      * @throws ServerException
      */
-    public function onEndGetWebFingerResource(string $resource, ?WebfingerResource &$target = null, array $args = []): bool
+    public function onEndGetWebFingerResource(string $resource, ?WebfingerResource &$target = null, array $args = []): EventResult
     {
         // * Either we didn't find the profile, then we want to make
         //   the $profile variable null for clarity.
@@ -152,7 +161,7 @@ class FreeNetwork extends Component
             $parts = explode('@', mb_substr(urldecode($resource), 5)); // 5 is strlen of 'acct:'
             if (\count($parts) === 2) {
                 [$nick, $domain] = $parts;
-                if ($domain !== $_ENV['SOCIAL_DOMAIN']) {
+                if ($domain !== Common::config('site', 'server')) {
                     throw new ServerException(_m('Remote profiles not supported via WebFinger yet.'));
                 }
 
@@ -169,7 +178,7 @@ class FreeNetwork extends Component
                     // This means $resource is a valid url
                     $resource_parts = parse_url($resource);
                     // TODO: Use URLMatcher
-                    if ($resource_parts['host'] === $_ENV['SOCIAL_DOMAIN']) { // XXX: Common::config('site', 'server')) {
+                    if ($resource_parts['host'] === Common::config('site', 'server')) {
                         $str = $resource_parts['path'];
                         // actor_view_nickname
                         $renick = '/\/@(' . Nickname::DISPLAY_FMT . ')\/?/m';
@@ -215,7 +224,7 @@ class FreeNetwork extends Component
         return Event::next;
     }
 
-    public function onStartHostMetaLinks(array &$links): bool
+    public function onStartHostMetaLinks(array &$links): EventResult
     {
         foreach (Discovery::supportedMimeTypes() as $type) {
             $links[] = new XML_XRD_Element_Link(
@@ -235,8 +244,10 @@ class FreeNetwork extends Component
 
     /**
      * Add a link header for LRDD Discovery
+     *
+     * @param mixed $action
      */
-    public function onStartShowHTML($action): bool
+    public function onStartShowHTML($action): EventResult
     {
         if ($action instanceof ShowstreamAction) {
             $resource = $action->getTarget()->getUri();
@@ -249,13 +260,13 @@ class FreeNetwork extends Component
         return Event::next;
     }
 
-    public function onStartDiscoveryMethodRegistration(Discovery $disco): bool
+    public function onStartDiscoveryMethodRegistration(Discovery $disco): EventResult
     {
         $disco->registerMethod('\Component\FreeNetwork\Util\LrddMethod\LrddMethodWebfinger');
         return Event::next;
     }
 
-    public function onEndDiscoveryMethodRegistration(Discovery $disco): bool
+    public function onEndDiscoveryMethodRegistration(Discovery $disco): EventResult
     {
         $disco->registerMethod('\Component\FreeNetwork\Util\LrddMethod\LrddMethodHostMeta');
         $disco->registerMethod('\Component\FreeNetwork\Util\LrddMethod\LrddMethodLinkHeader');
@@ -267,7 +278,7 @@ class FreeNetwork extends Component
      * @throws ClientException
      * @throws ServerException
      */
-    public function onControllerResponseInFormat(string $route, array $accept_header, array $vars, ?Response &$response = null): bool
+    public function onControllerResponseInFormat(string $route, array $accept_header, array $vars, ?Response &$response = null): EventResult
     {
         if (!\in_array($route, ['freenetwork_hostmeta', 'freenetwork_hostmeta_format', 'freenetwork_webfinger', 'freenetwork_webfinger_format', 'freenetwork_ownerxrd'])) {
             return Event::next;
@@ -335,6 +346,7 @@ class FreeNetwork extends Component
      * @param string $preMention Character(s) that signals a mention ('@', '!'...)
      *
      * @return array the matching URLs (without @ or acct:) and each respective position in the given string
+     *
      * @example.com/mublog/user
      */
     public static function extractUrlMentions(string $text, string $preMention = '@'): array
@@ -366,9 +378,10 @@ class FreeNetwork extends Component
      * @param $mentions
      *
      * @return bool hook return value
+     *
      * @example.com/mublog/user
      */
-    public function onEndFindMentions(Actor $sender, string $text, array &$mentions): bool
+    public function onEndFindMentions(Actor $sender, string $text, array &$mentions): EventResult
     {
         $matches = [];
 
@@ -379,7 +392,7 @@ class FreeNetwork extends Component
             $actor = null;
 
             $resource_parts = explode($preMention, $target);
-            if ($resource_parts[1] === $_ENV['SOCIAL_DOMAIN']) { // XXX: Common::config('site', 'server')) {
+            if ($resource_parts[1] === Common::config('site', 'server')) {
                 $actor = LocalUser::getByPK(['nickname' => $resource_parts[0]])->getActor();
             } else {
                 Event::handle('FreeNetworkFindMentions', [$target, &$actor]);
@@ -408,7 +421,7 @@ class FreeNetwork extends Component
                 // This means $resource is a valid url
                 $resource_parts = parse_url($url);
                 // TODO: Use URLMatcher
-                if ($resource_parts['host'] === $_ENV['SOCIAL_DOMAIN']) { // XXX: Common::config('site', 'server')) {
+                if ($resource_parts['host'] === Common::config('site', 'server')) {
                     $str = $resource_parts['path'];
                     // actor_view_nickname
                     $renick = '/\/@(' . Nickname::DISPLAY_FMT . ')\/?/m';
@@ -487,25 +500,48 @@ class FreeNetwork extends Component
         return Event::next;
     }
 
+    /**
+     * @param Actor[] $targets
+     */
     public static function notify(Actor $sender, Activity $activity, array $targets, ?string $reason = null): bool
     {
-        $protocols = [];
-        Event::handle('AddFreeNetworkProtocol', [&$protocols]);
-        $delivered = [];
-        foreach ($protocols as $protocol) {
-            $protocol::freeNetworkDistribute($sender, $activity, $targets, $reason, $delivered);
+        foreach (self::$protocols as $protocol) {
+            $protocol::freeNetworkDistribute($sender, $activity, $targets, $reason);
         }
-        $failed_targets = array_udiff($targets, $delivered, fn (Actor $a, Actor $b): int => $a->getId() <=> $b->getId());
-        // TODO: Implement failed queues
         return false;
     }
 
-    public static function mentionToName(string $nickname, string $uri): string
+    public static function mentionTagToName(string $nickname, string $uri): string
     {
         return '@' . $nickname . '@' . parse_url($uri, \PHP_URL_HOST);
     }
 
-    public function onPluginVersion(array &$versions): bool
+    public static function groupTagToName(string $nickname, string $uri): string
+    {
+        return '!' . $nickname . '@' . parse_url($uri, \PHP_URL_HOST);
+    }
+
+    /**
+     * Add fediverse: query expression
+     * // TODO: adding WebFinger would probably be nice
+     *
+     * @param mixed $note_expr
+     * @param mixed $actor_expr
+     */
+    public function onCollectionQueryCreateExpression(ExpressionBuilder $eb, string $term, ?string $locale, ?Actor $actor, &$note_expr, &$actor_expr): EventResult
+    {
+        if (Formatting::startsWith($term, ['fediverse:'])) {
+            foreach (self::$protocols as $protocol) {
+                // 10 is strlen of `fediverse:`
+                if ($protocol::freeNetworkGrabRemote(mb_substr($term, 10))) {
+                    break;
+                }
+            }
+        }
+        return Event::next;
+    }
+
+    public function onPluginVersion(array &$versions): EventResult
     {
         $versions[] = [
             'name'     => 'WebFinger',

components/FreeNetwork/Util/WebfingerResource/WebfingerResourceActor.php

@@ -6,7 +6,7 @@ namespace Component\FreeNetwork\Util\WebfingerResource;
 
 use App\Core\Event;
 use App\Core\Log;
-use App\Core\Router\Router;
+use App\Core\Router;
 use App\Entity\Actor;
 use App\Util\Common;
 use Component\FreeNetwork\Exception\WebfingerReconstructionException;

components/Group/Controller/Group.php

@@ -23,154 +23,165 @@ declare(strict_types = 1);
 
 namespace Component\Group\Controller;
 
+use App\Core\ActorLocalRoles;
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\Controller;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Core\Log;
-use App\Core\UserRoles;
 use App\Entity as E;
 use App\Util\Common;
 use App\Util\Exception\ClientException;
+use App\Util\Exception\DuplicateFoundException;
+use App\Util\Exception\NicknameEmptyException;
+use App\Util\Exception\NicknameException;
+use App\Util\Exception\NicknameInvalidException;
+use App\Util\Exception\NicknameNotAllowedException;
+use App\Util\Exception\NicknameTakenException;
+use App\Util\Exception\NicknameTooLongException;
+use App\Util\Exception\NotFoundException;
 use App\Util\Exception\RedirectException;
+use App\Util\Exception\ServerException;
 use App\Util\Form\ActorForms;
 use App\Util\Nickname;
-use Component\Collection\Util\ActorControllerTrait;
-use Component\Collection\Util\Controller\FeedController;
 use Component\Group\Entity\GroupMember;
 use Component\Group\Entity\LocalGroup;
-use Component\Subscription\Entity\Subscription;
+use Component\Subscription\Entity\ActorSubscription;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\Request;
 
-class Group extends FeedController
+class Group extends Controller
 {
-    use ActorControllerTrait;
-    public function groupViewId(Request $request, int $id)
-    {
-        return $this->handleActorById(
-            $id,
-            fn ($actor) => [
-                '_template' => 'group/view.html.twig',
-                'actor'     => $actor,
-            ],
-        );
-    }
-
     /**
-     * View a group feed and give the option of creating it if it doesn't exist
+     * Page that allows an actor to create a new group
+     *
+     * @throws RedirectException
+     * @throws ServerException
+     *
+     * @return ControllerResultType
      */
-    public function groupViewNickname(Request $request, string $nickname)
+    public function groupCreate(Request $request): array
     {
-        Nickname::validate($nickname, which: Nickname::CHECK_LOCAL_GROUP); // throws
-        $group          = LocalGroup::getActorByNickname($nickname);
-        $actor          = Common::actor();
-        $subscribe_form = null;
-
-        if (\is_null($group)) {
-            if (!\is_null($actor)) {
-                $create_form = Form::create([
-                    ['create', SubmitType::class, ['label' => _m('Create this group')]],
-                ]);
-
-                $create_form->handleRequest($request);
-                if ($create_form->isSubmitted() && $create_form->isValid()) {
-                    Log::info(
-                        _m(
-                            'Actor id:{actor_id} nick:{actor_nick} created the group {nickname}',
-                            ['{actor_id}' => $actor->getId(), 'actor_nick' => $actor->getNickname(), 'nickname' => $nickname],
-                        ),
-                    );
-
-                    DB::persist($group = E\Actor::create([
-                        'nickname' => $nickname,
-                        'type'     => E\Actor::GROUP,
-                        'is_local' => true,
-                        'roles'    => UserRoles::BOT,
-                    ]));
-                    DB::persist(LocalGroup::create([
-                        'group_id' => $group->getId(),
-                        'nickname' => $nickname,
-                    ]));
-                    DB::persist(Subscription::create([
-                        'subscriber' => $group->getId(),
-                        'subscribed' => $group->getId(),
-                    ]));
-                    DB::persist(GroupMember::create([
-                        'group_id' => $group->getId(),
-                        'actor_id' => $actor->getId(),
-                        'is_admin' => true,
-                    ]));
-                    DB::flush();
-                    Cache::delete(E\Actor::cacheKeys($actor->getId())['subscriber']);
-                    Cache::delete(E\Actor::cacheKeys($actor->getId())['subscribed']);
-                    throw new RedirectException();
-                }
-
-                return [
-                    '_template'   => 'group/view.html.twig',
-                    'nickname'    => $nickname,
-                    'create_form' => $create_form->createView(),
-                ];
-            }
-        } else {
-            if (!\is_null($actor)
-                && \is_null(Cache::get(
-                    Subscription::cacheKeys($actor, $group)['subscribed'],
-                    fn () => DB::findOneBy('subscription', [
-                        'subscriber' => $actor->getId(),
-                        'subscribed' => $group->getId(),
-                    ], return_null: true),
-                ))
-            ) {
-                $subscribe_form = Form::create([['subscribe', SubmitType::class, ['label' => _m('Subscribe to this group')]]]);
-                $subscribe_form->handleRequest($request);
-                if ($subscribe_form->isSubmitted() && $subscribe_form->isValid()) {
-                    DB::persist(Subscription::create([
-                        'subscriber' => $actor->getId(),
-                        'subscribed' => $group->getId(),
-                    ]));
-                    DB::flush();
-                    Cache::delete(E\Actor::cacheKeys($group->getId())['subscriber']);
-                    Cache::delete(E\Actor::cacheKeys($actor->getId())['subscribed']);
-                    Cache::delete(Subscription::cacheKeys($actor, $group)['subscribed']);
-                }
-            }
+        if (\is_null($actor = Common::actor())) {
+            throw new RedirectException('security_login');
         }
 
-        $notes = !\is_null($group) ? DB::dql(
-            <<<'EOF'
-                select n from note n
-                    join activity a with n.id = a.object_id
-                    join group_inbox gi with a.id = gi.activity_id
-                where a.object_type = 'note' and gi.group_id = :group_id
-                order by a.created desc, a.id desc
-                EOF,
-            ['group_id' => $group->getId()],
-        ) : [];
+        $create_form = self::getGroupCreateForm($request, $actor);
 
         return [
-            '_template'      => 'group/view.html.twig',
-            'actor'          => $group,
-            'nickname'       => $group?->getNickname() ?? $nickname,
-            'notes'          => $notes,
-            'subscribe_form' => $subscribe_form?->createView(),
+            '_template'   => 'group/create.html.twig',
+            'create_form' => $create_form->createView(),
         ];
     }
 
-    public function groupSettings(Request $request, string $nickname)
+    /**
+     * Settings page for the group with the provided nickname, checks if the current actor can administrate given group
+     *
+     * @throws ClientException
+     * @throws DuplicateFoundException
+     * @throws NicknameEmptyException
+     * @throws NicknameException
+     * @throws NicknameInvalidException
+     * @throws NicknameNotAllowedException
+     * @throws NicknameTakenException
+     * @throws NicknameTooLongException
+     * @throws NotFoundException
+     * @throws ServerException
+     *
+     * @return ControllerResultType
+     */
+    public function groupSettings(Request $request, int $id): array
     {
-        $group = LocalGroup::getActorByNickname($nickname);
-        $actor = Common::actor();
-        if (!\is_null($group) && $actor->canAdmin($group)) {
+        $local_group = DB::findOneBy(LocalGroup::class, ['actor_id' => $id]);
+        $group_actor = $local_group->getActor();
+        $actor       = Common::actor();
+        if (!\is_null($group_actor) && $actor->canModerate($group_actor)) {
             return [
                 '_template'          => 'group/settings.html.twig',
-                'group'              => $group,
-                'personal_info_form' => ActorForms::personalInfo($request, $group)->createView(),
+                'group'              => $group_actor,
+                'personal_info_form' => ActorForms::personalInfo(request: $request, scope: $actor, target: $group_actor)->createView(),
                 'open_details_query' => $this->string('open'),
             ];
         } else {
-            throw new ClientException(_m('You do not have permission to edit settings for the group "{group}"', ['{group}' => $nickname]), code: 404);
+            throw new ClientException(_m('You do not have permission to edit settings for the group "{group}"', ['{group}' => $id]), code: 404);
         }
     }
+
+    /**
+     * Create a new Group FormInterface getter
+     *
+     * @throws RedirectException
+     * @throws ServerException
+     */
+    public static function getGroupCreateForm(Request $request, E\Actor $actor): FormInterface
+    {
+        $create_form = Form::create([
+            ['group_nickname', TextType::class, ['label' => _m('Group nickname')]],
+            ['group_type', ChoiceType::class, ['label' => _m('Type:'), 'multiple' => false, 'expanded' => false, 'choices' => [
+                _m('Group')        => 'group',
+                _m('Organisation') => 'organisation',
+            ]]],
+            ['group_scope', ChoiceType::class, ['label' => _m('Is this a private group:'), 'multiple' => false, 'expanded' => false, 'choices' => [
+                _m('No')  => 'public',
+                _m('Yes') => 'private',
+            ]]],
+            ['group_create', SubmitType::class, ['label' => _m('Create this group!')]],
+        ]);
+
+        $create_form->handleRequest($request);
+        if ($create_form->isSubmitted() && $create_form->isValid()) {
+            $data     = $create_form->getData();
+            $nickname = Nickname::normalize(
+                nickname: $data['group_nickname'],
+                check_already_used: true,
+                which: Nickname::CHECK_LOCAL_GROUP,
+                check_is_allowed: true,
+            );
+
+            $roles = ActorLocalRoles::VISITOR; // Can send direct messages to other actors
+
+            if ($data['group_scope'] === 'private') {
+                $roles |= ActorLocalRoles::PRIVATE_GROUP;
+            }
+
+            Log::info(
+                _m(
+                    'Actor id:{actor_id} nick:{actor_nick} created the ' . ($roles & ActorLocalRoles::PRIVATE_GROUP ? 'private' : 'public') . ' group {nickname}',
+                    ['{actor_id}' => $actor->getId(), 'actor_nick' => $actor->getNickname(), 'nickname' => $nickname],
+                ),
+            );
+
+            DB::persist($group = E\Actor::create([
+                'nickname' => $nickname,
+                'type'     => E\Actor::GROUP,
+                'is_local' => true,
+                'roles'    => $roles,
+            ]));
+            DB::persist(LocalGroup::create([
+                'actor_id' => $group->getId(),
+                'type'     => $data['group_type'],
+                'nickname' => $nickname,
+            ]));
+            DB::persist(ActorSubscription::create([
+                'subscriber_id' => $group->getId(),
+                'subscribed_id' => $group->getId(),
+            ]));
+            DB::persist(GroupMember::create([
+                'group_id' => $group->getId(),
+                'actor_id' => $actor->getId(),
+                // Group Owner
+                'roles' => ActorLocalRoles::OPERATOR | ActorLocalRoles::MODERATOR | ActorLocalRoles::PARTICIPANT | ActorLocalRoles::VISITOR,
+            ]));
+            DB::flush();
+            Cache::delete(E\Actor::cacheKeys($actor->getId())['subscribers']);
+            Cache::delete(E\Actor::cacheKeys($actor->getId())['subscribed']);
+
+            throw new RedirectException();
+        }
+        return $create_form;
+    }
 }

components/Group/Controller/GroupFeed.php

@@ -0,0 +1,140 @@
+<?php
+
+declare(strict_types = 1);
+
+// {{{ License
+
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social 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.
+//
+// GNU social 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 GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+// }}}
+
+namespace Component\Group\Controller;
+
+use App\Core\Cache;
+use App\Core\DB;
+use App\Core\Form;
+use function App\Core\I18n\_m;
+use App\Core\Router;
+use App\Entity\Actor;
+use App\Entity as E;
+use App\Util\Common;
+use App\Util\Exception\ClientException;
+use App\Util\Exception\ServerException;
+use App\Util\HTML\Heading;
+use Component\Collection\Util\Controller\FeedController;
+use Component\Group\Entity\LocalGroup;
+use Component\Subscription\Entity\ActorSubscription;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * @extends FeedController<\App\Entity\Note>
+ */
+class GroupFeed extends FeedController
+{
+    /**
+     * @throws ServerException
+     *
+     * @return ControllerResultType
+     */
+    public function groupView(Request $request, Actor $group): array
+    {
+        $actor          = Common::actor();
+        $subscribe_form = null;
+
+        if (!\is_null($actor)
+            && \is_null(Cache::get(
+                ActorSubscription::cacheKeys($actor, $group)['subscribed'],
+                fn () => DB::findOneBy('actor_subscription', [
+                    'subscriber_id' => $actor->getId(),
+                    'subscribed_id' => $group->getId(),
+                ], return_null: true),
+            ))
+        ) {
+            $subscribe_form = Form::create([['subscribe', SubmitType::class, ['label' => _m('Subscribe to this group')]]]);
+            $subscribe_form->handleRequest($request);
+            if ($subscribe_form->isSubmitted() && $subscribe_form->isValid()) {
+                DB::persist(ActorSubscription::create([
+                    'subscriber_id' => $actor->getId(),
+                    'subscribed_id' => $group->getId(),
+                ]));
+                DB::flush();
+                Cache::delete(E\Actor::cacheKeys($group->getId())['subscribers']);
+                Cache::delete(E\Actor::cacheKeys($actor->getId())['subscribed']);
+                Cache::delete(ActorSubscription::cacheKeys($actor, $group)['subscribed']);
+            }
+        }
+
+        $notes = DB::dql(<<<'EOF'
+            SELECT n FROM \App\Entity\Note AS n
+            WHERE n.id IN (
+                SELECT act.object_id FROM \App\Entity\Activity AS act
+                    WHERE act.object_type = 'note' AND act.id IN
+                        (SELECT att.activity_id FROM \Component\Notification\Entity\Notification AS att WHERE att.target_id = :id)
+                )
+            ORDER BY n.created DESC
+            EOF, ['id' => $group->getId()]);
+
+        return [
+            '_template'        => 'group/view.html.twig',
+            'actor'            => $group,
+            'nickname'         => $group->getNickname(),
+            'notes'            => $notes,
+            'notes_feed_title' => (new Heading(1, [], $group->getNickname() . '\'s feed')),
+            'subscribe_form'   => $subscribe_form?->createView(),
+        ];
+    }
+
+    /**
+     * @throws ClientException
+     * @throws ServerException
+     *
+     * @return ControllerResultType
+     */
+    public function groupViewId(Request $request, int $id): array
+    {
+        $group = Actor::getById($id);
+        if (\is_null($group) || !$group->isGroup()) {
+            throw new ClientException(_m('No such group.'), 404);
+        }
+        if ($group->getIsLocal()) {
+            return [
+                '_redirect' => Router::url('group_actor_view_nickname', ['nickname' => $group->getNickname()]),
+                'actor'     => $group,
+            ];
+        }
+        return $this->groupView($request, $group);
+    }
+
+    /**
+     * View a group feed by its nickname
+     *
+     * @param string $nickname The group's nickname to be shown
+     *
+     * @throws ClientException
+     * @throws ServerException
+     *
+     * @return ControllerResultType
+     */
+    public function groupViewNickname(Request $request, string $nickname): array
+    {
+        $group = LocalGroup::getActorByNickname($nickname);
+        if (\is_null($group)) {
+            throw new ClientException(_m('No such group.'), 404);
+        }
+        return $this->groupView($request, $group);
+    }
+}

components/Group/Entity/GroupAlias.php

@@ -1,100 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-// {{{ License
-// This file is part of GNU social - https://www.gnu.org/software/social
-//
-// GNU social 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.
-//
-// GNU social 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 GNU social.  If not, see <http://www.gnu.org/licenses/>.
-// }}}
-
-namespace Component\Group\Entity;
-
-use App\Core\Entity;
-use DateTimeInterface;
-
-/**
- * Entity for Group Alias
- *
- * @category  DB
- * @package   GNUsocial
- *
- * @author    Zach Copley <zach@status.net>
- * @copyright 2010 StatusNet Inc.
- * @author    Mikael Nordfeldth <mmn@hethane.se>
- * @copyright 2009-2014 Free Software Foundation, Inc http://www.fsf.org
- * @author    Hugo Sales <hugo@hsal.es>
- * @copyright 2020-2021 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
- */
-class GroupAlias extends Entity
-{
-    // {{{ Autocode
-    // @codeCoverageIgnoreStart
-    private string $alias;
-    private int $group_id;
-    private DateTimeInterface $modified;
-
-    public function setAlias(string $alias): self
-    {
-        $this->alias = mb_substr($alias, 0, 64);
-        return $this;
-    }
-
-    public function getAlias(): string
-    {
-        return $this->alias;
-    }
-
-    public function setGroupId(int $group_id): self
-    {
-        $this->group_id = $group_id;
-        return $this;
-    }
-
-    public function getGroupId(): int
-    {
-        return $this->group_id;
-    }
-
-    public function setModified(DateTimeInterface $modified): self
-    {
-        $this->modified = $modified;
-        return $this;
-    }
-
-    public function getModified(): DateTimeInterface
-    {
-        return $this->modified;
-    }
-
-    // @codeCoverageIgnoreEnd
-    // }}} Autocode
-
-    public static function schemaDef(): array
-    {
-        return [
-            'name'   => 'group_alias',
-            'fields' => [
-                'alias'    => ['type' => 'varchar',   'length' => 64, 'not null' => true, 'description' => 'additional nickname for the group'],
-                'group_id' => ['type' => 'int',       'foreign key' => true, 'target' => 'Group.id', 'multiplicity' => 'many to one', 'not null' => true, 'description' => 'group id which this is an alias of'],
-                'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
-            ],
-            'primary key' => ['alias'],
-            'indexes'     => [
-                'group_alias_group_id_idx' => ['group_id'],
-            ],
-        ];
-    }
-}

components/Group/Entity/GroupBlock.php

@@ -1,110 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-// {{{ License
-// This file is part of GNU social - https://www.gnu.org/software/social
-//
-// GNU social 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.
-//
-// GNU social 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 GNU social.  If not, see <http://www.gnu.org/licenses/>.
-// }}}
-
-namespace Component\Group\Entity;
-
-use App\Core\Entity;
-use DateTimeInterface;
-
-/**
- * Entity for Group Block
- *
- * @category  DB
- * @package   GNUsocial
- *
- * @author    Zach Copley <zach@status.net>
- * @copyright 2010 StatusNet Inc.
- * @author    Mikael Nordfeldth <mmn@hethane.se>
- * @copyright 2009-2014 Free Software Foundation, Inc http://www.fsf.org
- * @author    Hugo Sales <hugo@hsal.es>
- * @copyright 2020-2021 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
- */
-class GroupBlock extends Entity
-{
-    // {{{ Autocode
-    // @codeCoverageIgnoreStart
-    private int $group_id;
-    private int $blocked_actor;
-    private int $blocker_user;
-    private DateTimeInterface $modified;
-
-    public function setGroupId(int $group_id): self
-    {
-        $this->group_id = $group_id;
-        return $this;
-    }
-
-    public function getGroupId(): int
-    {
-        return $this->group_id;
-    }
-
-    public function setBlockedActor(int $blocked_actor): self
-    {
-        $this->blocked_actor = $blocked_actor;
-        return $this;
-    }
-
-    public function getBlockedActor(): int
-    {
-        return $this->blocked_actor;
-    }
-
-    public function setBlockerUser(int $blocker_user): self
-    {
-        $this->blocker_user = $blocker_user;
-        return $this;
-    }
-
-    public function getBlockerUser(): int
-    {
-        return $this->blocker_user;
-    }
-
-    public function setModified(DateTimeInterface $modified): self
-    {
-        $this->modified = $modified;
-        return $this;
-    }
-
-    public function getModified(): DateTimeInterface
-    {
-        return $this->modified;
-    }
-
-    // @codeCoverageIgnoreEnd
-    // }}} Autocode
-
-    public static function schemaDef(): array
-    {
-        return [
-            'name'   => 'group_block',
-            'fields' => [
-                'group_id'      => ['type' => 'int', 'foreign key' => true, 'target' => 'Group.id', 'multiplicity' => 'many to one', 'not null' => true, 'description' => 'group actor is blocked from'],
-                'blocked_actor' => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'actor that is blocked'],
-                'blocker_user'  => ['type' => 'int', 'foreign key' => true, 'target' => 'LocalUser.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'user making the block'],
-                'modified'      => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
-            ],
-            'primary key' => ['group_id', 'blocked_actor'],
-        ];
-    }
-}

components/Group/Entity/GroupInbox.php

@@ -1,103 +0,0 @@
-<?php
-
-declare(strict_types = 1);
-
-// {{{ License
-// This file is part of GNU social - https://www.gnu.org/software/social
-//
-// GNU social 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.
-//
-// GNU social 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 GNU social.  If not, see <http://www.gnu.org/licenses/>.
-// }}}
-
-namespace Component\Group\Entity;
-
-use App\Core\Entity;
-use DateTimeInterface;
-
-/**
- * Entity for Group's inbox
- *
- * @category  DB
- * @package   GNUsocial
- *
- * @author    Zach Copley <zach@status.net>
- * @copyright 2010 StatusNet Inc.
- * @author    Mikael Nordfeldth <mmn@hethane.se>
- * @copyright 2009-2014 Free Software Foundation, Inc http://www.fsf.org
- * @author    Hugo Sales <hugo@hsal.es>
- * @copyright 2020-2021 Free Software Foundation, Inc http://www.fsf.org
- * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
- */
-class GroupInbox extends Entity
-{
-    // {{{ Autocode
-    // @codeCoverageIgnoreStart
-    private int $group_id;
-    private int $activity_id;
-    private DateTimeInterface $created;
-
-    public function setGroupId(int $group_id): self
-    {
-        $this->group_id = $group_id;
-        return $this;
-    }
-
-    public function getGroupId(): int
-    {
-        return $this->group_id;
-    }
-
-    public function setActivityId(int $activity_id): self
-    {
-        $this->activity_id = $activity_id;
-        return $this;
-    }
-
-    public function getActivityId(): int
-    {
-        return $this->activity_id;
-    }
-
-    public function setCreated(DateTimeInterface $created): self
-    {
-        $this->created = $created;
-        return $this;
-    }
-
-    public function getCreated(): DateTimeInterface
-    {
-        return $this->created;
-    }
-
-    // @codeCoverageIgnoreEnd
-    // }}} Autocode
-
-    public static function schemaDef(): array
-    {
-        return [
-            'name'        => 'group_inbox',
-            'description' => 'Many-many table listing activities posted to a given group, or which groups a given activity was posted to',
-            'fields'      => [
-                'group_id'    => ['type' => 'int',      'foreign key' => true, 'target' => 'Group.id', 'multiplicity' => 'one to one', 'name' => 'group_inbox_group_id_fkey', 'not null' => true, 'description' => 'group receiving the activity'],
-                'activity_id' => ['type' => 'int',      'foreign key' => true, 'target' => 'Activity.id', 'multiplicity' => 'many to one', 'name' => 'group_inbox_activity_id_fkey', 'not null' => true, 'description' => 'activity received'],
-                'created'     => ['type' => 'datetime', 'not null' => true,    'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
-            ],
-            'primary key' => ['group_id', 'activity_id'],
-            'indexes'     => [
-                'group_inbox_activity_id_idx'                  => ['activity_id'],
-                'group_inbox_group_id_created_activity_id_idx' => ['group_id', 'created', 'activity_id'],
-                'group_inbox_created_idx'                      => ['created'],
-            ],
-        ];
-    }
-}

components/Group/Entity/GroupJoinQueue.php

@@ -76,7 +76,7 @@ class GroupJoinQueue extends Entity
             'description' => 'Holder for group join requests awaiting moderation.',
             'fields'      => [
                 'actor_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'many to one', 'name' => 'group_join_queue_actor_id_fkey', 'not null' => true, 'description' => 'remote or local actor making the request'],
-                'group_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Group.id',   'multiplicity' => 'many to one',   'name' => 'group_join_queue_group_id_fkey',   'not null' => true, 'description' => 'remote or local group to join, if any'],
+                'group_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Group.id', 'multiplicity' => 'many to one', 'name' => 'group_join_queue_group_id_fkey', 'not null' => true, 'description' => 'remote or local group to join, if any'],
             ],
             'primary key' => ['actor_id', 'group_id'],
             'indexes'     => [

components/Group/Entity/GroupMember.php

@@ -21,6 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Group\Entity;
 
+use App\Core\ActorLocalRoles;
 use App\Core\Entity;
 use DateTimeInterface;
 
@@ -44,8 +45,7 @@ class GroupMember extends Entity
     // @codeCoverageIgnoreStart
     private int $group_id;
     private int $actor_id;
-    private ?bool $is_admin = false;
-    private ?string $uri    = null;
+    private int $roles = ActorLocalRoles::VISITOR;
     private DateTimeInterface $created;
     private DateTimeInterface $modified;
 
@@ -71,26 +71,15 @@ class GroupMember extends Entity
         return $this->actor_id;
     }
 
-    public function setIsAdmin(?bool $is_admin): self
+    public function setRoles(int $roles): self
     {
-        $this->is_admin = $is_admin;
+        $this->roles = $roles;
         return $this;
     }
 
-    public function getIsAdmin(): ?bool
+    public function getRoles(): int
     {
-        return $this->is_admin;
-    }
-
-    public function setUri(?string $uri): self
-    {
-        $this->uri = \is_null($uri) ? null : mb_substr($uri, 0, 191);
-        return $this;
-    }
-
-    public function getUri(): ?string
-    {
-        return $this->uri;
+        return $this->roles;
     }
 
     public function setCreated(DateTimeInterface $created): self
@@ -123,18 +112,14 @@ class GroupMember extends Entity
         return [
             'name'   => 'group_member',
             'fields' => [
-                'group_id' => ['type' => 'int',       'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'group_member_group_id_fkey', 'not null' => true,  'description' => 'foreign key to group table'],
-                'actor_id' => ['type' => 'int',       'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'group_member_actor_id_fkey', 'not null' => true,  'description' => 'foreign key to actor table'],
-                'is_admin' => ['type' => 'bool',      'default' => false,    'description' => 'is this actor an admin?'],
-                'uri'      => ['type' => 'varchar',   'length' => 191,       'description' => 'universal identifier'],
-                'created'  => ['type' => 'datetime',  'not null' => true,    'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
-                'modified' => ['type' => 'timestamp', 'not null' => true,    'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
+                'group_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'group_member_group_id_fkey', 'not null' => true, 'description' => 'foreign key to group table'],
+                'actor_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'group_member_actor_id_fkey', 'not null' => true, 'description' => 'foreign key to actor table'],
+                'roles'    => ['type' => 'int', 'not null' => true, 'default' => ActorLocalRoles::VISITOR,  'description' => 'Bitmap of permissions this actor has'],
+                'created'  => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
+                'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
             ],
             'primary key' => ['group_id', 'actor_id'],
-            'unique keys' => [
-                'group_member_uri_key' => ['uri'],
-            ],
-            'indexes' => [
+            'indexes'     => [
                 'group_member_actor_id_idx'         => ['actor_id'],
                 'group_member_created_idx'          => ['created'],
                 'group_member_actor_id_created_idx' => ['actor_id', 'created'],

components/Group/Entity/LocalGroup.php

@@ -21,10 +21,16 @@ declare(strict_types = 1);
 
 namespace Component\Group\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
-
 use App\Entity\Actor;
+use App\Util\Exception\NicknameEmptyException;
+use App\Util\Exception\NicknameException;
+use App\Util\Exception\NicknameInvalidException;
+use App\Util\Exception\NicknameNotAllowedException;
+use App\Util\Exception\NicknameTakenException;
+use App\Util\Exception\NicknameTooLongException;
+use App\Util\Nickname;
 use DateTimeInterface;
 
 /**
@@ -45,33 +51,45 @@ class LocalGroup extends Entity
 {
     // {{{ Autocode
     // @codeCoverageIgnoreStart
-    private int $group_id;
-    private ?string $nickname = null;
+    private int $actor_id;
+    private string $nickname;
+    private string $type = 'group';
     private DateTimeInterface $created;
     private DateTimeInterface $modified;
 
-    public function setGroupId(int $group_id): self
+    public function setActorId(int $actor_id): self
     {
-        $this->group_id = $group_id;
+        $this->actor_id = $actor_id;
         return $this;
     }
 
-    public function getGroupId(): int
+    public function getActorId(): int
     {
-        return $this->group_id;
+        return $this->actor_id;
     }
 
-    public function setNickname(?string $nickname): self
+    public function setNickname(string $nickname): self
     {
-        $this->nickname = \is_null($nickname) ? null : mb_substr($nickname, 0, 64);
+        $this->nickname = mb_substr($nickname, 0, 64);
         return $this;
     }
 
-    public function getNickname(): ?string
+    public function getNickname(): string
     {
         return $this->nickname;
     }
 
+    public function setType(string $type): self
+    {
+        $this->type = mb_substr($type, 0, 64);
+        return $this;
+    }
+
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
     public function setCreated(DateTimeInterface $created): self
     {
         $this->created = $created;
@@ -99,19 +117,40 @@ class LocalGroup extends Entity
 
     public function getActor()
     {
-        return DB::find('actor', ['id' => $this->group_id]);
+        return DB::findOneBy(Actor::class, ['id' => $this->actor_id]);
     }
 
     public static function getByNickname(string $nickname): ?self
     {
-        $res = DB::findBy(self::class, ['nickname' => $nickname]);
-        return $res === [] ? null : $res[0];
+        return DB::findOneBy(self::class, ['nickname' => $nickname]);
     }
 
     public static function getActorByNickname(string $nickname): ?Actor
     {
-        $res = DB::findBy(Actor::class, ['nickname' => $nickname, 'type' => Actor::GROUP]);
-        return $res === [] ? null : $res[0];
+        return DB::findOneBy(Actor::class, ['nickname' => $nickname, 'type' => Actor::GROUP]);
+    }
+
+    /**
+     * Checks if desired nickname is allowed, and in case it is, it sets Actor's nickname cache to newly set nickname
+     *
+     * @param string $nickname Desired NEW nickname (do not use in local user creation)
+     *
+     * @throws NicknameEmptyException
+     * @throws NicknameException
+     * @throws NicknameInvalidException
+     * @throws NicknameNotAllowedException
+     * @throws NicknameTakenException
+     * @throws NicknameTooLongException
+     *
+     * @return $this
+     */
+    public function setNicknameSanitizedAndCached(string $nickname): self
+    {
+        $nickname = Nickname::normalize($nickname, check_already_used: true, which: Nickname::CHECK_LOCAL_GROUP, check_is_allowed: true);
+        $this->setNickname($nickname);
+        $this->getActor()->setNickname($nickname);
+        /// XXX: cache?
+        return $this;
     }
 
     public static function schemaDef(): array
@@ -120,12 +159,13 @@ class LocalGroup extends Entity
             'name'        => 'local_group',
             'description' => 'Record for a user group on the local site, with some additional info not in user_group',
             'fields'      => [
-                'group_id' => ['type' => 'int',      'foreign key' => true, 'target' => 'Group.id', 'multiplicity' => 'one to one', 'name' => 'local_group_group_id_fkey', 'not null' => true, 'description' => 'group represented'],
-                'nickname' => ['type' => 'varchar',  'length' => 64,        'description' => 'group represented'],
-                'created'  => ['type' => 'datetime', 'not null' => true,    'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
-                'modified' => ['type' => 'datetime', 'not null' => true,    'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
+                'actor_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Group.id', 'multiplicity' => 'one to one', 'name' => 'local_group_group_id_fkey', 'not null' => true, 'description' => 'group represented'],
+                'nickname' => ['type' => 'varchar', 'not null' => true, 'length' => 64, 'description' => 'group represented'],
+                'type'     => ['type' => 'varchar', 'not null' => true, 'default' => 'group', 'length' => 64, 'description' => 'Group or Organisation'],
+                'created'  => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
+                'modified' => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
             ],
-            'primary key' => ['group_id'],
+            'primary key' => ['actor_id'],
             'unique keys' => [
                 'local_group_nickname_key' => ['nickname'],
             ],

components/Group/Group.php

@@ -24,52 +24,67 @@ namespace Component\Group;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\Component;
-use App\Core\Router\RouteLoader;
-use App\Core\Router\Router;
+use App\Core\Router;
+use App\Entity\Activity;
 use App\Entity\Actor;
 use App\Util\Common;
 use App\Util\HTML;
 use App\Util\Nickname;
 use Component\Group\Controller as C;
 use Component\Group\Entity\LocalGroup;
-use Component\Tag\Controller\Tag as TagController;
+use Component\Notification\Notification;
+use EventResult;
 use Symfony\Component\HttpFoundation\Request;
 
 class Group extends Component
 {
-    public function onAddRoute(RouteLoader $r): bool
+    public function onAddRoute(Router $r): EventResult
     {
-        $r->connect(id: 'group_actor_view_id', uri_path: '/group/{id<\d+>}', target: [C\Group::class, 'groupViewId']);
-        $r->connect(id: 'group_actor_view_nickname', uri_path: '/!{nickname<' . Nickname::DISPLAY_FMT . '>}', target: [C\Group::class, 'groupViewNickname'], options: ['is_system_path' => false]);
-        $r->connect(id: 'group_settings', uri_path: '/!{nickname<' . Nickname::DISPLAY_FMT . '>}/settings', target: [C\Group::class, 'groupSettings'], options: ['is_system_path' => false]);
+        $r->connect(id: 'group_actor_view_id', uri_path: '/group/{id<\d+>}', target: [C\GroupFeed::class, 'groupViewId']);
+        $r->connect(id: 'group_actor_view_nickname', uri_path: '/!{nickname<' . Nickname::DISPLAY_FMT . '>}', target: [C\GroupFeed::class, 'groupViewNickname']);
+        $r->connect(id: 'group_create', uri_path: '/group/new', target: [C\Group::class, 'groupCreate']);
+        $r->connect(id: 'group_actor_settings', uri_path: '/group/{id<\d+>}/settings', target: [C\Group::class, 'groupSettings']);
         return Event::next;
     }
 
     /**
-     * Add an <a href=group_settings> to the profile card for groups, if the current actor can access them
+     * Enqueues a notification for an Actor (such as person or group) which means
+     * it shows up in their home feed and such.
+     *
+     * @param Actor[] $targets
      */
-    public function onAppendCardProfile(array $vars, array &$res): bool
+    public function onNewNotificationStart(Actor $sender, Activity $activity, array $targets = [], ?string $reason = null): EventResult
     {
-        $actor = Common::actor();
-        $group = $vars['actor'];
-        if (!\is_null($actor) && $group->isGroup() && $actor->canAdmin($group)) {
-            $url   = Router::url('group_settings', ['nickname' => $group->getNickname()]);
-            $res[] = HTML::html(['hr' => '', 'a' => ['attrs' => ['href' => $url, 'title' => _m('Edit group settings')], 'p' => _m('Group settings')]]);
+        foreach ($targets as $target) {
+            if ($target->isGroup()) {
+                // The Group announces to its subscribers
+                Notification::notify(
+                    sender: $target,
+                    activity: $activity,
+                    targets: $target->getSubscribers(),
+                    reason: $reason,
+                );
+            }
         }
+
         return Event::next;
     }
 
-    public function onPopulateSettingsTabs(Request $request, string $section, array &$tabs)
+    /**
+     * Add an <a href=group_actor_settings> to the profile card for groups, if the current actor can access them
+     *
+     * @param array<string, mixed> $vars
+     * @param string[]             $res
+     */
+    public function onAppendCardProfile(array $vars, array &$res): EventResult
     {
-        if ($section === 'profile' && $request->get('_route') === 'group_settings') {
-            $nickname = $request->get('nickname');
-            $group    = LocalGroup::getActorByNickname($nickname);
-            $tabs[]   = [
-                'title'      => 'Self tags',
-                'desc'       => 'Add or remove tags on this group',
-                'id'         => 'settings-self-tags',
-                'controller' => TagController::settingsSelfTags($request, $group, 'settings-self-tags-details'),
-            ];
+        $actor = Common::actor();
+        $group = $vars['actor'];
+        if (!\is_null($actor) && $group->isGroup()) {
+            if ($actor->canModerate($group)) {
+                $url   = Router::url('group_actor_settings', ['id' => $group->getId()]);
+                $res[] = HTML::html(['a' => ['attrs' => ['href' => $url, 'title' => _m('Edit group settings'), 'class' => 'profile-extra-actions'], _m('Group settings')]]);
+            }
         }
         return Event::next;
     }
@@ -79,27 +94,49 @@ class Group extends Component
      */
     private function getGroupFromContext(Request $request): ?Actor
     {
-        if (str_starts_with($request->get('_route'), 'group_actor_view_')) {
-            if (!\is_null($id = $request->get('id'))) {
-                return Actor::getById((int) $id);
-            } elseif (!\is_null($nickname = $request->get('nickname'))) {
-                return LocalGroup::getActorByNickname($nickname);
+        if (\is_array($request->get('post_note')) && \array_key_exists('_next', $request->get('post_note'))) {
+            $next       = parse_url($request->get('post_note')['_next']);
+            $match      = Router::match($next['path']);
+            $route      = $match['_route'];
+            $identifier = $match['id'] ?? $match['nickname'] ?? null;
+        } else {
+            $route      = $request->get('_route');
+            $identifier = $request->get('id') ?? $request->get('nickname');
+        }
+        if (str_starts_with($route, 'group_actor_view_')) {
+            switch ($route) {
+                case 'group_actor_view_nickname':
+                    return LocalGroup::getActorByNickname($identifier);
+                case 'group_actor_view_id':
+                    return Actor::getById((int) $identifier);
             }
         }
         return null;
     }
 
-    public function onPostingFillTargetChoices(Request $request, Actor $actor, array &$targets)
+    /**
+     * @param Actor[] $targets
+     */
+    public function onPostingFillTargetChoices(Request $request, Actor $actor, array &$targets): EventResult
     {
         $group = $this->getGroupFromContext($request);
         if (!\is_null($group)) {
-            $nick           = '!' . $group->getNickname();
+            $nick           = "!{$group->getNickname()}";
             $targets[$nick] = $group->getId();
         }
         return Event::next;
     }
 
-    public function onPostingGetContextActor(Request $request, Actor $actor, ?Actor $context_actor)
+    /**
+     * Indicates the context in which Posting's form is to be presented. Passing on $context_actor to Posting's
+     * onAppendRightPostingBlock event, the Group a given $actor is currently browsing.
+     *
+     * Makes it possible to automagically fill in the targets (aka the Group which this $request route is connected to)
+     * in the Posting's form.
+     *
+     * @param null|Actor $context_actor Actor group, if current route is part of an existing Group set of routes
+     */
+    public function onPostingGetContextActor(Request $request, Actor $actor, ?Actor &$context_actor): EventResult
     {
         $ctx = $this->getGroupFromContext($request);
         if (!\is_null($ctx)) {

components/Group/templates/cards/group/create_widget.html.twig

@@ -0,0 +1,10 @@
+<details class="frame-section section-details-title">
+    <summary class="details-summary-title">
+        <strong>
+            {% trans %}Create a group{% endtrans %}
+        </strong>
+    </summary>
+    <form method="POST" class="section-form">
+        {{ form(create_form) }}
+    </form>
+</details>

components/Group/templates/group/create.html.twig

@@ -0,0 +1,5 @@
+{% extends 'stdgrid.html.twig' %}
+
+{% block body %}
+    {{ form(create_form) }}
+{% endblock body %}

components/Group/templates/group/settings.html.twig

@@ -1,19 +1,13 @@
 {% extends 'base.html.twig' %}
 
-{% import 'settings/macros.html.twig' as macros %}
-
-{% block stylesheets %}
-    {{ parent() }}
-    <link rel="preload" href="{{ asset('assets/default_theme/css/pages/settings.css') }}" as="style" type="text/css">
-    <link rel="stylesheet" href="{{ asset('assets/default_theme/css/pages/settings.css') }}">
-{% endblock stylesheets %}
+{% import 'cards/macros/settings.html.twig' as macros %}
 
 {% block body %}
     <nav class='section-settings'>
-        <h2>Settings</h2>
+        <h1>Settings</h1>
         <ul>
             <li>
-                {% set profile_tabs = [{'title': 'Personal Info', 'desc': 'Nickname, Homepage, Bio, Self Tags and more.', 'id': 'settings-personal-info', 'form': personal_info_form}] %}
+                {% set profile_tabs = [{'title': 'Personal Info', 'desc': 'Nickname, Homepage, Bio and more.', 'id': 'settings-personal-info', 'form': personal_info_form}] %}
                 {% set profile_tabs = profile_tabs|merge(handle_event('PopulateSettingsTabs', app.request, 'profile')) %}
                 {{ macros.settings_details_container('Profile', 'Personal Information, Avatar and Profile', 'settings-profile-details', profile_tabs, _context) }}
             </li>

components/Group/templates/group/view.html.twig

@@ -1,50 +1,16 @@
-{% extends 'stdgrid.html.twig' %}
-{% import '/cards/note/view.html.twig' as noteView %}
+{% extends 'collection/notes.html.twig' %}
 
 {% set nickname = nickname|escape %}
 {% block title %}{{ nickname }}{% endblock %}
 
-{% block stylesheets %}
-    {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('assets/default_theme/css/pages/feeds.css') }}" type="text/css">
-{% endblock stylesheets %}
-
 {% block body %}
-    {% if subscribe_form is defined and subscribe_form is not null %}
-        {{ form(subscribe_form) }}
-    {% endif %}
-
     {% if actor is defined and actor is not null %}
         {% block profile_view %}
-            {% include 'cards/profile/view.html.twig' with { 'actor': actor } only %}
+            {% include 'cards/blocks/profile.html.twig' with { 'actor': actor } only %}
         {% endblock profile_view %}
-
-        <main class="feed" tabindex="0" role="feed">
-            <div class="h-feed hfeed notes">
-                {% if notes is defined and notes is not empty %}
-                    {% for conversation in notes %}
-                        {% block current_note %}
-                            {% if conversation is instanceof('array') %}
-                                {{ noteView.macro_note(conversation['note'], conversation['replies']) }}
-                            {% else %}
-                                {{ noteView.macro_note(conversation) }}
-                            {% endif %}
-                            <hr tabindex="0" title="{{ 'End of note and replies.' | trans }}">
-                        {% endblock current_note %}
-                    {% endfor %}
-                {% else %}
-                    <div id="empty-notes"><h1>{% trans %}No notes here.{% endtrans %}</h1></div>
-                {% endif %}
-            </div>
-        </main>
-        
-    {% else %}
-        <div class="section-padding section-widget">
-            <p>{% trans with { '%group%': nickname } %}The group <em>%group%</em> doesn't exist.{% endtrans %}</p>
-            {% if create_form is defined and create_form is not null %}
-                <p>{% trans %}Would you like to create it?{% endtrans %}</p>
-                {{ form(create_form) }}
-            {% endif %}
-        </div>
+        <hr>
+        {% if notes is defined %}
+            {{ parent() }}
+        {% endif %}
     {% endif %}
 {% endblock body %}

components/Group/tests/Entity/GroupTest.php

@@ -19,10 +19,12 @@ declare(strict_types = 1);
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
 // }}}
 
-namespace App\Tests\Entity;
+namespace Component\Group\tests\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
+use App\Entity\Actor;
 use App\Util\GNUsocialTestCase;
+use Component\Group\Entity\LocalGroup;
 use Jchook\AssertThrows\AssertThrows;
 
 class GroupTest extends GNUsocialTestCase
@@ -31,8 +33,8 @@ class GroupTest extends GNUsocialTestCase
 
     public function testGetActor()
     {
-        $group = DB::findOneBy('local_group', ['nickname' => 'taken_group']);
-        $actor = DB::findOneBy('actor', ['nickname' => 'taken_group']);
-        static::assertSame($actor, $group->getActor());
+        $group = DB::findOneBy(LocalGroup::class, ['nickname' => 'taken_public_group']);
+        $actor = DB::findOneBy(Actor::class, ['nickname' => 'taken_public_group']);
+        static::assertObjectEquals($actor, $group->getActor());
     }
 }

components/Language/Controller/Language.php

@@ -25,7 +25,7 @@ namespace Component\Language\Controller;
 
 use App\Core\Cache;
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Util\Common;
@@ -100,6 +100,8 @@ class Language extends Controller
      * @throws NoLoggedInUser
      * @throws RedirectException
      * @throws ServerException
+     *
+     * @return ControllerResultType
      */
     public function sortLanguages(Request $request): array
     {
@@ -134,12 +136,12 @@ class Language extends Controller
                 // Stay on same page, but force update and prevent resubmission
                 throw new RedirectException('settings_sort_languages');
             } else {
-                throw new RedirectException('settings', ['open' => 'account', '_fragment' => 'save_account_info_languages']);
+                throw new RedirectException('person_actor_settings', ['id' => $user->getId(), 'open' => 'settings-language-details', '_fragment' => 'settings-language-details']);
             }
         }
 
         return [
-            '_template' => 'settings/sort_languages.html.twig',
+            '_template' => 'language/sort.html.twig',
             'form'      => $form->createView(),
         ];
     }

components/Language/Entity/ActorLanguage.php

@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Language\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Entity\Actor;
 use App\Entity\LocalUser;
@@ -119,6 +119,9 @@ class ActorLanguage extends Entity
         ) ?: [Language::getByLocale(Common::config('site', 'language'))];
     }
 
+    /**
+     * @return int[]
+     */
     public static function getActorRelatedLanguagesIds(Actor $actor): array
     {
         return Cache::getList(

components/Language/Entity/Language.php

@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Language\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use function App\Core\I18n\_m;
 use App\Entity\Actor;
@@ -116,7 +116,7 @@ class Language extends Entity
         return Cache::getHashMapKey(
             map_key: 'languages-id',
             key: (string) $id,
-            calculate_map: fn () => F\reindex(DB::dql('select l from language l'), fn (self $l) => (string) $l->getId()),
+            calculate_map: fn () => F\reindex(DB::dql('SELECT l FROM \Component\Language\Entity\Language AS l'), fn (self $l) => (string) $l->getId()),
         );
     }
 
@@ -125,7 +125,7 @@ class Language extends Entity
         return Cache::getHashMapKey(
             'languages',
             $locale,
-            calculate_map: fn () => F\reindex(DB::dql('select l from language l'), fn (self $l) => $l->getLocale()),
+            calculate_map: fn () => F\reindex(DB::dql('SELECT l FROM \Component\Language\Entity\Language AS l'), fn (self $l) => $l->getLocale()),
         );
     }
 
@@ -134,16 +134,21 @@ class Language extends Entity
         return self::getById($note->getLanguageId());
     }
 
+    /**
+     * @return array<string, string>
+     */
     public static function getLanguageChoices(): array
     {
         $langs = Cache::getHashMap(
             'languages',
-            fn () => F\reindex(DB::dql('select l from language l'), fn (self $l) => $l->getLocale()),
+            fn () => F\reindex(DB::dql('SELECT l FROM \Component\Language\Entity\Language AS l'), fn (self $l) => $l->getLocale()),
         );
 
         return array_merge(...F\map(array_values($langs), fn ($l) => $l->toChoiceFormat()));
     }
 
+    /**
+     * @return array<string, string> */
     public function toChoiceFormat(): array
     {
         return [_m($this->getLongDisplay()) => $this->getLocale()];
@@ -152,6 +157,8 @@ class Language extends Entity
     /**
      * Get all the available languages as well as the languages $actor
      * prefers and are appropriate for posting in/to $context_actor
+     *
+     * @return array{array<string, string>, array<string, string>}
      */
     public static function getSortedLanguageChoices(?Actor $actor, ?Actor $context_actor, ?bool $use_short_display): array
     {

components/Language/Language.php

@@ -23,7 +23,7 @@ namespace Component\Language;
 
 use App\Core\Event;
 use App\Core\Modules\Component;
-use App\Core\Router\RouteLoader;
+use App\Core\Router;
 use App\Entity\Actor;
 use App\Entity\Note;
 use App\Util\Formatting;
@@ -33,18 +33,22 @@ use Component\Language\Entity\ActorLanguage;
 use Doctrine\Common\Collections\ExpressionBuilder;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
+use EventResult;
 use Functional as F;
 use Symfony\Component\HttpFoundation\Request;
 
 class Language extends Component
 {
-    public function onAddRoute(RouteLoader $r): bool
+    public function onAddRoute(Router $r): EventResult
     {
         $r->connect('settings_sort_languages', '/settings/sort_languages', [C\Language::class, 'sortLanguages']);
         return Event::next;
     }
 
-    public function onFilterNoteList(?Actor $actor, array &$notes, Request $request): bool
+    /**
+     * @param Note[] $notes
+     */
+    public function onFilterNoteList(?Actor $actor, array &$notes, Request $request): EventResult
     {
         if (\is_null($actor)) {
             return Event::next;
@@ -59,8 +63,11 @@ class Language extends Component
 
     /**
      * Populate $note_expr or $actor_expr with an expression to match a language
+     *
+     * @param mixed $note_expr
+     * @param mixed $actor_expr
      */
-    public function onSearchCreateExpression(ExpressionBuilder $eb, string $term, ?string $language, ?Actor $actor, &$note_expr, &$actor_expr): bool
+    public function onCollectionQueryCreateExpression(ExpressionBuilder $eb, string $term, ?string $locale, ?Actor $actor, &$note_expr, &$actor_expr): EventResult
     {
         $search_term = str_contains($term, ':') ? explode(':', $term)[1] : $term;
 
@@ -103,13 +110,27 @@ class Language extends Component
         return Event::next;
     }
 
-    public function onSearchQueryAddJoins(QueryBuilder &$note_qb, QueryBuilder &$actor_qb): bool
+    public function onCollectionQueryAddJoins(QueryBuilder &$note_qb, QueryBuilder &$actor_qb): EventResult
     {
-        $note_qb->leftJoin('Component\Language\Entity\Language', 'note_language', Expr\Join::WITH, 'note.language_id = note_language.id')
-            ->leftJoin('Component\Language\Entity\ActorLanguage', 'actor_language', Expr\Join::WITH, 'note.actor_id = actor_language.actor_id')
-            ->leftJoin('Component\Language\Entity\Language', 'note_actor_language', Expr\Join::WITH, 'note_actor_language.id = actor_language.language_id');
-        $actor_qb->leftJoin('Component\Language\Entity\ActorLanguage', 'actor_language', Expr\Join::WITH, 'actor.id = actor_language.actor_id')
-            ->leftJoin('Component\Language\Entity\Language', 'language', Expr\Join::WITH, 'actor_language.language_id = language.id');
+        $note_aliases = $note_qb->getAllAliases();
+        if (!\in_array('note_language', $note_aliases)) {
+            $note_qb->leftJoin('Component\Language\Entity\Language', 'note_language', Expr\Join::WITH, 'note.language_id = note_language.id');
+        }
+        if (!\in_array('actor_language', $note_aliases)) {
+            $note_qb->leftJoin('Component\Language\Entity\ActorLanguage', 'actor_language', Expr\Join::WITH, 'note.actor_id = actor_language.actor_id');
+        }
+        if (!\in_array('note_actor_language', $note_aliases)) {
+            $note_qb->leftJoin('Component\Language\Entity\Language', 'note_actor_language', Expr\Join::WITH, 'note_actor_language.id = actor_language.language_id');
+        }
+
+        $actor_aliases = $actor_qb->getAllAliases();
+        if (!\in_array('actor_language', $actor_aliases)) {
+            $actor_qb->leftJoin('Component\Language\Entity\ActorLanguage', 'actor_language', Expr\Join::WITH, 'actor.id = actor_language.actor_id');
+        }
+        if (!\in_array('language', $actor_aliases)) {
+            $actor_qb->leftJoin('Component\Language\Entity\Language', 'language', Expr\Join::WITH, 'actor_language.language_id = language.id');
+        }
+
         return Event::next;
     }
 }

components/Language/templates/language/sort.html.twig

@@ -1,8 +1,8 @@
 {% extends 'base.html.twig' %}
 
 {% block body %}
-  <div class="section-widget section-padding">
-    <h3>{{ 'Put the languages in the order you\'d like to see them in your language selection dropdown, when posting' | trans}}</h3>
-    {{ form(form) }}
-  </div>
+    <div class="frame-section frame-section-padding">
+        <h3>{% trans %}Put the languages in the order you'd like to see them in your language selection dropdown, when posting{% endtrans %}</h3>
+        {{ form(form) }}
+    </div>
 {% endblock %}

components/LeftPanel/Controller/EditFeeds.php

@@ -25,10 +25,10 @@ namespace Component\LeftPanel\Controller;
 
 use App\Core\Cache;
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
-use App\Core\Router\Router;
+use App\Core\Router;
 use App\Entity\Feed;
 use App\Util\Common;
 use App\Util\Exception\ClientException;
@@ -104,7 +104,6 @@ class EditFeeds extends Controller
                     $feed->setUrl($fd[$md5 . '-url']);
                     $feed->setOrdering($fd[$md5 . '-order']);
                     $feed->setTitle($fd[$md5 . '-title']);
-                    DB::merge($feed);
                 }
                 DB::flush();
                 Cache::delete($key);
@@ -119,7 +118,6 @@ class EditFeeds extends Controller
                     /** @var SubmitButton $remove_button */
                     $remove_button = $form->get($remove_id);
                     if ($remove_button->isClicked()) {
-                        // @phpstan-ignore-next-line -- Doesn't quite understand that _this_ $opts for the current $form_definitions does have 'data'
                         DB::remove(DB::getReference('feed', ['actor_id' => $user->getId(), 'url' => $opts['data']]));
                         DB::flush();
                         Cache::delete($key);

components/LeftPanel/LeftPanel.php

@@ -22,27 +22,34 @@ declare(strict_types = 1);
 namespace Component\LeftPanel;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\Component;
-use App\Core\Router\RouteLoader;
-use App\Core\Router\Router;
+use App\Core\Router;
 use App\Entity\Actor;
 use App\Entity\Feed;
 use App\Util\Exception\ClientException;
 use App\Util\Exception\NotFoundException;
 use Component\LeftPanel\Controller as C;
+use EventResult;
 
 class LeftPanel extends Component
 {
-    public function onAddRoute(RouteLoader $r): bool
+    public function onAddRoute(Router $r): EventResult
     {
         $r->connect('edit_feeds', '/edit-feeds', C\EditFeeds::class);
         return Event::next;
     }
 
-    public function onAppendFeed(Actor $actor, string $title, string $route, array $route_params)
+    /**
+     * @param array<string, string> $route_params
+     *
+     * @throws \App\Util\Exception\DuplicateFoundException
+     * @throws \App\Util\Exception\ServerException
+     * @throws ClientException
+     */
+    public function onAppendFeed(Actor $actor, string $title, string $route, array $route_params): EventResult
     {
         $cache_key = Feed::cacheKey($actor);
         $feeds     = Feed::getFeeds($actor);
@@ -67,17 +74,4 @@ class LeftPanel extends Component
             return Event::stop;
         }
     }
-
-    /**
-     * Output our dedicated stylesheet
-     *
-     * @param array $styles stylesheets path
-     *
-     * @return bool hook value; true means continue processing, false means stop
-     */
-    public function onEndShowStyles(array &$styles, string $route): bool
-    {
-        $styles[] = 'components/Left/assets/css/view.css';
-        return Event::next;
-    }
 }

components/LeftPanel/templates/left_panel/edit_feeds.html.twig

@@ -2,38 +2,52 @@
 
 {% block stylesheets %}
   {{ parent() }}
-  <link rel="stylesheet" href="{{ asset('assets/default_theme/css/pages/feeds.css') }}" type="text/css">
+  <link rel="stylesheet" href="{{ asset('assets/default_theme/pages/feeds.css') }}" type="text/css">
 {% endblock stylesheets %}
 
+{% macro edit_feeds_form_row(child) %}
+    <div class="form-row">
+        {{ form_label(child) }}
+        {{ form_widget(child) }}
+    </div>
+{% endmacro  %}
+
 {% block body %}
-  <div class="section-widget">
+  <div class="frame-section">
     <form class="section-form" action="{{ path('edit_feeds') }}" method="post">
-
-      <fieldset>
-        <legend class="section-form-legend">{{ "Edit feed navigation links" | trans }}</legend>
-
+        <h1 class="frame-section-title">{% trans %}Edit feed navigation links{% endtrans %}</h1>
         {# Since the form is not separated into individual groups, this happened #}
         {{ form_start(edit_feeds) }}
-        {% for child in edit_feeds.children %}
-          {% if 'row_url' in child.vars.block_prefixes %}
-            <div class="section-widget section-padding">
-            {{ form_label(child) }}
-            {{ form_widget(child) }}
-          {% elseif 'row_title' in child.vars.block_prefixes %}
-            {{ form_label(child) }}
-            {{ form_widget(child) }}
-          {% elseif 'row_order' in child.vars.block_prefixes %}
-            {{ form_label(child) }}
-            {{ form_widget(child) }}
-          {% elseif 'row_remove' in child.vars.block_prefixes %}
-            {{ form_label(child) }}
-            {{ form_widget(child) }}
-            </div>
-          {% endif %}
-        {% endfor %}
+        {{ form_errors(edit_feeds) }}
+        <section class="container-grid">
+            {% for child in edit_feeds.children %}
+                {% if 'row_url' in child.vars.block_prefixes %}
+                    <div class="frame-section frame-section-padding">
+                        {{ _self.edit_feeds_form_row(child) }}
+                {% elseif 'row_title' in child.vars.block_prefixes %}
+                        {{ _self.edit_feeds_form_row(child) }}
+                {% elseif 'row_order' in child.vars.block_prefixes %}
+                        {{ _self.edit_feeds_form_row(child) }}
+                {% elseif 'row_remove' in child.vars.block_prefixes %}
+                        {{ _self.edit_feeds_form_row(child) }}
+                    </div>
+                {% endif %}
+            {% endfor %}
+        </section>
+
+        <div class="form-row">
+            {{ form_row(edit_feeds.update_exisiting) }}
+            {{ form_row(edit_feeds.reset) }}
+        </div>
+
+        <hr>
+
+        <section class="frame-section frame-section-padding">
+            <h2>{% trans %}Add a new feed{% endtrans %}</h2>
+            {{ form_rest(edit_feeds) }}
+        </section>
         {{ form_end(edit_feeds) }}
 
-      </fieldset>
     </form>
 
   </div>

components/LeftPanel/templates/left_panel/view.html.twig

@@ -1,25 +1,24 @@
 {% block leftpanel %}
-    <label class="panel-left-icon" for="panel-left-toggle" aria-hidden="true"
-           tabindex="-1">{{ icon('menu', 'icon icon-left') | raw }}</label>
-    <input type="checkbox" id="panel-left-toggle" aria-hidden="true" tabindex="-1">
+<label class="panel-left-icon" for="toggle-panel-left" tabindex="-1">{{ icon('menu', 'icon icon-left') | raw }}</label>
+<a id="anchor-left-panel" class="anchor-hidden" tabindex="0" title="{% trans %}Press tab followed by a space to access left panel{% endtrans %}"></a>
+<input type="checkbox" id="toggle-panel-left" tabindex="0" title="{% trans %}Open left panel{% endtrans %}">
 
-    <section class="header-panel section-panel-left">
-        <a id="anchor-left-panel" class="anchor-hidden" title="{{ 'Press tab to access selected region!' | trans }}"></a>
-        <aside class="panel-content accessibility-target">
-            {% if app.user %}
-                <section class='section-widget section-padding' title="{{ 'Your profile information.' | trans }}">
-                    {% block profile_view %}{% include 'cards/profile/view.html.twig' with { actor: current_actor } %}{% endblock profile_view %}
-                    {{ block("profile_current_actor", "cards/navigation/view.html.twig") }}
-                </section>
-            {% else %}
-                <section>
-                    {{ block("profile_security", "cards/navigation/view.html.twig") }}
-                </section>
-            {% endif %}
+<aside class="section-panel section-panel-left">
+    <section class="panel-content accessibility-target">
+        {% if app.user %}
+            <section class='frame-section frame-section-padding' title="{% trans %}Your profile information{% endtrans %}">
+                {% block profile_view %}{% include 'cards/blocks/profile.html.twig' with { actor: current_actor } %}{% endblock profile_view %}
+                {{ block("profile_current_actor", "cards/blocks/navigation.html.twig") }}
+            </section>
+        {% else %}
+            <section>
+                {{ block("profile_security", "cards/blocks/navigation.html.twig") }}
+            </section>
+        {% endif %}
 
-            {{ block("feeds", "cards/navigation/view.html.twig") }}
+        {{ block("feeds", "cards/blocks/navigation.html.twig") }}
 
-            {{ block("footer", "cards/navigation/view.html.twig") }}
-        </aside>
+        {{ block("footer", "cards/blocks/navigation.html.twig") }}
     </section>
+</aside>
 {% endblock leftpanel %}

components/Link/Entity/Link.php

@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Link\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
 use App\Core\GSFile;
@@ -126,7 +126,7 @@ class Link extends Entity
     {
         if (Common::isValidHttpUrl($url)) {
             // If the URL is a local one, do not create a Link to it
-            if (parse_url($url, \PHP_URL_HOST) === $_ENV['SOCIAL_DOMAIN']) {
+            if (parse_url($url, \PHP_URL_HOST) === Common::config('site', 'server')) {
                 Log::warning("It was attempted to create a Link to a local location {$url}.");
                 // Forbidden
                 throw new InvalidArgumentException(message: "A Link can't point to a local location ({$url}), it must be a remote one", code: 400);

components/Link/Entity/NoteToLink.php

@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Link\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
 use DateTimeInterface;
@@ -85,15 +85,15 @@ class NoteToLink extends Entity
      * properties of $obj with the associative array $args. Doesn't
      * persist the result
      *
-     * @param null|mixed $obj
+     * @param (array{link_id: int, note_id: int} & array<string, mixed>) $args
      */
-    public static function create(array $args, $obj = null)
+    public static function create(array $args, bool $_delegated_call = false): static
     {
         $link = DB::find('link', ['id' => $args['link_id']]);
         $note = DB::find('note', ['id' => $args['note_id']]);
         Event::handle('NewLinkFromNote', [$link, $note]);
         $obj = new self();
-        return parent::create($args, $obj);
+        return parent::createOrUpdate(obj: $obj, args: $args);
     }
 
     public static function removeWhereNoteId(int $note_id): mixed

components/Link/Link.php

@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Component\Link;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Modules\Component;
 use App\Entity\Actor;
@@ -31,33 +31,50 @@ use App\Entity\Note;
 use App\Util\Common;
 use App\Util\HTML;
 use Component\Link\Entity\NoteToLink;
+use EventResult;
 use InvalidArgumentException;
 
 class Link extends Component
 {
     /**
-     * Extract URLs from $content and create the appropriate Link and NoteToLink entities
+     * Note that this persists both a Link and a NoteToLink
+     *
+     * @return array{ link: ?Entity\Link, note_to_link: ?NoteToLink }
      */
-    public function onProcessNoteContent(Note $note, string $content): bool
+    public static function maybeCreateLink(string $url, int $note_id): array
     {
+        try {
+            $link = Entity\Link::getOrCreate($url);
+            DB::persist($note_link = NoteToLink::create(['link_id' => $link->getId(), 'note_id' => $note_id]));
+            return ['link' => $link, 'note_to_link' => $note_link];
+        } catch (InvalidArgumentException) {
+            return ['link' => null, 'note_to_link' => null];
+        }
+    }
+
+    /**
+     * Extract URLs from $content and create the appropriate Link and NoteToLink entities
+     *
+     * @param array{ignoreLinks?: string[]} $process_note_content_extra_args
+     */
+    public function onProcessNoteContent(Note $note, string $content, string $content_type, array $process_note_content_extra_args = []): EventResult
+    {
+        $ignore = $process_note_content_extra_args['ignoreLinks'] ?? [];
         if (Common::config('attachments', 'process_links')) {
             $matched_urls = [];
-            // TODO: This solution to ignore mentions when content is in html is far from ideal
-            preg_match_all($this->getURLRegex(), preg_replace('#<a href="(.*?)" class="u-url mention">#', '', $content), $matched_urls);
+            preg_match_all($this->getURLRegex(), $content, $matched_urls);
             $matched_urls = array_unique($matched_urls[1]);
             foreach ($matched_urls as $match) {
-                try {
-                    $link_id = Entity\Link::getOrCreate($match)->getId();
-                    DB::persist(NoteToLink::create(['link_id' => $link_id, 'note_id' => $note->getId()]));
-                } catch (InvalidArgumentException) {
+                if (\in_array($match, $ignore)) {
                     continue;
                 }
+                self::maybeCreateLink($match, $note->getId());
             }
         }
         return Event::next;
     }
 
-    public function onRenderPlainTextNoteContent(string &$text): bool
+    public function onRenderPlainTextNoteContent(string &$text): EventResult
     {
         $text = $this->replaceURLs($text);
         return Event::next;
@@ -135,7 +152,12 @@ class Link extends Component
     public const URL_SCHEME_NO_DOMAIN          = 4;
     public const URL_SCHEME_COLON_COORDINATES  = 8;
 
-    public function URLSchemes($filter = null)
+    /**
+     * @param self::URL_SCHEME_COLON_COORDINATES|self::URL_SCHEME_COLON_DOUBLE_SLASH|self::URL_SCHEME_NO_DOMAIN|self::URL_SCHEME_SINGLE_COLON $filter
+     *
+     * @return string[]
+     */
+    public function URLSchemes(?int $filter = null): array
     {
         // TODO: move these to config
         $schemes = [
@@ -182,6 +204,7 @@ class Link extends Component
      * Intermediate callback for `replaceURLs()`, which helps resolve some
      * ambiguous link forms before passing on to the final callback.
      *
+     * @param string[] $matches
      * @param callable(string $text):  string $callback: return replacement text
      */
     private function callbackHelper(array $matches, callable $callback): string
@@ -261,7 +284,7 @@ class Link extends Component
         return HTML::html(['a' => ['attrs' => $attrs, $url]], options: ['indent' => false]);
     }
 
-    public function onNoteDeleteRelated(Note &$note, Actor $actor): bool
+    public function onNoteDeleteRelated(Note &$note, Actor $actor): EventResult
     {
         DB::wrapInTransaction(fn () => NoteToLink::removeWhereNoteId($note->getId()));
         return Event::next;

components/Notification/Controller/Feed.php

@@ -35,7 +35,7 @@ declare(strict_types = 1);
 namespace Component\Notification\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use function App\Core\I18n\_m;
 use App\Util\Common;
 use Symfony\Component\HttpFoundation\Request;
@@ -44,6 +44,8 @@ class Feed extends Controller
 {
     /**
      * Everything with attention to current user
+     *
+     * @return ControllerResultType
      */
     public function notifications(Request $request): array
     {
@@ -53,9 +55,9 @@ class Feed extends Controller
             WHERE n.id IN (
                 SELECT act.object_id FROM \App\Entity\Activity AS act
                     WHERE act.object_type = 'note' AND act.id IN
-                        (SELECT att.activity_id FROM \Component\Notification\Entity\Notification AS att WHERE att.target_id = :id)
+                        (SELECT att.activity_id FROM \Component\Notification\Entity\Notification AS att WHERE att.target_id = :target_id)
                 )
-            EOF, ['id' => $user->getId()]);
+            EOF, [':target_id' => $user->getId()]);
         return [
             '_template'     => 'collection/notes.html.twig',
             'page_title'    => _m('Notifications'),

components/Notification/Entity/Attention.php

@@ -0,0 +1,105 @@
+<?php
+
+declare(strict_types = 1);
+
+// {{{ License
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social 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.
+//
+// GNU social 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 GNU social.  If not, see <http://www.gnu.org/licenses/>.
+// }}}
+
+namespace Component\Notification\Entity;
+
+use App\Core\Entity;
+
+/**
+ * Entity for object attentions
+ *
+ * An attention is a form of persistent notification.
+ * It exists together and for as long as the object it belongs to.
+ * Creating an attention requires creating a Notification.
+ *
+ * @category  DB
+ * @package   GNUsocial
+ *
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2010 StatusNet Inc.
+ * @author    Mikael Nordfeldth <mmn@hethane.se>
+ * @copyright 2009-2014 Free Software Foundation, Inc http://www.fsf.org
+ * @author    Diogo Peralta Cordeiro <@diogo.site>
+ * @copyright 2021-2022 Free Software Foundation, Inc http://www.fsf.org
+ * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ */
+class Attention extends Entity
+{
+    // {{{ Autocode
+    // @codeCoverageIgnoreStart
+    private string $object_type;
+    private int $object_id;
+    private int $target_id;
+
+    public function setObjectType(string $object_type): self
+    {
+        $this->object_type = mb_substr($object_type, 0, 32);
+        return $this;
+    }
+
+    public function getObjectType(): string
+    {
+        return $this->object_type;
+    }
+
+    public function setObjectId(int $object_id): self
+    {
+        $this->object_id = $object_id;
+        return $this;
+    }
+
+    public function getObjectId(): int
+    {
+        return $this->object_id;
+    }
+
+    public function setTargetId(int $target_id): self
+    {
+        $this->target_id = $target_id;
+        return $this;
+    }
+
+    public function getTargetId(): int
+    {
+        return $this->target_id;
+    }
+
+    // @codeCoverageIgnoreEnd
+    // }}} Autocode
+
+    public static function schemaDef(): array
+    {
+        return [
+            'name'        => 'attention',
+            'description' => 'Attentions to actors (these are not mentions)',
+            'fields'      => [
+                'object_type' => ['type' => 'varchar',  'length' => 32,     'not null' => true, 'description' => 'the name of the table this object refers to'],
+                'object_id'   => ['type' => 'int',      'not null' => true, 'description' => 'id in the referenced table'],
+                'target_id'   => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'actor_id for feed receiver'],
+            ],
+            'primary key' => ['object_type', 'object_id', 'target_id'],
+            'indexes'     => [
+                'attention_object_id_idx' => ['object_id'],
+                'attention_target_id_idx' => ['target_id'],
+            ],
+        ];
+    }
+}

components/Notification/Entity/Notification.php

@@ -21,24 +21,24 @@ declare(strict_types = 1);
 
 namespace Component\Notification\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Entity\Activity;
 use App\Entity\Actor;
 use DateTimeInterface;
 
 /**
- * Entity for attentions
+ * Entity for Notifications
+ *
+ * A Notification when isolated is a form of transient notification.
+ * When together with a persistent form of notification such as attentions or mentions,
+ * it records that the target was notified - which avoids re-notifying upon objects reconstructions.
  *
  * @category  DB
  * @package   GNUsocial
  *
- * @author    Zach Copley <zach@status.net>
- * @copyright 2010 StatusNet Inc.
- * @author    Mikael Nordfeldth <mmn@hethane.se>
- * @copyright 2009-2014 Free Software Foundation, Inc http://www.fsf.org
- * @author    Hugo Sales <hugo@hsal.es>
- * @copyright 2020-2021 Free Software Foundation, Inc http://www.fsf.org
+ * @author    Diogo Peralta Cordeiro <@diogo.site>
+ * @copyright 2021-2022 Free Software Foundation, Inc http://www.fsf.org
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
 class Notification extends Entity
@@ -117,11 +117,11 @@ class Notification extends Entity
     /**
      * Pull the complete list of known activity context notifications for this activity.
      *
-     * @return array of integer actor ids (also group profiles)
+     * @return int[] actor ids (also group profiles)
      */
     public static function getNotificationTargetIdsByActivity(int|Activity $activity_id): array
     {
-        $notifications = DB::findBy('notification', ['activity_id' => \is_int($activity_id) ? $activity_id : $activity_id->getId()]);
+        $notifications = DB::findBy(self::class, ['activity_id' => \is_int($activity_id) ? $activity_id : $activity_id->getId()]);
         $targets       = [];
         foreach ($notifications as $notification) {
             $targets[] = $notification->getTargetId();
@@ -129,9 +129,24 @@ class Notification extends Entity
         return $targets;
     }
 
+    /**
+     * @return int[]
+     */
     public function getNotificationTargetsByActivity(int|Activity $activity_id): array
     {
-        return DB::findBy('actor', ['id' => $this->getNotificationTargetIdsByActivity($activity_id)]);
+        return DB::findBy(Actor::class, ['id' => $this->getNotificationTargetIdsByActivity($activity_id)]);
+    }
+
+    /**
+     * @return int[]
+     */
+    public static function getAllActivitiesTargetedAtActor(Actor $actor): array
+    {
+        return DB::dql(<<<'EOF'
+            SELECT act FROM \App\Entity\Activity AS act
+                WHERE act.object_type = 'note' AND act.id IN
+                    (SELECT att.activity_id FROM \Component\Notification\Entity\Notification AS att WHERE att.target_id = :id)
+            EOF, ['id' => $actor->getId()]);
     }
 
     public static function schemaDef(): array

components/Notification/Notification.php

@@ -21,29 +21,35 @@ declare(strict_types = 1);
 
 namespace Component\Notification;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Log;
 use App\Core\Modules\Component;
-use App\Core\Router\RouteLoader;
-use App\Core\Router\Router;
+use App\Core\Queue;
+use App\Core\Router;
 use App\Entity\Activity;
 use App\Entity\Actor;
 use App\Entity\LocalUser;
+use App\Util\Exception\ServerException;
 use Component\FreeNetwork\FreeNetwork;
-use Component\Group\Entity\GroupInbox;
 use Component\Notification\Controller\Feed;
+use EventResult;
+use Exception;
+use Throwable;
 
 class Notification extends Component
 {
-    public function onAddRoute(RouteLoader $m): bool
+    public function onAddRoute(Router $m): EventResult
     {
         $m->connect('feed_notifications', '/feed/notifications', [Feed::class, 'notifications']);
         return Event::next;
     }
 
-    public function onCreateDefaultFeeds(int $actor_id, LocalUser $user, int &$ordering)
+    /**
+     * @throws ServerException
+     */
+    public function onCreateDefaultFeeds(int $actor_id, LocalUser $user, int &$ordering): EventResult
     {
         DB::persist(\App\Entity\Feed::create([
             'actor_id' => $actor_id,
@@ -56,55 +62,127 @@ class Notification extends Component
     }
 
     /**
-     * Enqueues a notification for an Actor (user or group) which means
+     * Enqueues a notification for an Actor (such as person or group) which means
      * it shows up in their home feed and such.
+     * WARNING: It's highly advisable to have flushed any relevant objects before triggering this event.
+     *
+     * $targets should be of the shape:
+     * (int|Actor)[] // Prefer Actor whenever possible
+     * Example of $targets:
+     * [42, $actor_alice, $actor_bob] // Avoid repeating actors or ids
+     *
+     * @param Actor                      $sender   The one responsible for this activity, take care not to include it in targets
+     * @param Activity                   $activity The activity responsible for the object being given to known to targets
+     * @param non-empty-array<Actor|int> $targets  Attentions, Mentions, any other source. Should never be empty, you usually want to register an attention to every $sender->getSubscribers()
+     * @param null|string                $reason   An optional reason explaining why this notification exists
      */
-    public function onNewNotification(Actor $sender, Activity $activity, array $ids_already_known = [], ?string $reason = null): bool
+    public function onNewNotification(Actor $sender, Activity $activity, array $targets, ?string $reason = null): EventResult
     {
-        $targets = $activity->getNotificationTargets(ids_already_known: $ids_already_known, sender_id: $sender->getId());
-        $this->notify($sender, $activity, $targets, $reason);
+        // Ensure targets are all actor objects and unique
+        $effective_targets = [];
+        foreach ($targets as $target) {
+            if (\is_int($target)) {
+                $target_id     = $target;
+                $target_object = null;
+            } else {
+                $target_id     = $target->getId();
+                $target_object = $target;
+            }
+            if (!\array_key_exists(key: $target_id, array: $effective_targets)) {
+                $target_object ??= Actor::getById($target_id);
+                $effective_targets[$target_id] = $target_object;
+            }
+        }
+        unset($targets);
 
+        if (Event::handle('NewNotificationStart', [$sender, $activity, $effective_targets, $reason]) === Event::next) {
+            self::notify($sender, $activity, $effective_targets, $reason);
+        }
+
+        Event::handle('NewNotificationEnd', [$sender, $activity, $effective_targets, $reason]);
         return Event::next;
     }
 
     /**
-     * Bring given Activity to Targets's attention
+     * @param mixed[] $retry_args
      */
-    public function notify(Actor $sender, Activity $activity, array $targets, ?string $reason = null): bool
+    public function onQueueNotificationLocal(Actor $sender, Activity $activity, Actor $target, ?string $reason, array &$retry_args): EventResult
+    {
+        // TODO: use https://symfony.com/doc/current/notifier.html
+        return Event::stop;
+    }
+
+    /**
+     * @param Actor[] $targets
+     * @param mixed[] $retry_args
+     */
+    public function onQueueNotificationRemote(Actor $sender, Activity $activity, array $targets, ?string $reason, array &$retry_args): EventResult
+    {
+        if (FreeNetwork::notify($sender, $activity, $targets, $reason)) {
+            return Event::stop;
+        } else {
+            return Event::next;
+        }
+    }
+
+    /**
+     * Bring given Activity to Targets' knowledge.
+     * This will flush a Notification to DB.
+     *
+     * @param Actor[] $targets
+     *
+     * @return bool true if successful, false otherwise
+     */
+    public static function notify(Actor $sender, Activity $activity, array $targets, ?string $reason = null): bool
     {
         $remote_targets = [];
         foreach ($targets as $target) {
             if ($target->getIsLocal()) {
-                if ($target->isGroup()) {
-                    // FIXME: Make sure we check (for both local and remote) users are in the groups they send to!
-                    DB::persist(GroupInbox::create([
-                        'group_id'    => $target->getId(),
-                        'activity_id' => $activity->getId(),
-                    ]));
-                } else {
-                    if ($target->hasBlocked($activity->getActor())) {
-                        Log::info("Not saving reply to actor {$target->getId()} from sender {$sender->getId()} because of a block.");
+                if ($target->hasBlocked($author = $activity->getActor())) {
+                    Log::info("Not saving notification to actor {$target->getId()} from sender {$sender->getId()} because receiver blocked author {$author->getId()}.");
+                    continue;
+                }
+                if (Event::handle('NewNotificationShould', [$activity, $target]) === Event::next) {
+                    if ($sender->getId()           === $target->getId()
+                        || $activity->getActorId() === $target->getId()) {
+                        // The target already knows about this, no need to bother with a notification
                         continue;
                     }
                 }
-                if (Event::handle('NewNotificationShould', [$activity, $target]) === Event::next) {
-                    // TODO: use https://symfony.com/doc/current/notifier.html
-                    DB::persist(Entity\Notification::create([
-                        'activity_id' => $activity->getId(),
-                        'target_id'   => $target->getId(),
-                        'reason'      => $reason,
-                    ]));
-                }
+                Queue::enqueue(
+                    payload: [$sender, $activity, $target, $reason],
+                    queue: 'NotificationLocal',
+                    priority: true,
+                );
             } else {
                 // We have no authority nor responsibility of notifying remote actors of a remote actor's doing
                 if ($sender->getIsLocal()) {
                     $remote_targets[] = $target;
                 }
             }
+            // XXX: Unideal as in failures the rollback will leave behind a false notification,
+            // but most notifications (all) require flushing the objects first
+            // Should be okay as long as implementations bear this in mind
+            try {
+                DB::wrapInTransaction(fn () => DB::persist(Entity\Notification::create([
+                    'activity_id' => $activity->getId(),
+                    'target_id'   => $target->getId(),
+                    'reason'      => $reason,
+                ])));
+            } catch (Exception|Throwable $e) {
+                // We do our best not to record duplicate notifications, but it's not insane that can happen
+                Log::error('It was attempted to record an invalid notification!', [$e]);
+            }
         }
 
-        FreeNetwork::notify($sender, $activity, $remote_targets, $reason);
+        if ($remote_targets !== []) {
+            Queue::enqueue(
+                payload: [$sender, $activity, $remote_targets, $reason],
+                queue: 'NotificationRemote',
+                priority: false,
+            );
+        }
 
-        return Event::next;
+        return true;
     }
 }

components/Person/Controller/PersonFeed.php

@@ -0,0 +1,97 @@
+<?php
+
+declare(strict_types = 1);
+
+// {{{ License
+
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social 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.
+//
+// GNU social 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 GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+// }}}
+
+namespace Component\Person\Controller;
+
+use function App\Core\I18n\_m;
+use App\Core\Router;
+use App\Entity\Actor;
+use App\Entity as E;
+use App\Entity\LocalUser;
+use App\Util\Exception\ClientException;
+use App\Util\Exception\ServerException;
+use App\Util\HTML\Heading;
+use Component\Collection\Util\Controller\FeedController;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * @extends FeedController<\App\Entity\Note>
+ */
+class PersonFeed extends FeedController
+{
+    /**
+     * @throws ClientException
+     * @throws ServerException
+     *
+     * @return ControllerResultType
+     */
+    public function personViewId(Request $request, int $id): array
+    {
+        $person = Actor::getById($id);
+        if (\is_null($person) || !$person->isPerson()) {
+            throw new ClientException(_m('No such person.'), 404);
+        }
+        if ($person->getIsLocal()) {
+            return [
+                '_redirect' => Router::url('person_actor_view_nickname', ['nickname' => $person->getNickname()]),
+                'actor'     => $person,
+            ];
+        }
+        return $this->personView($request, $person);
+    }
+
+    /**
+     * View a group feed by its nickname
+     *
+     * @param string $nickname The group's nickname to be shown
+     *
+     * @throws ClientException
+     * @throws ServerException
+     *
+     * @return ControllerResultType
+     */
+    public function personViewNickname(Request $request, string $nickname): array
+    {
+        $user = LocalUser::getByNickname($nickname);
+        if (\is_null($user)) {
+            throw new ClientException(_m('No such person.'), 404);
+        }
+        $person = Actor::getById($user->getId());
+        return $this->personView($request, $person);
+    }
+
+    /**
+     * @return ControllerResultType
+     */
+    public function personView(Request $request, Actor $person): array
+    {
+        return [
+            '_template'        => 'actor/view.html.twig',
+            'actor'            => $person,
+            'nickname'         => $person->getNickname(),
+            'notes'            => E\Note::getAllNotesByActor($person),
+            'page_title'       => _m('{nickname}\'s profile', ['{nickname}' => $person->getNickname()]),
+            'notes_feed_title' => (new Heading(level: 2, classes: ['section-title'], text: 'Notes by ' . $person->getNickname())),
+        ];
+    }
+}

components/Person/Controller/PersonSettings.php

@@ -33,19 +33,26 @@ declare(strict_types = 1);
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
 
-namespace App\Controller;
+namespace Component\Person\Controller;
 
 // {{{ Imports
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Core\Log;
+use App\Entity\Actor;
 use App\Util\Common;
 use App\Util\Exception\AuthenticationException;
+use App\Util\Exception\NicknameEmptyException;
+use App\Util\Exception\NicknameInvalidException;
+use App\Util\Exception\NicknameNotAllowedException;
+use App\Util\Exception\NicknameTakenException;
+use App\Util\Exception\NicknameTooLongException;
 use App\Util\Exception\NoLoggedInUser;
+use App\Util\Exception\RedirectException;
 use App\Util\Exception\ServerException;
 use App\Util\Form\ActorArrayTransformer;
 use App\Util\Form\ActorForms;
@@ -64,27 +71,41 @@ use Symfony\Component\HttpFoundation\Request;
 
 // }}} Imports
 
-class UserPanel extends Controller
+class PersonSettings extends Controller
 {
     /**
      * Return main settings page forms
      *
-     * @throws Exception
+     * @throws \App\Util\Exception\ClientException
+     * @throws \App\Util\Exception\NicknameException
+     * @throws \Doctrine\DBAL\Exception
+     * @throws AuthenticationException
+     * @throws NicknameEmptyException
+     * @throws NicknameInvalidException
+     * @throws NicknameNotAllowedException
+     * @throws NicknameTakenException
+     * @throws NicknameTooLongException
+     * @throws NoLoggedInUser
+     * @throws RedirectException
+     * @throws ServerException
+     *
+     * @return ControllerResultType
      */
     public function allSettings(Request $request, LanguageController $language): array
     {
         // Ensure the user is logged in and retrieve Actor object for given user
-        $user  = Common::ensureLoggedIn();
-        $actor = $user->getActor();
+        $user = Common::ensureLoggedIn();
+        // Must be persisted
+        $actor = DB::findOneBy(Actor::class, ['id' => $user->getId()]);
 
-        $personal_form            = ActorForms::personalInfo($request, $actor);
+        $personal_form            = ActorForms::personalInfo(request: $request, scope: $actor, target: $actor);
         $email_form               = self::email($request);
         $password_form            = self::password($request);
         $notifications_form_array = self::notifications($request);
         $language_form            = $language->settings($request);
 
         return [
-            '_template'           => 'settings/base.html.twig',
+            '_template'           => 'person/settings.html.twig',
             'personal_info_form'  => $personal_form->createView(),
             'email_form'          => $email_form->createView(),
             'password_form'       => $password_form->createView(),
@@ -106,8 +127,22 @@ class UserPanel extends Controller
         // TODO Add support missing settings
 
         $form = Form::create([
-            ['outgoing_email', TextType::class, ['label' => _m('Outgoing email'), 'required' => false, 'help' => _m('Change the email we use to contact you')]],
-            ['incoming_email', TextType::class, ['label' => _m('Incoming email'), 'required' => false, 'help' => _m('Change the email you use to contact us (for posting, for instance)')]],
+            ['outgoing_email_sanitized', TextType::class,
+                [
+                    'label'    => _m('Outgoing email'),
+                    'required' => false,
+                    'help'     => _m('Change the email we use to contact you'),
+                    'data'     => $user->getOutgoingEmail() ?: '',
+                ],
+            ],
+            ['incoming_email_sanitized', TextType::class,
+                [
+                    'label'    => _m('Incoming email'),
+                    'required' => false,
+                    'help'     => _m('Change the email you use to contact us (for posting, for instance)'),
+                    'data'     => $user->getIncomingEmail() ?: '',
+                ],
+            ],
             ['save_email', SubmitType::class, ['label' => _m('Save email info')]],
         ]);
 
@@ -168,6 +203,12 @@ class UserPanel extends Controller
 
     /**
      * Local user notification settings tabbed panel
+     *
+     * @throws \Doctrine\DBAL\Exception
+     * @throws NoLoggedInUser
+     * @throws ServerException
+     *
+     * @return ControllerResultType[]
      */
     private static function notifications(Request $request): array
     {
@@ -177,7 +218,8 @@ class UserPanel extends Controller
         $columns   = Common::arrayRemoveKeys($schema->listTableColumns('user_notification_prefs'), ['user_id', 'transport', 'created', 'modified']);
         $form_defs = ['placeholder' => []];
         foreach ($columns as $name => $col) {
-            $type     = $col->getType();
+            $type = $col->getType();
+            // TODO: current value is never retrieved properly, form always gets defaults
             $val      = $type->convertToPHPValue($col->getDefault(), $platform);
             $type_str = $type->getName();
             $label    = str_replace('_', ' ', ucfirst($name));
@@ -205,7 +247,7 @@ class UserPanel extends Controller
                     $form_defs['placeholder'][$name] = [$name, CheckboxType::class, ['data' => $val, 'required' => false, 'label' => _m($labels[$name] ?? $label), 'help' => _m($help[$name])]];
                     break;
                 case Types::INTEGER:
-                    if ($name == 'target_actor_id') {
+                    if ($name === 'target_actor_id') {
                         $form_defs['placeholder'][$name] = [$name, TextType::class, ['data' => $val, 'required' => false, 'label' => _m($labels[$name]), 'help' => _m($help[$name])], 'transformer' => ActorArrayTransformer::class];
                     }
                     break;
@@ -213,7 +255,7 @@ class UserPanel extends Controller
                     // @codeCoverageIgnoreStart
                     Log::critical("Structure of table user_notification_prefs changed in a way not accounted to in notification settings ({$name}): " . $type_str);
                     throw new ServerException(_m('Internal server error'));
-                // @codeCoverageIgnoreEnd
+                    // @codeCoverageIgnoreEnd
             }
         }
 
@@ -233,16 +275,27 @@ class UserPanel extends Controller
             $tabbed_forms[$transport_name]['form']  = $form->createView();
 
             $form->handleRequest($request);
-            if ($form->isSubmitted() && $form->isValid()) {
+            // TODO: on submit, form reports a nonce error. Therefore, user changes are not applied
+            // errors: array:1 [▼
+            //    0 => Symfony\Component\Form\FormError {#2956 ▼
+            //      #messageTemplate: "Invalid nonce"
+            //      #messageParameters: []
+            //      #messagePluralization: null
+            //      -message: "Invalid nonce"
+            //      -cause: Symfony\Component\Security\Csrf\CsrfToken {#2955 ▶}
+            //      -origin: Symfony\Component\Form\Form {#2868}
+            //    }
+            //  ]
+            if ($form->isSubmitted()) {
                 $data = $form->getData();
                 unset($data['translation_domain']);
                 try {
-                    [$ent, $is_update] = UserNotificationPrefs::createOrUpdate(
+                    [$entity, $is_update] = UserNotificationPrefs::checkExistingAndCreateOrUpdate(
                         array_merge(['user_id' => $user->getId(), 'transport' => $transport_name], $data),
                         find_by_keys: ['user_id', 'transport'],
                     );
                     if (!$is_update) {
-                        DB::persist($ent);
+                        DB::persist($entity);
                     }
                     DB::flush();
                     // @codeCoverageIgnoreStart

components/Person/Person.php

@@ -19,23 +19,22 @@ declare(strict_types = 1);
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
 // }}}
 
-namespace Component\RightPanel;
+namespace Component\Person;
 
 use App\Core\Event;
 use App\Core\Modules\Component;
+use App\Core\Router;
+use App\Util\Nickname;
+use Component\Person\Controller as C;
+use EventResult;
 
-class RightPanel extends Component
+class Person extends Component
 {
-    /**
-     * Output our dedicated stylesheet
-     *
-     * @param array $styles stylesheets path
-     *
-     * @return bool hook value; true means continue processing, false means stop
-     */
-    public function onEndShowStyles(array &$styles, string $route): bool
+    public function onAddRoute(Router $r): EventResult
     {
-        $styles[] = 'components/Right/assets/css/view.css';
+        $r->connect(id: 'person_actor_view_id', uri_path: '/person/{id<\d+>}', target: [C\PersonFeed::class, 'personViewId']);
+        $r->connect(id: 'person_actor_view_nickname', uri_path: '/@{nickname<' . Nickname::DISPLAY_FMT . '>}', target: [C\PersonFeed::class, 'personViewNickname'], options: ['is_system_path' => false]);
+        $r->connect(id: 'person_actor_settings', uri_path: '/person/{id<\d+>}/settings', target: [C\PersonSettings::class, 'allSettings']);
         return Event::next;
     }
 }

components/Person/templates/person/settings.html.twig

@@ -1,18 +1,12 @@
 {% extends '/stdgrid.html.twig' %}
 
-{% import 'settings/macros.html.twig' as macros %}
+{% import 'cards/macros/settings.html.twig' as macros %}
 
-{% block title %}{{ 'Settings' | trans }}{% endblock %}
-
-{% block stylesheets %}
-    {{ parent() }}
-    <link rel="preload" href="{{ asset('assets/default_theme/css/pages/settings.css') }}" as="style" type="text/css">
-    <link rel="stylesheet" href="{{ asset('assets/default_theme/css/pages/settings.css') }}">
-{% endblock stylesheets %}
+{% block title %}{% trans %}Settings{% endtrans %}{% endblock %}
 
 {% block body %}
-    <nav class='section-widget section-padding'>
-        <h2 class="section-widget-title">Settings</h2>
+    <nav class='frame-section frame-section-padding'>
+        <h1 class="frame-section-title">Settings</h1>
         <ul>
             <li>
                 {% set profile_tabs = [{'title': 'Personal Info', 'desc': 'Nickname, Homepage, Bio and more.', 'id': 'settings-personal-info', 'form': personal_info_form}] %}
@@ -39,6 +33,10 @@
             <li>
                 {{ macros.settings_details_container('Notifications', 'Enable/disable notifications (Email, XMPP, Replies...)', 'notifications', tabbed_forms_notify, _context) }}
             </li>
+            <li>
+                {% set other_tabs = handle_event('PopulateSettingsTabs', app.request, 'api') %}
+                {{ macros.settings_details_container('API', 'API settings', 'settings-other-details', other_tabs, _context) }}
+            </li>
         </ul>
     </nav>
 {% endblock body %}

components/Person/tests/Controller/PersonSettingsTest.php

@@ -0,0 +1,145 @@
+<?php
+
+declare(strict_types = 1);
+
+// {{{ License
+
+// This file is part of GNU social - https://www.gnu.org/software/social
+//
+// GNU social 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.
+//
+// GNU social 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 GNU social.  If not, see <http://www.gnu.org/licenses/>.
+
+// }}}
+
+namespace Component\Person\tests\Controller;
+
+use App\Core\DB;
+use App\Core\Router;
+use App\Entity\LocalUser;
+use App\Util\GNUsocialTestCase;
+use Jchook\AssertThrows\AssertThrows;
+
+class PersonSettingsTest extends GNUsocialTestCase
+{
+    use AssertThrows;
+
+    public function testPersonalInfo()
+    {
+        $client = static::createClient();
+        $user   = DB::findOneBy(LocalUser::class, ['nickname' => 'form_personal_info_test_user']);
+        $client->loginUser($user);
+
+        $client->request('GET', Router::url('person_actor_settings', ['id' => $user->getId()]));
+        $this->assertResponseIsSuccessful();
+        $crawler = $client->submitForm('Save personal info', [
+            'save_personal_info[nickname]'  => 'form_test_user_new_nickname',
+            'save_personal_info[full_name]' => 'Form User',
+            'save_personal_info[homepage]'  => 'https://gnu.org',
+            'save_personal_info[bio]'       => 'I was born at a very young age',
+            'save_personal_info[location]'  => 'right here',
+            //            'save_personal_info[phone_number]' => '+351908555842', // from fakenumber.net
+        ]);
+        $changed_user = DB::findOneBy(LocalUser::class, ['id' => $user->getId()]);
+        $actor        = $changed_user->getActor();
+        static::assertSame('form_test_user_new_nickname', $changed_user->getNickname());
+        static::assertSame('form_test_user_new_nickname', $actor->getNickname());
+        static::assertSame('Form User', $actor->getFullName());
+        static::assertSame('https://gnu.org', $actor->getHomepage());
+        static::assertSame('I was born at a very young age', $actor->getBio());
+        static::assertSame('right here', $actor->getLocation());
+//        static::assertSame('908555842', $changed_user->getPhoneNumber()->getNationalNumber());
+    }
+
+    public function testEmail()
+    {
+        $client = static::createClient();
+        $user   = DB::findOneBy(LocalUser::class, ['nickname' => 'form_account_test_user']);
+        $client->loginUser($user);
+
+        $client->request('GET', Router::url('person_actor_settings', ['id' => $user->getId()]));
+        $this->assertResponseIsSuccessful();
+        $crawler = $client->submitForm('Save email info', [
+            'save_email[outgoing_email_sanitized]' => 'outgoing@provider.any',
+            'save_email[incoming_email_sanitized]' => 'incoming@provider.any',
+        ]);
+
+        $changed_user = DB::findOneBy(LocalUser::class, ['id' => $user->getId()]);
+        static::assertSame($changed_user->getOutgoingEmail(), 'outgoing@provider.any');
+        static::assertSame($changed_user->getIncomingEmail(), 'incoming@provider.any');
+    }
+
+    public function testCorrectPassword()
+    {
+        $client = static::createClient();
+        $user   = DB::findOneBy(LocalUser::class, ['nickname' => 'form_account_test_user']);
+        $client->loginUser($user);
+
+        $client->request('GET', Router::url('person_actor_settings', ['id' => $user->getId()]));
+        $this->assertResponseIsSuccessful();
+        $crawler = $client->submitForm('Save new password', [
+            'save_password[old_password]'     => 'foobar',
+            'save_password[password][first]'  => 'this is some test password',
+            'save_password[password][second]' => 'this is some test password',
+        ]);
+
+        $changed_user = DB::findOneBy(LocalUser::class, ['id' => $user->getId()]);
+        static::assertTrue($changed_user->checkPassword('this is some test password'));
+    }
+
+    public function testAccountWrongPassword()
+    {
+        $client = static::createClient();
+        $user   = DB::findOneBy(LocalUser::class, ['nickname' => 'form_account_test_user']);
+        $client->loginUser($user);
+
+        $client->request('GET', Router::url('person_actor_settings', ['id' => $user->getId()]));
+        $this->assertResponseIsSuccessful();
+        $crawler = $client->submitForm('Save new password', [
+            'save_password[old_password]'     => 'some wrong password',
+            'save_password[password][first]'  => 'this is some test password',
+            'save_password[password][second]' => 'this is some test password',
+        ]);
+        $this->assertResponseStatusCodeSame(500); // 401 in future
+        $this->assertSelectorTextContains('.stacktrace', 'AuthenticationException');
+    }
+
+// TODO: First actually implement this functionality
+//    public function testNotifications()
+//    {
+//        $client = static::createClient();
+//        $user   = DB::findOneBy(LocalUser::class, ['nickname' => 'form_account_test_user']);
+//        $client->loginUser($user);
+//
+//        $client->request('GET', Router::url('person_actor_settings', ['id' => $user->getId()]));
+//        $this->assertResponseIsSuccessful();
+//        $crawler = $client->submitForm('Save notification settings for Email', [
+//            'save_email[activity_by_subscribed]' => false,
+//            'save_email[mention]'                => true,
+//            'save_email[reply]'                  => false,
+//            'save_email[subscription]'           => true,
+//            'save_email[favorite]'               => false,
+//            'save_email[nudge]'                  => true,
+//            'save_email[dm]'                     => false,
+//            'save_email[enable_posting]'         => true,
+//        ]);
+//        $settings = DB::findOneBy('user_notification_prefs', ['user_id' => $user->getId(), 'transport' => 'email']);
+//        static::assertSame($settings->getActivityBySubscribed(), false);
+//        static::assertSame($settings->getMention(), true);
+//        static::assertSame($settings->getReply(), false);
+//        static::assertSame($settings->getSubscription(), true);
+//        static::assertSame($settings->getFavorite(), false);
+//        static::assertSame($settings->getNudge(), true);
+//        static::assertSame($settings->getDm(), false);
+//        static::assertSame($settings->getEnablePosting(), true);
+//    }
+}

components/Posting/Controller/Posting.php

@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Component\Posting\Controller;
+
+use App\Core;
+use App\Core\Controller;
+use App\Core\Event;
+use function App\Core\I18n\_m;
+use App\Core\VisibilityScope;
+use App\Util\Common;
+use App\Util\Exception\ClientException;
+use Component\Posting\Form;
+use Symfony\Component\HttpFoundation\File\Exception\FormSizeFileException;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+
+class Posting extends Controller
+{
+    public function onPost(Request $request): RedirectResponse
+    {
+        $actor = Common::actor();
+        $form  = Form\Posting::create($request);
+
+        $form->handleRequest($request);
+        if ($form->isSubmitted()) {
+            try {
+                if ($form->isValid()) {
+                    $data = $form->getData();
+                    Event::handle('PostingModifyData', [$request, $actor, &$data, $form]);
+
+                    if (empty($data['content']) && empty($data['attachments'])) {
+                        // TODO Display error: At least one of `content` and `attachments` must be provided
+                        throw new ClientException(_m('You must enter content or provide at least one attachment to post a note.'));
+                    }
+
+                    if (\is_null(VisibilityScope::tryFrom($data['visibility']))) {
+                        throw new ClientException(_m('You have selected an impossible visibility.'));
+                    }
+
+                    $extra_args = [];
+                    Event::handle('AddExtraArgsToNoteContent', [$request, $actor, $data, &$extra_args, $form]);
+
+                    if (\array_key_exists('in', $data) && $data['in'] !== 'public') {
+                        $target = $data['in'];
+                    }
+
+                    \Component\Posting\Posting::storeLocalNote(
+                        actor: $actor,
+                        content: $data['content'],
+                        content_type: $data['content_type'],
+                        locale: $data['language'],
+                        scope: VisibilityScope::from($data['visibility']),
+                        attentions: isset($target) ? [$target] : [],
+                        reply_to: \array_key_exists('reply_to_id', $data) ? $data['reply_to_id'] : null,
+                        attachments: $data['attachments'],
+                        process_note_content_extra_args: $extra_args,
+                    );
+
+                    return Core\Form::forceRedirect($form, $request);
+                }
+            } catch (FormSizeFileException $e) {
+                throw new ClientException(_m('Invalid file size given.'), previous: $e);
+            }
+        }
+        throw new ClientException(_m('Invalid form submission.'));
+    }
+}

components/Posting/Form/Posting.php

@@ -0,0 +1,103 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Component\Posting\Form;
+
+use App\Core\ActorLocalRoles;
+use App\Core\Event;
+use App\Core\Form;
+use function App\Core\I18n\_m;
+use App\Core\Router;
+use App\Core\VisibilityScope;
+use App\Entity\Actor;
+use App\Util\Common;
+use App\Util\Form\FormFields;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\FileType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextareaType;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Validator\Constraints\Length;
+
+class Posting
+{
+    public static function create(Request $request)
+    {
+        $actor = Common::actor();
+
+        $placeholder_strings = ['How are you feeling?', 'Have something to share?', 'How was your day?'];
+        Event::handle('PostingPlaceHolderString', [&$placeholder_strings]);
+        $placeholder = $placeholder_strings[array_rand($placeholder_strings)];
+
+        $initial_content = '';
+        Event::handle('PostingInitialContent', [&$initial_content]);
+
+        $available_content_types = [
+            _m('Plain Text') => 'text/plain',
+        ];
+        Event::handle('PostingAvailableContentTypes', [&$available_content_types]);
+
+        $in_targets = [];
+        Event::handle('PostingFillTargetChoices', [$request, $actor, &$in_targets]);
+
+        $context_actor = null;
+        Event::handle('PostingGetContextActor', [$request, $actor, &$context_actor]);
+
+        $form_params = [];
+        if (!empty($in_targets)) { // @phpstan-ignore-line
+            // Add "none" option to the first of choices
+            $in_targets = array_merge([_m('Public') => 'public'], $in_targets);
+            // Make the context actor the first In target option
+            if (!\is_null($context_actor)) {
+                foreach ($in_targets as $it_nick => $it_id) {
+                    if ($it_id === $context_actor->getId()) {
+                        unset($in_targets[$it_nick]);
+                        $in_targets = array_merge([$it_nick => $it_id], $in_targets);
+                        break;
+                    }
+                }
+            }
+            $form_params[] = ['in', ChoiceType::class, ['label' => _m('In:'), 'multiple' => false, 'expanded' => false, 'choices' => $in_targets]];
+        }
+
+        $visibility_options = [
+            _m('Public')    => VisibilityScope::EVERYWHERE->value,
+            _m('Local')     => VisibilityScope::LOCAL->value,
+            _m('Addressee') => VisibilityScope::ADDRESSEE->value,
+        ];
+        if (!\is_null($context_actor) && $context_actor->isGroup()) { // @phpstan-ignore-line currently an open bug. See https://web.archive.org/web/20220226131651/https://github.com/phpstan/phpstan/issues/6234
+            if ($actor->canModerate($context_actor)) {
+                if ($context_actor->getRoles() & ActorLocalRoles::PRIVATE_GROUP) {
+                    $visibility_options = array_merge([_m('Group') => VisibilityScope::GROUP->value], $visibility_options);
+                } else {
+                    $visibility_options[_m('Group')] = VisibilityScope::GROUP->value;
+                }
+            }
+        }
+        $form_params[] = ['visibility', ChoiceType::class, ['label' => _m('Visibility:'), 'multiple' => false, 'expanded' => false, 'choices' => $visibility_options]];
+
+        $form_params[] = ['content', TextareaType::class, ['label' => _m('Content:'), 'data' => $initial_content, 'attr' => ['placeholder' => _m($placeholder)], 'constraints' => [new Length(['max' => Common::config('site', 'text_limit')])]]];
+        $form_params[] = ['attachments', FileType::class, ['label' => _m('Attachments:'), 'multiple' => true, 'required' => false, 'invalid_message' => _m('Attachment not valid.')]];
+        $form_params[] = FormFields::language($actor, $context_actor, label: _m('Note language'), help: _m('The selected language will be federated and added as a lang attribute, preferred language can be set up in settings'));
+
+        if (\count($available_content_types) > 1) {
+            $form_params[] = ['content_type', ChoiceType::class,
+                [
+                    'label'   => _m('Text format:'), 'multiple' => false, 'expanded' => false,
+                    'data'    => $available_content_types[array_key_first($available_content_types)],
+                    'choices' => $available_content_types,
+                ],
+            ];
+        } else {
+            $form_params[] = ['content_type', HiddenType::class, ['data' => $available_content_types[array_key_first($available_content_types)]]];
+        }
+
+        Event::handle('PostingAddFormEntries', [$request, $actor, &$form_params]);
+
+        $form_params[] = ['post_note', SubmitType::class, ['label' => _m('Post')]];
+
+        return Form::create($form_params, form_options: ['action' => Router::url(\Component\Posting\Posting::route)]);
+    }
+}

components/Posting/Posting.php

@@ -23,17 +23,17 @@ declare(strict_types = 1);
 
 namespace Component\Posting;
 
-use App\Core\DB\DB;
+use App\Core\Cache;
+use App\Core\DB;
 use App\Core\Event;
-use App\Core\Form;
 use App\Core\GSFile;
 use function App\Core\I18n\_m;
 use App\Core\Modules\Component;
-use App\Core\Router\Router;
-use App\Core\Security;
+use App\Core\Router;
 use App\Core\VisibilityScope;
 use App\Entity\Activity;
 use App\Entity\Actor;
+use App\Entity\LocalUser;
 use App\Entity\Note;
 use App\Util\Common;
 use App\Util\Exception\BugFoundException;
@@ -41,178 +41,171 @@ use App\Util\Exception\ClientException;
 use App\Util\Exception\DuplicateFoundException;
 use App\Util\Exception\RedirectException;
 use App\Util\Exception\ServerException;
-use App\Util\Form\FormFields;
 use App\Util\Formatting;
+use App\Util\HTML;
 use Component\Attachment\Entity\ActorToAttachment;
+use Component\Attachment\Entity\Attachment;
 use Component\Attachment\Entity\AttachmentToNote;
 use Component\Conversation\Conversation;
 use Component\Language\Entity\Language;
-use Functional as F;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\FileType;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-use Symfony\Component\HttpFoundation\File\Exception\FormSizeFileException;
+use Component\Notification\Entity\Attention;
+use EventResult;
+use Symfony\Component\Form\FormInterface;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
-use Symfony\Component\Validator\Constraints\Length;
 
 class Posting extends Component
 {
+    public const route = 'posting_form_action';
+
+    public function onAddRoute(Router $r): EventResult
+    {
+        $r->connect(self::route, '/form/posting', Controller\Posting::class);
+        return Event::next;
+    }
+
     /**
      * HTML render event handler responsible for adding and handling
      * the result of adding the note submission form, only if a user is logged in
      *
+     * @param array{post_form?: FormInterface} $res
+     *
+     * @throws BugFoundException
      * @throws ClientException
+     * @throws DuplicateFoundException
      * @throws RedirectException
      * @throws ServerException
      */
-    public function onAppendRightPostingBlock(Request $request, array &$res): bool
+    public function onAddMainRightPanelBlock(Request $request, array &$res): EventResult
     {
-        if (\is_null($user = Common::user())) {
+        if (\is_null($user = Common::user()) || preg_match('(feed|conversation|group|view)', $request->get('_route')) === 0) {
             return Event::next;
         }
 
-        $actor    = $user->getActor();
-        $actor_id = $user->getId();
-
-        $placeholder_strings = ['How are you feeling?', 'Have something to share?', 'How was your day?'];
-        Event::handle('PostingPlaceHolderString', [&$placeholder_strings]);
-        $placeholder = $placeholder_strings[array_rand($placeholder_strings)];
-
-        $initial_content = '';
-        Event::handle('PostingInitialContent', [&$initial_content]);
-
-        $available_content_types = [
-            _m('Plain Text') => 'text/plain',
-        ];
-        Event::handle('PostingAvailableContentTypes', [&$available_content_types]);
-
-        $in_targets = [];
-        Event::handle('PostingFillTargetChoices', [$request, $actor, &$in_targets]);
-
-        $context_actor = null;
-        Event::handle('PostingGetContextActor', [$request, $actor, &$context_actor]);
-
-        $form_params = [];
-        if (!empty($in_targets)) { // @phpstan-ignore-line
-            $form_params[] = ['in', ChoiceType::class, ['label' => _m('In:'), 'multiple' => false, 'expanded' => false, 'choices' => $in_targets]];
-        }
-
-        // TODO: if in group page, add GROUP visibility to the choices.
-        $form_params[] = ['visibility', ChoiceType::class, ['label' => _m('Visibility:'), 'multiple' => false, 'expanded' => false, 'data' => 'public', 'choices' => [
-            _m('Public')    => VisibilityScope::EVERYWHERE->value,
-            _m('Local')     => VisibilityScope::LOCAL->value,
-            _m('Addressee') => VisibilityScope::ADDRESSEE->value,
-        ]]];
-        $form_params[] = ['content', TextareaType::class, ['label' => _m('Content:'), 'data' => $initial_content, 'attr' => ['placeholder' => _m($placeholder)], 'constraints' => [new Length(['max' => Common::config('site', 'text_limit')])]]];
-        $form_params[] = ['attachments', FileType::class, ['label' => _m('Attachments:'), 'multiple' => true, 'required' => false, 'invalid_message' => _m('Attachment not valid.')]];
-        $form_params[] = FormFields::language($actor, $context_actor, label: _m('Note language'), help: _m('The selected language will be federated and added as a lang attribute, preferred language can be set up in settings'));
-
-        if (\count($available_content_types) > 1) {
-            $form_params[] = ['content_type', ChoiceType::class,
-                [
-                    'label'   => _m('Text format:'), 'multiple' => false, 'expanded' => false,
-                    'data'    => $available_content_types[array_key_first($available_content_types)],
-                    'choices' => $available_content_types,
-                ],
-            ];
-        }
-
-        Event::handle('PostingAddFormEntries', [$request, $actor, &$form_params]);
-
-        $form_params[] = ['post_note', SubmitType::class, ['label' => _m('Post')]];
-        $form          = Form::create($form_params);
-
-        $form->handleRequest($request);
-        if ($form->isSubmitted()) {
-            try {
-                if ($form->isValid()) {
-                    $data = $form->getData();
-                    Event::handle('PostingModifyData', [$request, $actor, &$data, $form_params, $form]);
-
-                    if (empty($data['content']) && empty($data['attachments'])) {
-                        // TODO Display error: At least one of `content` and `attachments` must be provided
-                        throw new ClientException(_m('You must enter content or provide at least one attachment to post a note.'));
-                    }
-
-                    if (\is_null(VisibilityScope::tryFrom($data['visibility']))) {
-                        throw new ClientException(_m('You have selected an impossible visibility.'));
-                    }
-
-                    $content_type = $data['content_type'] ?? $available_content_types[array_key_first($available_content_types)];
-                    $extra_args   = [];
-                    Event::handle('AddExtraArgsToNoteContent', [$request, $actor, $data, &$extra_args, $form_params, $form]);
-
-                    self::storeLocalNote(
-                        actor: $user->getActor(),
-                        content: $data['content'],
-                        content_type: $content_type,
-                        language: $data['language'],
-                        scope: VisibilityScope::from($data['visibility']),
-                        target: $data['in'] ?? $context_actor,
-                        reply_to_id: $data['reply_to_id'],
-                        attachments: $data['attachments'],
-                        process_note_content_extra_args: $extra_args,
-                    );
-
-                    try {
-                        if ($request->query->has('from')) {
-                            $from = $request->query->get('from');
-                            if (str_contains($from, '#')) {
-                                [$from, $fragment] = explode('#', $from);
-                            }
-                            Router::match($from);
-                            throw new RedirectException(url: $from . (isset($fragment) ? '#' . $fragment : ''));
-                        }
-                    } catch (ResourceNotFoundException $e) {
-                        // continue
-                    }
-                    throw new RedirectException();
-                }
-            } catch (FormSizeFileException $e) {
-                throw new ClientException(_m('Invalid file size given'), previous: $e);
-            }
-        }
-
-        $res['post_form'] = $form->createView();
+        $res['post_form'] = Form\Posting::create($request)->createView();
 
         return Event::next;
     }
 
+    /**
+     * @param Actor                $actor        The Actor responsible for the creation of this Note
+     * @param null|string          $content      The raw text content
+     * @param string               $content_type Indicating one of the various supported content format (Plain Text, Markdown, LaTeX...)
+     * @param null|string          $locale       Note's written text language, set by the default Actor language or upon filling
+     * @param null|VisibilityScope $scope        The visibility of this Note
+     * @param Actor[]|int[]        $attentions   Actor|int[]: In Group/To Person or Bot, registers an attention between note and target
+     * @param null|int|Note        $reply_to     The soon-to-be Note parent's id, if it's a Reply itself
+     * @param UploadedFile[]       $attachments  UploadedFile[] to be stored as GSFiles associated to this note
+     * @param array<array{Attachment, string}> $processed_attachments           Array of [Attachment, Attachment's name][] to be associated to this $actor and Note
+     * @param array{note?: Note, content?: string, content_type?: string, extra_args?: array<string, mixed>} $process_note_content_extra_args Extra arguments for the event ProcessNoteContent
+     * @param bool                                                                                           $flush_and_notify                True if the newly created Note activity should be passed on as a Notification
+     * @param null|string                                                                                    $rendered                        The Note's content post RenderNoteContent event, which sanitizes and processes the raw content sent
+     * @param string                                                                                         $source                          The source of this Note
+     *
+     * @throws ClientException
+     * @throws DuplicateFoundException
+     * @throws ServerException
+     *
+     * @return array{\App\Entity\Activity, \App\Entity\Note, array<int, \App\Entity\Actor>}
+     */
+    public static function storeLocalArticle(
+        Actor $actor,
+        ?string $content,
+        string $content_type,
+        ?string $locale = null,
+        ?VisibilityScope $scope = null,
+        array $attentions = [],
+        null|int|Note $reply_to = null,
+        array $attachments = [],
+        array $processed_attachments = [],
+        array $process_note_content_extra_args = [],
+        bool $flush_and_notify = true,
+        ?string $rendered = null,
+        string $source = 'web',
+        ?string $title = null,
+    ): array {
+        [$activity, $note, $effective_attentions] = self::storeLocalNote(
+            actor: $actor,
+            content: $content,
+            content_type: $content_type,
+            locale: $locale,
+            scope: $scope,
+            attentions: $attentions,
+            reply_to: $reply_to,
+            attachments: $attachments,
+            processed_attachments: $processed_attachments,
+            process_note_content_extra_args: $process_note_content_extra_args,
+            flush_and_notify: false,
+            rendered: $rendered,
+            source: $source,
+        );
+        $note->setType('article');
+        $note->setTitle($title);
+
+        if ($flush_and_notify) {
+            // Flush before notification
+            DB::flush();
+            Event::handle('NewNotification', [
+                $actor,
+                $activity,
+                $effective_attentions,
+                _m('Actor {actor_id} created article {note_id}.', [
+                    '{actor_id}' => $actor->getId(),
+                    '{note_id}'  => $activity->getObjectId(),
+                ]),
+            ]);
+        }
+
+        return [$activity, $note, $effective_attentions];
+    }
+
     /**
      * Store the given note with $content and $attachments, created by
      * $actor_id, possibly as a reply to note $reply_to and with flag
      * $is_local. Sanitizes $content and $attachments
      *
-     * @param array $attachments                     Array of UploadedFile to be stored as GSFiles associated to this note
-     * @param array $processed_attachments           Array of [Attachment, Attachment's name] to be associated to this $actor and Note
-     * @param array $process_note_content_extra_args Extra arguments for the event ProcessNoteContent
+     * @param Actor                $actor        The Actor responsible for the creation of this Note
+     * @param null|string          $content      The raw text content
+     * @param string               $content_type Indicating one of the various supported content format (Plain Text, Markdown, LaTeX...)
+     * @param null|string          $locale       Note's written text language, set by the default Actor language or upon filling
+     * @param null|VisibilityScope $scope        The visibility of this Note
+     * @param Actor[]|int[]        $attentions   Actor|int[]: In Group/To Person or Bot, registers an attention between note and targte
+     * @param null|int|Note        $reply_to     The soon-to-be Note parent's id, if it's a Reply itself
+     * @param UploadedFile[]       $attachments  UploadedFile[] to be stored as GSFiles associated to this note
+     * @param array<array{Attachment, string}> $processed_attachments           Array of [Attachment, Attachment's name][] to be associated to this $actor and Note
+     * @param array{note?: Note, content?: string, content_type?: string, extra_args?: array<string, mixed>} $process_note_content_extra_args Extra arguments for the event ProcessNoteContent
+     * @param bool                                                                                           $flush_and_notify                True if the newly created Note activity should be passed on as a Notification
+     * @param null|string                                                                                    $rendered                        The Note's content post RenderNoteContent event, which sanitizes and processes the raw content sent
+     * @param string                                                                                         $source                          The source of this Note
      *
-     * @throws BugFoundException
      * @throws ClientException
      * @throws DuplicateFoundException
      * @throws ServerException
+     *
+     * @return array{\App\Entity\Activity, \App\Entity\Note, array<int, \App\Entity\Actor>}
      */
     public static function storeLocalNote(
         Actor $actor,
         ?string $content,
         string $content_type,
-        ?string $language = null,
+        ?string $locale = null,
         ?VisibilityScope $scope = null,
-        null|int|Actor $target = null,
-        ?int $reply_to_id = null,
+        array $attentions = [],
+        null|int|Note $reply_to = null,
         array $attachments = [],
         array $processed_attachments = [],
         array $process_note_content_extra_args = [],
-        bool $notify = true,
-    ): Note {
+        bool $flush_and_notify = true,
+        ?string $rendered = null,
+        string $source = 'web',
+    ): array {
         $scope ??= VisibilityScope::EVERYWHERE; // TODO: If site is private, default to LOCAL
-        $rendered = null;
+        $reply_to_id = \is_null($reply_to) ? null : (\is_int($reply_to) ? $reply_to : $reply_to->getId());
+
+        /** @var array<int, array{ mentioned?: array<int, Actor|LocalUser> }> $mentions */
         $mentions = [];
-        if (!empty($content)) {
-            Event::handle('RenderNoteContent', [$content, $content_type, &$rendered, $actor, $language, &$mentions]);
+        if (\is_null($rendered) && !empty($content)) {
+            Event::handle('RenderNoteContent', [$content, $content_type, &$rendered, $actor, $locale, &$mentions]);
         }
 
         $note = Note::create([
@@ -220,10 +213,11 @@ class Posting extends Component
             'content'      => $content,
             'content_type' => $content_type,
             'rendered'     => $rendered,
-            'language_id'  => !\is_null($language) ? Language::getByLocale($language)->getId() : null,
+            'language_id'  => !\is_null($locale) ? Language::getByLocale($locale)->getId() : null,
             'is_local'     => true,
             'scope'        => $scope,
             'reply_to'     => $reply_to_id,
+            'source'       => $source,
         ]);
 
         /** @var UploadedFile[] $attachments */
@@ -239,6 +233,17 @@ class Posting extends Component
         }
 
         DB::persist($note);
+        Conversation::assignLocalConversation($note, $reply_to_id);
+
+        // Update replies cache
+        if (!\is_null($reply_to_id)) {
+            Cache::incr(Note::cacheKeys($reply_to_id)['replies-count']);
+            // Not having them cached doesn't mean replies don't exist, but don't push it to the
+            // list, as that means they need to be re-fetched, or some would be missed
+            if (Cache::exists(Note::cacheKeys($reply_to_id)['replies'])) {
+                Cache::listPushRight(Note::cacheKeys($reply_to_id)['replies'], $note);
+            }
+        }
 
         // Need file and note ids for the next step
         $note->setUrl(Router::url('note_view', ['id' => $note->getId()], Router::ABSOLUTE_URL));
@@ -246,51 +251,81 @@ class Posting extends Component
             Event::handle('ProcessNoteContent', [$note, $content, $content_type, $process_note_content_extra_args]);
         }
 
+        // These are note attachments now, and not just attachments, ensure these relations are respected
         if ($processed_attachments !== []) {
             foreach ($processed_attachments as [$a, $fname]) {
-                if (DB::count('actor_to_attachment', $args = ['attachment_id' => $a->getId(), 'actor_id' => $actor->getId()]) === 0) {
+                // Most attachments should already be associated with its author, but maybe it didn't make sense
+                //for this attachment, or it's simply a repost of an attachment by a different actor
+                if (DB::count(ActorToAttachment::class, $args = ['attachment_id' => $a->getId(), 'actor_id' => $actor->getId()]) === 0) {
                     DB::persist(ActorToAttachment::create($args));
                 }
                 DB::persist(AttachmentToNote::create(['attachment_id' => $a->getId(), 'note_id' => $note->getId(), 'title' => $fname]));
             }
         }
 
-        Conversation::assignLocalConversation($note, $reply_to_id);
-
         $activity = Activity::create([
             'actor_id'    => $actor->getId(),
             'verb'        => 'create',
             'object_type' => 'note',
             'object_id'   => $note->getId(),
-            'source'      => 'web',
+            'source'      => $source,
         ]);
         DB::persist($activity);
 
-        if (!\is_null($target)) {
-            $target     = is_numeric($target) ? Actor::getById((int) $target) : $target;
-            $mentions[] = [
-                'mentioned'       => [$target],
-                'type'            => match ($target->getType()) {
-                    Actor::PERSON => 'mention',
-                    Actor::GROUP  => 'group',
-                    default       => throw new ClientException(_m('Unknown target type give in \'In\' field: {target}', ['{target}' => $target?->getNickname() ?? '<null>'])),
-                },
-                'text' => $target->getNickname(),
-            ];
+        $effective_attentions = [];
+        foreach ($attentions as $target) {
+            if (\is_int($target)) {
+                $target_id                        = $target;
+                $add                              = !\array_key_exists($target_id, $effective_attentions);
+                $effective_attentions[$target_id] = $target;
+            } else {
+                $target_id = $target->getId();
+                if ($add = !\array_key_exists($target_id, $effective_attentions)) {
+                    $effective_attentions[$target_id] = $target_id;
+                }
+            }
+            if ($add) {
+                DB::persist(Attention::create(['object_type' => Note::schemaName(), 'object_id' => $note->getId(), 'target_id' => $target_id]));
+            }
         }
 
-        $mention_ids = F\unique(F\flat_map($mentions, fn (array $m) => F\map($m['mentioned'] ?? [], fn (Actor $a) => $a->getId())));
-
-        DB::flush();
-
-        if ($notify) {
-            Event::handle('NewNotification', [$actor, $activity, ['object' => $mention_ids], _m('{nickname} created a note {note_id}.', ['{nickname}' => $actor->getNickname(), '{note_id}' => $activity->getObjectId()])]);
+        foreach ($mentions as $m) {
+            foreach ($m['mentioned'] ?? [] as $mentioned) {
+                $target_id = $mentioned->getId();
+                if (!\array_key_exists($target_id, $effective_attentions)) {
+                    DB::persist(Attention::create(['object_type' => Note::schemaName(), 'object_id' => $note->getId(), 'target_id' => $target_id]));
+                }
+                $effective_attentions[$target_id] = $mentioned;
+            }
         }
 
-        return $note;
+        foreach ($actor->getSubscribers() as $subscriber) {
+            $target_id = $subscriber->getId();
+            DB::persist(Attention::create(['object_type' => Activity::schemaName(), 'object_id' => $activity->getId(), 'target_id' => $target_id]));
+            $effective_attentions[$target_id] = $subscriber;
+        }
+
+        if ($flush_and_notify) {
+            // Flush before notification
+            DB::flush();
+            Event::handle('NewNotification', [
+                $actor,
+                $activity,
+                $effective_attentions,
+                _m('Actor {actor_id} created note {note_id}.', [
+                    '{actor_id}' => $actor->getId(),
+                    '{note_id}'  => $activity->getObjectId(),
+                ]),
+            ]);
+        }
+
+        return [$activity, $note, $effective_attentions];
     }
 
-    public function onRenderNoteContent(string $content, string $content_type, ?string &$rendered, Actor $author, ?string $language = null, array &$mentions = [])
+    /**
+     * @param array<int, \App\Entity\Actor> $mentions
+     */
+    public function onRenderNoteContent(string $content, string $content_type, ?string &$rendered, Actor $author, ?string $language = null, array &$mentions = []): EventResult
     {
         switch ($content_type) {
             case 'text/plain':
@@ -299,7 +334,7 @@ class Posting extends Component
                 return Event::stop;
             case 'text/html':
                 // TODO: It has to linkify and stuff as well
-                $rendered = Security::sanitize($content);
+                $rendered = HTML::sanitize($content);
                 return Event::stop;
             default:
                 return Event::next;

components/RightPanel/templates/right_panel/view.html.twig

@@ -1,62 +1,97 @@
-{% block rightpanel %}
-    <label class="panel-right-icon" for="panel-right-toggle" aria-hidden="true"
-           tabindex="-1">{{ icon('chevron-left', 'icon icon-right') | raw }}</label>
-    <input type="checkbox" id="panel-right-toggle" aria-hidden="true" tabindex="-1">
+{% macro posting(form) %}
+    <section class="section-form">
+        {{ form_start(form) }}
+        {{ form_errors(form) }}
+        {% if form.in is defined %}
+            {{ form_row(form.in) }}
+        {% endif %}
+        {{ form_row(form.visibility) }}
+        {{ form_row(form.content_type) }}
+        {{ form_row(form.content) }}
+        {{ form_row(form.attachments) }}
 
-    <div class="header-panel section-panel-right">
-        <a id="anchor-right-panel" class="anchor-hidden" title="{{ 'Press tab to access selected region!' | trans }}"></a>
-        <aside class="panel-content accessibility-target">
+        <details class="section-details-subtitle frame-section">
+            <summary class="details-summary-subtitle">
+                <strong>
+                    {% trans %}Additional options{% endtrans %}
+                </strong>
+            </summary>
+            <section class="section-form">
+                {{ form_row(form.language) }}
+                {{ form_row(form.tag_use_canonical) }}
+            </section>
+        </details>
+        {{ form_rest(form) }}
+        {{ form_end(form) }}
+    </section>
+{% endmacro %}
 
-            {% set blocks = handle_event('AppendRightPostingBlock', request) %}
-            {% if blocks['post_form'] is defined %}
-                <section class="section-widget" title="{{ 'Create a new note.' | trans }}">
-                    <details class="section-widget-title-details" open="open"
-                             title="{{ 'Expand if you want to access more options.' | trans }}">
-                        <summary class="section-title-summary">
-                            <h2>
-                                {% set current_path = app.request.get('_route') %}
-                                {% if current_path == 'conversation_reply_to' %}
-                                    {{ "Reply to note" | trans }}
-                                {% else %}
-                                    {{ "Create a note" | trans }}
-                                {% endif %}
-                            </h2>
-                            {{ icon('arrow-down', 'icon icon-details-open') | raw }}
-                        </summary>
+{% macro posting_section_vanilla(widget) %}
+    <section class="frame-section" title="{% trans %}Create a new note{% endtrans %}">
+        <details class="section-details-title" open="open"
+                 title="{% trans %}Expand if you want to access more options{% endtrans %}">
+            <summary class="details-summary-title">
+                <span>
+                    {% trans %}Create a note{% endtrans %}
+                </span>
+            </summary>
 
-                        <div class="section-form">
-                            <fieldset>
-                                {{ form_start(blocks['post_form']) }}
-                                {% if blocks['post_form'].in is defined %}
-                                    {{ form_row(blocks['post_form'].in) }}
-                                {% endif %}
-                                {{ form_row(blocks['post_form'].visibility) }}
-                                {{ form_row(blocks['post_form'].content) }}
-                                {{ form_row(blocks['post_form'].attachments) }}
+            {% import _self as forms %}
+            {{ forms.posting(widget) }}
+        </details>
+    </section>
+{% endmacro %}
 
-                                <details class="section-widget-subtitle-details">
-                                    <summary class="section-subtitle-summary">
-                                        <strong>
-                                            {{ "Additional options" | trans }}
-                                        </strong>
-                                        {{ icon('arrow-down', 'icon icon-details-close') | raw }}
-                                    </summary>
-                                    {{ form_row(blocks['post_form'].language) }}
-                                    {{ form_row(blocks['post_form'].tag_use_canonical) }}
-                                </details>
-                                {{ form_rest(blocks['post_form']) }}
-                                {{ form_end(blocks['post_form']) }}
-                            </fieldset>
-                        </div>
-                    </details>
+{% macro posting_section_reply(widget, extra) %}
+    <section class="frame-section" title="{% trans %}Create a new note{% endtrans %}">
+        <details class="section-details-title" open="open"
+                 title="{% trans %}Expand if you want to access more options{% endtrans %}">
+            <summary class="details-summary-title">
+                <span>
+                    {% trans %}Reply to note{% endtrans %}
+                </span>
+            </summary>
+
+            {% for block in extra %}
+                <section class="posting-extra">
+                    {{ block | raw }}
                 </section>
-            {% endif %}
-
-            {% set current_path = app.request.get('_route') %}
-            {% for block in handle_event('AppendRightPanelBlock', {'path': current_path, 'request': request, 'vars': right_panel_vars | default }, request) %}
-                {{ block | raw }}
             {% endfor %}
 
-        </aside>
-    </div>
+            {% import _self as forms %}
+            {{ forms.posting(widget) }}
+        </details>
+    </section>
+{% endmacro %}
+
+{% block rightpanel %}
+    {% import _self as this %}
+    <label class="panel-right-icon" for="toggle-panel-right"
+           tabindex="-1">{{ icon('chevron-left', 'icon icon-right') | raw }}</label>
+    <a id="anchor-right-panel" class="anchor-hidden" tabindex="0"
+       title="{% trans %}Press tab followed by a space to access right panel{% endtrans %}"></a>
+       <input type="checkbox" id="toggle-panel-right" tabindex="0" title="{% trans %}Open right panel{% endtrans %}"
+           {% if app.request.get('_route') == 'conversation_reply_to' %}checked{% endif %}>
+
+    <aside class="section-panel section-panel-right">
+        {% set var_list = {'path': app.request.get('_route'), 'request': app.request, 'vars': right_panel_vars | default } %}
+        {% set blocks = add_right_panel_block('prepend', var_list) %}
+        {% set blocks = blocks|merge(add_right_panel_block('main', var_list)) %}
+        {% set blocks = blocks|merge(add_right_panel_block('append', var_list)) %}
+
+        <section class="panel-content accessibility-target">
+            {% for widget in blocks %}
+                {% if widget is iterable and widget.vars.id == 'post_note' %}
+                    {% if app.request.get('_route') == 'conversation_reply_to' %}
+                        {% set extra = handle_event('PrependPostingForm', request) %}
+                        {{ this.posting_section_reply(widget, extra) }}
+                    {% else %}
+                        {{ this.posting_section_vanilla(widget) }}
+                    {% endif %}
+                {% else %}
+                    {{ widget | raw }}
+                {% endif %}
+            {% endfor %}
+        </section>
+    </aside>
 {% endblock rightpanel %}

components/Search/Controller/Search.php

@@ -30,6 +30,7 @@ use App\Util\Exception\BugFoundException;
 use App\Util\Exception\RedirectException;
 use App\Util\Form\FormFields;
 use App\Util\Formatting;
+use App\Util\HTML\Heading;
 use Component\Collection\Util\Controller\FeedController;
 use Component\Search as Comp;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
@@ -37,18 +38,23 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\HttpFoundation\Request;
 
+/**
+ * @extends FeedController<\App\Entity\Note>
+ */
 class Search extends FeedController
 {
     /**
      * Handle a search query
+     *
+     * @return ControllerResultType
      */
-    public function handle(Request $request)
+    public function handle(Request $request): array
     {
         $actor    = Common::actor();
         $language = !\is_null($actor) ? $actor->getTopLanguage()->getLocale() : null;
         $q        = $this->string('q');
 
-        $data   = $this->query(query: $q, language: $language);
+        $data   = $this->query(query: $q, locale: $language);
         $notes  = $data['notes'];
         $actors = $data['actors'];
 
@@ -130,11 +136,13 @@ class Search extends FeedController
         }
 
         return [
-            '_template'           => 'search/show.html.twig',
+            '_template'           => 'search/view.html.twig',
             'actor'               => $actor,
             'search_form'         => Comp\Search::searchForm($request, query: $q, add_subscribe: !\is_null($actor)),
             'search_builder_form' => $search_builder_form->createView(),
             'notes'               => $notes ?? [],
+            'notes_feed_title'    => (new Heading(level: 3, classes: ['section-title'], text: 'Notes found')),
+            'actors_feed_title'   => (new Heading(level: 3, classes: ['section-title'], text: 'Actors found')),
             'actors'              => $actors ?? [],
             'page'                => 1, // TODO paginate
         ];

components/Search/Search.php

@@ -27,8 +27,12 @@ use App\Core\Event;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Core\Modules\Component;
+use App\Core\Router;
 use App\Util\Common;
+use App\Util\Exception\ClientException;
 use App\Util\Exception\RedirectException;
+use App\Util\Formatting;
+use EventResult;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormView;
@@ -37,9 +41,10 @@ use Symfony\Component\HttpFoundation\Request;
 
 class Search extends Component
 {
-    public function onAddRoute($r)
+    public function onAddRoute(Router $r): EventResult
     {
         $r->connect('search', '/search', Controller\Search::class);
+        return EventResult::next;
     }
 
     /**
@@ -62,13 +67,22 @@ class Search extends Component
 
         if ($add_subscribe) {
             $form_definition[] = [
-                'title', TextType::class, ['label' => _m('Title'), 'required' => false, 'attr' => ['title' => _m('Title for this new feed in your left panel')]],
+                'title', TextType::class,
+                [
+                    'label'    => _m('Subscribe to search query'),
+                    'help'     => _m('By subscribing to a search query, a new feed link will be added to left panel\'s feed navigation menu'),
+                    'required' => false,
+                    'attr'     => [
+                        'title'       => _m('Title for this new feed in your left panel'),
+                        'placeholder' => _m('Input desired title...'),
+                    ],
+                ],
             ];
             $form_definition[] = [
                 'subscribe_to_search',
                 SubmitType::class,
                 [
-                    'label' => _m('Subscribe to this search'),
+                    'label' => _m('Subscribe'),
                     'attr'  => [
                         'title' => _m('Add this search as a feed in your feeds section of the left panel'),
                     ],
@@ -83,7 +97,7 @@ class Search extends Component
                 'label' => _m('Search'),
                 'attr'  => [
                     //'class' => 'button-container search-button-container',
-                    'title' => _m('Query notes for specific tags.'),
+                    'title' => _m('Perform search'),
                 ],
             ],
         ];
@@ -99,8 +113,11 @@ class Search extends Component
                     /** @var SubmitButton $subscribe */
                     $subscribe = $form->get('subscribe_to_search');
                     if ($subscribe->isClicked()) {
-                        // TODO ensure title is set
-                        Event::handle('AppendFeed', [$actor, $data['title'], 'search', ['q' => $data['search_query']]]);
+                        if (!\is_null($data['title'])) {
+                            Event::handle('AppendFeed', [$actor, $data['title'], 'search', ['q' => $data['search_query']]]);
+                        } else {
+                            throw new ClientException(_m('Empty title is not allowed.'));
+                        }
                         $redirect = true;
                     }
                 }
@@ -117,22 +134,22 @@ class Search extends Component
     /**
      * Add the search form to the site header
      *
+     * @param string[] $elements
+     *
      * @throws RedirectException
      */
-    public function onAddExtraHeaderForms(Request $request, array &$elements)
+    public function onPrependRightPanelBlock(Request $request, array &$elements): EventResult
     {
-        $elements[] = self::searchForm($request);
+        $elements[] = Formatting::twigRenderFile('cards/search/view.html.twig', ['search' => self::searchForm($request)]);
         return Event::next;
     }
 
     /**
      * Output our dedicated stylesheet
      *
-     * @param array $styles stylesheets path
-     *
-     * @return bool hook value; true means continue processing, false means stop
+     * @param string[] $styles stylesheets path
      */
-    public function onEndShowStyles(array &$styles, string $route): bool
+    public function onEndShowStyles(array &$styles, string $route): EventResult
     {
         $styles[] = 'components/Search/assets/css/view.css';
         return Event::next;

components/Search/templates/cards/search/view.html.twig

@@ -0,0 +1,6 @@
+<section class="section-form form-search" title="{% trans %}Search for notes, actors, and beyond{% endtrans %}">
+{{ form_start(search) }}
+    <span>{{ form_row(search.search_query) }}{{ form_row(search.submit_search) }}</span>
+    {{ form_rest(search) }}
+{{ form_end(search) }}
+</section>

components/Search/templates/search/show.html.twig

@@ -1,91 +0,0 @@
-{% extends 'collection/notes.html.twig' %}
-
-
-{% block body %}
-    {% if error is defined %}
-        <label class="alert alert-danger">
-            {{ error.getMessage() }}
-        </label>
-    {% endif %}
-
-    <div class="section-padding">
-        {{ form_start(search_form) }}
-        <div>
-            {{ form_row(search_form.search_query) }}
-            {{ form_row(search_form.submit_search) }}
-        </div>
-        {% if actor is not null %}
-            <details class="section-widget">
-                <summary>
-                    <h3>
-                        {% trans %}Save this search as a feed{% endtrans %}
-                        {{ icon('arrow-down', 'icon icon-details-open') | raw }}
-                    </h3>
-                </summary>
-                {{ form_row(search_form.title) }}
-                {{ form_row(search_form.subscribe_to_search) }}
-            </details>
-        {% endif %}
-        {{ form_end(search_form)}}
-        <hr>
-        <details class="section-widget">
-            <summary>
-                <h3>
-                    {% trans %}Build a search query{% endtrans %}
-                    {{ icon('arrow-down', 'icon icon-details-open') | raw }}
-                </h3>
-            </summary>
-
-            {{ form_start(search_builder_form) }}
-
-            {# actor options, display if first checked, with checkbox trick #}
-            <details class="section-widget">
-                <summary>
-                    <h3>
-                        {% trans %}People search options{% endtrans %}
-                        {{ icon('arrow-down', 'icon icon-details-open') | raw }}
-                    </h3>
-                </summary>
-                {{ form_row(search_builder_form.include_actors) }}
-                {{ form_row(search_builder_form.include_actors_people) }}
-                {{ form_row(search_builder_form.include_actors_groups) }}
-                {{ form_row(search_builder_form.include_actors_lists) }}
-                {{ form_row(search_builder_form.include_actors_businesses) }}
-                {{ form_row(search_builder_form.include_actors_organizations) }}
-                {{ form_row(search_builder_form.include_actors_bots) }}
-                {{ form_row(search_builder_form.actor_langs) }}
-                {{ form_row(search_builder_form.actor_tags) }}
-            </details>
-
-            <details class="section-widget">
-                <summary>
-                    <h3>
-                        {% trans %}Note search options{% endtrans %}
-                        {{ icon('arrow-down', 'icon icon-details-open') | raw }}
-                    </h3>
-                </summary>
-                {{ form_row(search_builder_form.include_notes) }}
-                {{ form_row(search_builder_form.include_notes_text) }}
-                {{ form_row(search_builder_form.include_notes_media) }}
-                {{ form_row(search_builder_form.include_notes_polls) }}
-                {{ form_row(search_builder_form.include_notes_bookmarks) }}
-                {{ form_row(search_builder_form.note_langs) }}
-                {{ form_row(search_builder_form.note_tags) }}
-                {{ form_row(search_builder_form.note_actor_langs) }}
-                {{ form_row(search_builder_form.note_actor_tags) }}
-            </details>
-            {{ form_end(search_builder_form) }}
-        </details>
-        <hr>
-    </div>
-
-    {# Backwards compatibility with hAtom 0.1 #}
-    {{ parent() }}
-
-    {% for actor in actors %}
-        {% include 'cards/profile/view.html.twig' with {'actor': actor} %}
-    {% endfor %}
-
-    {{ "Page: " ~ page }}
-{% endblock body %}
-

components/Search/templates/search/view.html.twig

@@ -0,0 +1,130 @@
+{% extends 'collection/notes.html.twig' %}
+
+{% block search_query_simple %}
+<section>
+    <h1 class="section-title">{% trans %}Search{% endtrans %}</h1>
+
+    {{ form_start(search_form) }}
+    {{ form_errors(search_form) }}
+    {{ form_row(search_form.search_query) }}
+    {% if actor is not null %}
+        <details class="section-details-subtitle frame-section">
+            <summary class="details-summary-subtitle">
+                <strong>
+                    {% trans %}Extra options{% endtrans %}
+                </strong>
+            </summary>
+            <div class="section-form">
+                {{ form_row(search_form.title) }}
+                {{ form_row(search_form.subscribe_to_search) }}
+            </div>
+        </details>
+    {% endif %}
+    {{ form_row(search_form.submit_search) }}
+    {{ form_rest(search_form) }}
+    {{ form_end(search_form)}}
+</section>
+{% endblock search_query_simple %}
+
+{% block search_query_advanced %}
+    {{ form_start(search_builder_form) }}
+    <details class="section-details section-details-title frame-section">
+        <summary class="details-summary-title">
+            <span>{% trans %}Advanced search{% endtrans %}</span>
+        </summary>
+
+        <section class="frame-section-padding">
+            <details class="section-details-subtitle frame-section">
+                <summary class="details-summary-subtitle">
+                    <strong>{% trans %}People search options{% endtrans %}</strong>
+                </summary>
+                <div class="section-form">
+                    <div class="section-checkbox-flex">
+                        {{ form_row(search_builder_form.include_actors) }}
+                        {{ form_row(search_builder_form.include_actors_people) }}
+                        {{ form_row(search_builder_form.include_actors_groups) }}
+                        {{ form_row(search_builder_form.include_actors_lists) }}
+                        {{ form_row(search_builder_form.include_actors_businesses) }}
+                        {{ form_row(search_builder_form.include_actors_organizations) }}
+                        {{ form_row(search_builder_form.include_actors_bots) }}
+                    </div>
+                    <hr>
+                    {{ form_row(search_builder_form.actor_tags) }}
+                    <hr>
+                    {{ form_row(search_builder_form.actor_langs) }}
+                </div>
+            </details>
+
+            <details class="section-details-subtitle frame-section">
+                <summary class="details-summary-subtitle">
+                    <strong>{% trans %}Note search options{% endtrans %}</strong>
+                </summary>
+                <div class="section-form">
+                    <div class="section-checkbox-flex">
+                        {{ form_row(search_builder_form.include_notes) }}
+                        {{ form_row(search_builder_form.include_notes_text) }}
+                        {{ form_row(search_builder_form.include_notes_media) }}
+                        {{ form_row(search_builder_form.include_notes_polls) }}
+                        {{ form_row(search_builder_form.include_notes_bookmarks) }}
+                    </div>
+                    <hr>
+                    {{ form_row(search_builder_form.note_tags) }}
+                    <hr>
+                    {{ form_row(search_builder_form.note_langs) }}
+                    <hr>
+                    {{ form_row(search_builder_form.note_actor_tags) }}
+                    <hr>
+                    {{ form_row(search_builder_form.note_actor_langs) }}
+                </div>
+            </details>
+
+            {{ form_rest(search_builder_form) }}
+        </section>
+    </details>
+    {{ form_end(search_builder_form) }}
+{% endblock search_query_advanced %}
+
+{% block search %}
+    <section class="frame-section frame-section-padding">
+        {% if error is defined %}
+            <label class="alert alert-danger">
+                {{ error.getMessage() }}
+            </label>
+        {% endif %}
+        {{ block('search_query_simple') }}
+        <hr>
+        {{ block('search_query_advanced') }}
+    </section>
+{% endblock search %}
+
+{% block body %}
+    {{ block('search') }}
+    <div class="frame-section frame-section-padding">
+        <h1 class="section-title">{% trans %}Results{% endtrans %}</h1>
+
+        <section>
+            {% if notes is defined and notes is not empty %}
+                {{ parent() }}
+            {% else %}
+                <h3>{% trans %}No notes found{% endtrans %}</h3>
+                <em>{% trans %}No notes were found for the specified query...{% endtrans %}</em>
+            {% endif %}
+        </section>
+        <hr>
+        <section>
+            <h3>{% trans %}Actors found{% endtrans %}</h3>
+            {% if actors is defined and actors is not empty %}
+                {% for actor in actors %}
+                    {% include 'cards/blocks/profile.html.twig' with {'actor': actor} %}
+                {% endfor %}
+            {% else %}
+                <em>{% trans %}No Actors were found for the specified query...{% endtrans %}</em>
+            {% endif %}
+        </section>
+
+        <div class="frame-section-button-like">
+            {{ "Page: " ~ page }}
+        </div>
+    </div>
+{% endblock body %}
+

components/Subscription/Controller/Subscribers.php

@@ -23,9 +23,19 @@ declare(strict_types = 1);
 
 namespace Component\Subscription\Controller;
 
+use App\Core\DB;
+use App\Core\Form;
 use function App\Core\I18n\_m;
-use Component\Collection\Util\ActorControllerTrait;
+use App\Core\Log;
+use App\Core\Router;
+use App\Entity\Actor;
+use App\Util\Common;
+use App\Util\Exception\ClientException;
+use App\Util\Exception\RedirectException;
+use App\Util\Exception\ServerException;
 use Component\Collection\Util\Controller\CircleController;
+use Component\Subscription\Subscription as SubscriptionComponent;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
@@ -33,29 +43,135 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class Subscribers extends CircleController
 {
-    use ActorControllerTrait;
-    public function subscribersByActorId(Request $request, int $id)
+    /**
+     * @throws ServerException
+     *
+     * @return ControllerResultType
+     */
+    public function subscribersByActor(Request $request, Actor $actor): array
     {
-        return $this->handleActorById(
-            $id,
-            fn ($actor) => [
-                'actor' => $actor,
-            ],
-        );
+        return [
+            '_template'        => 'collection/actors.html.twig',
+            'title'            => _m('Subscribers'),
+            'empty_message'    => _m('No subscribers.'),
+            'sort_form_fields' => [],
+            'page'             => $this->int('page') ?? 1,
+            'actors'           => $actor->getSubscribers(),
+        ];
     }
 
-    public function subscribersByActorNickname(Request $request, string $nickname)
+    /**
+     * @throws ClientException
+     * @throws ServerException
+     *
+     * @return ControllerResultType
+     */
+    public function subscribersByActorId(Request $request, int $id): array
     {
-        return $this->handleActorByNickname(
-            $nickname,
-            fn ($actor) => [
-                '_template'     => 'collection/actors.html.twig',
-                'title'         => _m('Subscribers'),
-                'empty_message' => _m('No subscribers'),
-                'sort_options'  => [],
-                'page'          => $this->int('page') ?? 1,
-                'actors'        => $actor->getSubscribers(),
+        $actor = Actor::getById($id);
+        if (\is_null($actor)) {
+            throw new ClientException(_m('No such actor.'), 404);
+        }
+        return $this->subscribersByActor($request, $actor);
+    }
+
+    /**
+     * @throws \App\Util\Exception\DuplicateFoundException
+     * @throws \App\Util\Exception\NoLoggedInUser
+     * @throws \App\Util\Exception\NotFoundException
+     * @throws \App\Util\Exception\ServerException
+     * @throws ClientException
+     * @throws RedirectException
+     *
+     * @return ControllerResultType
+     */
+    public function subscribersAdd(Request $request, int $object_id): array
+    {
+        $subject = Common::ensureLoggedIn();
+        $object  = Actor::getById($object_id);
+        $form    = Form::create(
+            [
+                ['subscriber_add', SubmitType::class, ['label' => _m('Subscribe!')]],
             ],
         );
+
+        $form->handleRequest($request);
+        if ($form->isSubmitted() && $form->isValid()) {
+            if (!\is_null(SubscriptionComponent::subscribe($subject, $object))) {
+                DB::flush();
+                SubscriptionComponent::refreshSubscriptionCount($subject, $object);
+            }
+
+            // Redirect user to where they came from
+            // Prevent open redirect
+            if (!\is_null($from = $this->string('from'))) {
+                if (Router::isAbsolute($from)) {
+                    Log::warning("Actor {$object_id} attempted to reply to a note and then get redirected to another host, or the URL was invalid ({$from})");
+                    throw new ClientException(_m('Can not redirect to outside the website from here'), 400); // 400 Bad request (deceptive)
+                }
+
+                // TODO anchor on element id
+                throw new RedirectException(url: $from);
+            }
+
+            // If we don't have a URL to return to, go to the instance root
+            throw new RedirectException('root');
+        }
+
+        return [
+            '_template' => 'subscription/add_subscriber.html.twig',
+            'form'      => $form->createView(),
+            'object'    => $object,
+        ];
+    }
+
+    /**
+     * @throws \App\Util\Exception\DuplicateFoundException
+     * @throws \App\Util\Exception\NoLoggedInUser
+     * @throws \App\Util\Exception\NotFoundException
+     * @throws \App\Util\Exception\ServerException
+     * @throws ClientException
+     * @throws RedirectException
+     *
+     * @return ControllerResultType
+     */
+    public function subscribersRemove(Request $request, int $object_id): array
+    {
+        $subject = Common::ensureLoggedIn();
+        $object  = Actor::getById($object_id);
+        $form    = Form::create(
+            [
+                ['subscriber_remove', SubmitType::class, ['label' => _m('Unsubscribe')]],
+            ],
+        );
+
+        $form->handleRequest($request);
+        if ($form->isSubmitted() && $form->isValid()) {
+            if (!\is_null(SubscriptionComponent::unsubscribe($subject, $object))) {
+                DB::flush();
+                SubscriptionComponent::refreshSubscriptionCount($subject, $object);
+            }
+
+            // Redirect user to where they came from
+            // Prevent open redirect
+            if (!\is_null($from = $this->string('from'))) {
+                if (Router::isAbsolute($from)) {
+                    Log::warning("Actor {$object_id} attempted to subscribe an actor and then get redirected to another host, or the URL was invalid ({$from})");
+                    throw new ClientException(_m('Can not redirect to outside the website from here'), 400); // 400 Bad request (deceptive)
+                }
+
+                // TODO anchor on element id
+                throw new RedirectException(url: $from);
+            }
+
+            // If we don't have a URL to return to, go to the instance root
+            throw new RedirectException('root');
+        }
+
+        return [
+            '_template' => 'subscription/remove_subscriber.html.twig',
+            'form'      => $form->createView(),
+            'object'    => $object,
+        ];
     }
 }

components/Subscription/Controller/Subscriptions.php

@@ -24,7 +24,9 @@ declare(strict_types = 1);
 namespace Component\Subscription\Controller;
 
 use function App\Core\I18n\_m;
-use Component\Collection\Util\ActorControllerTrait;
+use App\Entity\Actor;
+use App\Util\Exception\ClientException;
+use App\Util\Exception\ServerException;
 use Component\Collection\Util\Controller\CircleController;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -33,29 +35,33 @@ use Symfony\Component\HttpFoundation\Request;
  */
 class Subscriptions extends CircleController
 {
-    use ActorControllerTrait;
-    public function subscriptionsByActorId(Request $request, int $id)
+    /**
+     * @throws ClientException
+     * @throws ServerException
+     *
+     * @return ControllerResultType
+     */
+    public function subscriptionsByActorId(Request $request, int $id): array
     {
-        return $this->handleActorById(
-            $id,
-            fn ($actor) => [
-                'actor' => $actor,
-            ],
-        );
+        $actor = Actor::getById($id);
+        if (\is_null($actor)) {
+            throw new ClientException(_m('No such actor.'), 404);
+        }
+        return $this->subscriptionsByActor($request, $actor);
     }
 
-    public function subscriptionsByActorNickname(Request $request, string $nickname)
+    /**
+     * @return ControllerResultType
+     */
+    public function subscriptionsByActor(Request $request, Actor $actor): array
     {
-        return $this->handleActorByNickname(
-            $nickname,
-            fn ($actor) => [
-                '_template'     => 'collection/actors.html.twig',
-                'title'         => _m('Subscribers'),
-                'empty_message' => _m('No subscribers'),
-                'sort_options'  => [],
-                'page'          => $this->int('page') ?? 1,
-                'actors'        => $actor->getSubscribers(),
-            ],
-        );
+        return [
+            '_template'        => 'collection/actors.html.twig',
+            'title'            => _m('Subscriptions'),
+            'empty_message'    => _m('Haven\'t subscribed anyone.'),
+            'sort_form_fields' => [],
+            'page'             => $this->int('page') ?? 1,
+            'actors'           => $actor->getSubscribers(),
+        ];
     }
 }

components/Subscription/Entity/ActorSubscription.php

@@ -41,7 +41,7 @@ use DateTimeInterface;
  * @copyright 2020-2021 Free Software Foundation, Inc http://www.fsf.org
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
-class Subscription extends Entity
+class ActorSubscription extends Entity
 {
     // {{{ Autocode
     // @codeCoverageIgnoreStart
@@ -117,7 +117,7 @@ class Subscription extends Entity
     public static function schemaDef(): array
     {
         return [
-            'name'   => 'subscription',
+            'name'   => 'actor_subscription',
             'fields' => [
                 'subscriber_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'subscription_subscriber_fkey', 'not null' => true,  'description' => 'actor listening'],
                 'subscribed_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'subscription_subscribed_fkey', 'not null' => true,  'description' => 'actor being listened to'],