[PLUGIN][Pinboard] Refactor and cleanup code

Notification bug fix on Subscription component
Correct docblock

.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

Makefile

@@ -37,27 +37,86 @@ 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
-
-test: tooling-docker
-	docker exec $(call translate-container-name,tooling_php_1) /var/tooling/coverage.sh $(call args,'')
-
-doc-check:
-	bin/php-doc-check src components plugins
-
-phpstan: tooling-docker
-	bin/phpstan
 
 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,'')
+
+cs-fixer: tooling-docker
+	@bin/php-cs-fixer $${CS_FIXER_FILE}
+
+doc-check: tooling-docker
+	bin/php-doc-check
+
+phpstan: tooling-docker
+	bin/phpstan
+
 remove-var:
 	rm -rf var/*
 
+remove-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: remove-var flush-redis-cache database-force-nuke
+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}
+CONFIG_DOMAIN=${DOMAIN}
-SOCIAL_NODE_NAME=${NODE_NAME}
+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/php-cs-fixer

@@ -1 +0,0 @@
-../vendor/bin/php-cs-fixer

bin/php-cs-fixer

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. bin/translate_container_name.sh
+
+if [ "$#" -eq 0 ] || [ -z "$*" ]; then
+    docker exec "$(translate_container_name tooling_php_1)" /var/www/social/vendor/bin/php-cs-fixer -n --config=".php-cs-fixer.php" fix
+else
+    docker exec "$(translate_container_name tooling_php_1)" sh -c "/var/www/social/vendor/bin/php-cs-fixer -q -n --config=\".php-cs-fixer.php\" fix --path-mode=intersection -- $*"
+fi

bin/php-doc-check

@@ -1 +0,0 @@
-../vendor/bin/php-doc-check

bin/php-doc-check

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. bin/translate_container_name.sh
+
+docker exec -it "$(translate_container_name tooling_php_1)" /var/www/social/vendor/bin/php-doc-check src components plugins

bin/phpstan

@@ -1,11 +1,5 @@
 #!/bin/sh
 
-translate_container_name () {
+. bin/translate_container_name.sh
-    if docker container inspect "$1" > /dev/null 2>&1; then
-        echo "$1"
-    else
-        echo "$1" | sed 'y/_/-/'
-    fi
-}
 
 docker exec "$(translate_container_name tooling_php_1)" /var/tooling/phpstan.sh "$@"

bin/pre-commit

@@ -2,7 +2,7 @@
 
 root="$(git rev-parse --show-toplevel)"
 
-# get the list of changed files
+# get the list of changed files that didn't get only partially added
 staged_files="$(git status --porcelain | sed -rn "s/^[^ ][ ] (.*)/\1/p")"
 
 if (! (: "${SKIP_ALL?}") 2>/dev/null) && (! (: "${SKIP_CS_FIX?}") 2>/dev/null); then
@@ -11,17 +11,16 @@ if (! (: "${SKIP_ALL?}") 2>/dev/null) && (! (: "${SKIP_CS_FIX?}") 2>/dev/null);
         # work only with existing files
         if [ -f "${staged}" ] && expr "${staged}" : '^.*\.php$' > /dev/null;  then
             # use php-cs-fixer and get flag of correction
-            if "${root}/bin/php-cs-fixer" -q --config="${root}/.php-cs-fixer.php" fix "${staged}"; then
+            CS_FIXER_FILE="${staged}" make cs-fixer
-                git add "${staged}" # execute git add directly
+            git add "${staged}"
-            fi
         fi
     done
 fi
 
 if (! (: "${SKIP_ALL?}") 2>/dev/null) && (! (: "${SKIP_DOC_CHECK?}") 2>/dev/null); then
-    echo "Running php-doc-checker"
+    if echo "${staged_files}" | grep -F ".php" > /dev/null 2>&1; then
-    if echo "${staged_files}" | grep -F ".php"; then
+        echo "Running php-doc-checker"
-        "${root}/bin/php-doc-check" src plugins components
+        make doc-check < /dev/tty
     fi
 fi
 

bin/translate_container_name.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+translate_container_name () {
+    if docker container inspect "$1" > /dev/null 2>&1; then
+        echo "$1"
+    else
+        echo "$1" | sed 'y/_/-/'
+    fi
+}

bin/update_autocode

@@ -1,4 +1,4 @@
-#!/usr/local/bin/php
+#!/usr/bin/env php
 <?php
 
 use Symfony\Component\Yaml\Yaml;
@@ -20,25 +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();
+    $class = str_replace(['/', 'src', 'components', 'plugins'], ['\\', 'App', 'Component', 'Plugin'], substr($file, strlen(ROOT) + 1, -4));
-    foreach ($declared as $dc) {
+
-        if (preg_match('/(App|(Component|Plugin)\\\\[^\\\\]+)\\\\Entity/', $dc) && !in_array($dc, $classes)) {
+    if (!method_exists($class, 'schemaDef')) {
-            $class = $dc;
+        continue;
-            $classes[] = $class;
-            break;
-        }
     }
 
     $no_ns_class  = preg_replace('/.*?\\\\/', '', $class);
@@ -47,16 +45,32 @@ foreach ($files as $file) {
     $fields_code  = [];
     $methods_code = [];
     foreach ($fields as $field) {
-        $nullable       = !@$schema['fields'][$field]['not null'] ? '?' : '';
+        $field_schema   = $schema['fields'][$field];
-        $type           = types[$schema['fields'][$field]['type']];
+        $nullable       = ($field_schema['not null'] ?? false) ? '' : '?';
+        $type           = types[$field_schema['type']];
         $type           = $type !== '' ? $nullable . $type : $type;
         $method_name    = str_replace([' ', 'actor'], ['', 'Actor'], ucwords(str_replace('_', ' ', $field)));
-        $default        = @$schema['fields'][$field]['default'];
+        $length         = $field_schema['length'] ?? null;
 
-        if (isset($default) && $nullable != '?' && $type != '\DateTimeInterface') {
+        $field_setter = "\${$field}";
-            if (is_string($default)) {
+        if (\is_int($length)) {
+            if ($nullable === '?') {
+                $field_setter = "\is_null(\${$field}) ? null : \mb_substr(\${$field}, 0, $length)";
+            } else {
+                $field_setter = "\mb_substr(\${$field}, 0, $length)";
+            }
+        }
+
+        if (($nullable === '?' || \array_key_exists('default', $field_schema)) && $type != '\DateTimeInterface') {
+            if (!\array_key_exists('default', $field_schema)) {
+                $nullable_no_defaults_warning[] = "{$class}::{$field}";
+            }
+            $default = $field_schema['default'] ?? null;
+            if (\is_string($default)) {
                 $default = "'{$default}'";
-            } elseif ($type == 'bool') {
+            } elseif (\is_null($default)) {
+                $default = "null";
+            } elseif ($type === 'bool' || $type === '?bool') {
                 $default = $default ? 'true' : 'false';
             }
 
@@ -66,13 +80,13 @@ foreach ($files as $file) {
         }
 
         $methods_code[] = "    public function set{$method_name}({$type} \${$field}): self" .
-                        "\n    {\n        \$this->{$field} = \${$field};\n        return \$this;\n    }" . "\n\n" .
+                        "\n    {\n        \$this->{$field} = {$field_setter};\n        return \$this;\n    }" . "\n\n" .
                         "    public function get{$method_name}()" . ($type !== '' ? ": {$type}" : '') .
                         "\n    {\n        return \$this->{$field};\n    }" . "\n";
     }
 
     $fields_code  = implode("\n", $fields_code);
-    $methods_code = implode("\n", $methods_code) . "\n";
+    $methods_code = implode("\n", $methods_code);
 
     $begin = '// {{{ Autocode';
     $end   = '// }}} Autocode';
@@ -91,7 +105,13 @@ foreach ($files as $file) {
     }
 
     $in_file  = file_get_contents($file);
-    $out_file = preg_replace("/\\s*{$begin}[^\\/]*{$end}/m", $code, $in_file);
+    $out_file = preg_replace("%\\s*{$begin}.*{$end}%smu", $code, $in_file);
-
     file_put_contents($file, $out_file);
 }
+
+if (!empty($nullable_no_defaults_warning)) {
+    echo "Warning: The following don't have a default value, but we're assigning it `null`. Doctrine might not like this, so update it\n";
+    foreach ($nullable_no_defaults_warning as $n) {
+        echo "    {$n}\n";
+    }
+}

components/Attachment/Attachment.php

@@ -22,9 +22,10 @@ declare(strict_types = 1);
 namespace Component\Attachment;
 
 use App\Core\Cache;
+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;
@@ -36,12 +37,12 @@ use Doctrine\ORM\QueryBuilder;
 
 class Attachment extends Component
 {
-    public function onAddRoute(RouteLoader $r): bool
+    public function onAddRoute(Router $r): bool
     {
-        $r->connect('attachment_show', '/object/attachment/{id<\d+>}', [C\Attachment::class, 'attachment_show']);
+        $r->connect('note_attachment_show', '/object/note/{note_id<\d+>}/attachment/{attachment_id<\d+>}', [C\Attachment::class, 'attachmentShowWithNote']);
-        $r->connect('attachment_view', '/object/attachment/{id<\d+>}/view', [C\Attachment::class, 'attachment_view']);
+        $r->connect('note_attachment_view', '/object/note/{note_id<\d+>}/attachment/{attachment_id<\d+>}/view', [C\Attachment::class, 'attachmentViewWithNote']);
-        $r->connect('attachment_download', '/object/attachment/{id<\d+>}/download', [C\Attachment::class, 'attachment_download']);
+        $r->connect('note_attachment_download', '/object/note/{note_id<\d+>}/attachment/{attachment_id<\d+>}/download', [C\Attachment::class, 'attachmentDownloadWithNote']);
-        $r->connect('attachment_thumbnail', '/object/attachment/{id<\d+>}/thumbnail/{size<big|medium|small>}', [C\Attachment::class, 'attachment_thumbnail']);
+        $r->connect('note_attachment_thumbnail', '/object/note/{note_id<\d+>}/attachment/{attachment_id<\d+>}/thumbnail/{size<big|medium|small>}', [C\Attachment::class, 'attachmentThumbnailWithNote']);
         return Event::next;
     }
 
@@ -56,26 +57,34 @@ class Attachment extends Component
         return Event::stop;
     }
 
-    public function onNoteDeleteRelated(Note &$note): bool
+    public function onNoteDeleteRelated(Note &$note, Actor $actor): bool
     {
         Cache::delete("note-attachments-{$note->getId()}");
-        E\AttachmentToNote::removeWhereNoteId($note->getId());
         foreach ($note->getAttachments() as $attachment) {
             $attachment->kill();
         }
+        DB::wrapInTransaction(fn () => E\AttachmentToNote::removeWhereNoteId($note->getId()));
+        Cache::delete("note-attachments-{$note->getId()}");
         return Event::next;
     }
 
-    public function onSearchQueryAddJoins(QueryBuilder &$note_qb, QueryBuilder &$actor_qb): bool
+    public function onCollectionQueryAddJoins(QueryBuilder &$note_qb, QueryBuilder &$actor_qb): bool
     {
-        $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)
+    public function onCollectionQueryCreateExpression(ExpressionBuilder $eb, string $term, ?string $locale, ?Actor $actor, &$note_expr, &$actor_expr): bool
     {
         $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,18 +24,18 @@ 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;
-use App\Core\Log;
+use App\Entity\Note;
-use App\Core\Router\Router;
-use Component\Attachment\Entity\AttachmentThumbnail;
 use App\Util\Common;
 use App\Util\Exception\ClientException;
 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;
@@ -46,22 +46,28 @@ class Attachment extends Controller
     /**
      * Generic function that handles getting a representation for an attachment
      */
-    private function attachment(int $id, callable $handle)
+    private function attachment(int $attachment_id, Note|int $note, callable $handle)
     {
-        if ($id <= 0) { // This should never happen coming from the router, but let's bail if it does
+        $attachment = DB::findOneBy('attachment', ['id' => $attachment_id]);
-            // @codeCoverageIgnoreStart
+        $note       = \is_int($note) ? Note::getById($note) : $note;
-            Log::critical("Attachment controller called with {$id}, which should not be possible");
+
+        // 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);
-        // @codeCoverageIgnoreEnd
+        }
-        } else {
+        // second: ensure proper scope
-            $res = null;
+        if (!$note->isVisibleTo(Common::actor())) {
-            if (Event::handle('AttachmentFileInfo', [$id, &$res]) != Event::stop) {
+            throw new ClientException(_m('You don\'t have permissions to view this attachment.'), 401);
-                // If no one else claims this attachment, use the default representation
+        }
-                try {
+
-                    $res = GSFile::getAttachmentFileInfo($id);
+        $res = null;
-                } catch (NoSuchFileException $e) {
+        if (Event::handle('AttachmentFileInfo', [$attachment, $note, &$res]) !== Event::stop) {
-                    // Continue below
+            // If no one else claims this attachment, use the default representation
-                }
+            try {
+                $res = GSFile::getAttachmentFileInfo($attachment_id);
+            } catch (NoSuchFileException $e) {
+                // Continue below
             }
         }
 
@@ -73,6 +79,9 @@ class Attachment extends Controller
                 throw new ServerException('This attachment is not stored locally.');
             // @codeCoverageIgnoreEnd
             } else {
+                $res['attachment'] = $attachment;
+                $res['note']       = $note;
+                $res['title']      = $attachment->getBestTitle($note);
                 return $handle($res);
             }
         }
@@ -81,16 +90,17 @@ class Attachment extends Controller
     /**
      * The page where the attachment and it's info is shown
      */
-    public function attachment_show(Request $request, int $id)
+    public function attachmentShowWithNote(Request $request, int $note_id, int $attachment_id)
     {
         try {
-            $attachment = DB::findOneBy('attachment', ['id' => $id]);
+            return $this->attachment($attachment_id, $note_id, function ($res) use ($note_id, $attachment_id) {
-            return $this->attachment($id, function ($res) use ($id, $attachment) {
                 return [
-                    '_template'        => '/cards/attachments/show.html.twig',
+                    '_template'        => 'attachment/view.html.twig',
-                    'download'         => Router::url('attachment_download', ['id' => $id]),
+                    'download'         => $res['attachment']->getDownloadUrl(note: $note_id),
-                    'attachment'       => $attachment,
+                    'title'            => $res['title'],
-                    'right_panel_vars' => ['attachment_id' => $id],
+                    'attachment'       => $res['attachment'],
+                    'note'             => $res['note'],
+                    'right_panel_vars' => ['attachment_id' => $attachment_id, 'note_id' => $note_id],
                 ];
             });
         } catch (NotFoundException) {
@@ -101,27 +111,29 @@ class Attachment extends Controller
     /**
      * Display the attachment inline
      */
-    public function attachment_view(Request $request, int $id)
+    public function attachmentViewWithNote(Request $request, int $note_id, int $attachment_id)
     {
         return $this->attachment(
-            $id,
+            $attachment_id,
+            $note_id,
             fn (array $res) => GSFile::sendFile(
                 $res['filepath'],
                 $res['mimetype'],
-                GSFile::ensureFilenameWithProperExtension($res['filename'], $res['mimetype']) ?? $res['filename'],
+                GSFile::ensureFilenameWithProperExtension($res['title'], $res['mimetype']) ?? $res['filename'],
                 HeaderUtils::DISPOSITION_INLINE,
             ),
         );
     }
 
-    public function attachment_download(Request $request, int $id)
+    public function attachmentDownloadWithNote(Request $request, int $note_id, int $attachment_id)
     {
         return $this->attachment(
-            $id,
+            $attachment_id,
+            $note_id,
             fn (array $res) => GSFile::sendFile(
                 $res['filepath'],
                 $res['mimetype'],
-                GSFile::ensureFilenameWithProperExtension($res['filename'], $res['mimetype']) ?? $res['filename'],
+                GSFile::ensureFilenameWithProperExtension($res['title'], $res['mimetype']) ?? $res['filename'],
                 HeaderUtils::DISPOSITION_ATTACHMENT,
             ),
         );
@@ -130,16 +142,27 @@ class Attachment extends Controller
     /**
      * Controller to produce a thumbnail for a given attachment id
      *
-     * @param int $id Attachment ID
+     * @param int $attachment_id Attachment ID
      *
      * @throws \App\Util\Exception\DuplicateFoundException
      * @throws ClientException
      * @throws NotFoundException
      * @throws ServerException
      */
-    public function attachment_thumbnail(Request $request, int $id, string $size = 'small'): Response
+    public function attachmentThumbnailWithNote(Request $request, int $note_id, int $attachment_id, string $size = 'small'): Response
     {
-        $attachment = DB::findOneBy('attachment', ['id' => $id]);
+        $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

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 // {{{ License
 // This file is part of GNU social - https://www.gnu.org/software/social
 //
@@ -19,7 +21,7 @@
 
 namespace Component\Attachment\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use DateTimeInterface;
 
@@ -39,7 +41,7 @@ class ActorToAttachment extends Entity
     // @codeCoverageIgnoreStart
     private int $attachment_id;
     private int $actor_id;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
     public function setAttachmentId(int $attachment_id): self
     {
@@ -77,10 +79,6 @@ class ActorToAttachment extends Entity
     // @codeCoverageIgnoreEnd
     // }}} Autocode
 
-    /**
-     * @param int $attachment_id
-     * @return mixed
-     */
     public static function removeWhereAttachmentId(int $attachment_id): mixed
     {
         return DB::dql(
@@ -92,11 +90,6 @@ class ActorToAttachment extends Entity
         );
     }
 
-    /**
-     * @param int $actor_id
-     * @param int $attachment_id
-     * @return mixed
-     */
     public static function removeWhere(int $attachment_id, int $actor_id): mixed
     {
         return DB::dql(
@@ -109,10 +102,6 @@ class ActorToAttachment extends Entity
         );
     }
 
-    /**
-     * @param int $actor_id
-     * @return mixed
-     */
     public static function removeWhereActorId(int $actor_id): mixed
     {
         return DB::dql(

components/Attachment/Entity/Attachment.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 // {{{ License
 
 // This file is part of GNU social - https://www.gnu.org/software/social
@@ -22,17 +24,18 @@
 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\Entity\Note;
 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;
@@ -57,13 +60,13 @@ class Attachment extends Entity
     // {{{ Autocode
     // @codeCoverageIgnoreStart
     private int $id;
-    private int $lives = 1;
+    private int $lives        = 1;
-    private ?string $filehash;
+    private ?string $filehash = null;
-    private ?string $mimetype;
+    private ?string $mimetype = null;
-    private ?string $filename;
+    private ?string $filename = null;
-    private ?int $size;
+    private ?int $size        = null;
-    private ?int $width;
+    private ?int $width       = null;
-    private ?int $height;
+    private ?int $height      = null;
     private DateTimeInterface $modified;
 
     public function setId(int $id): self
@@ -77,25 +80,20 @@ class Attachment extends Entity
         return $this->id;
     }
 
-    /**
+    public function setLives(int $lives): self
-     * @return int
+    {
-     */
+        $this->lives = $lives;
+        return $this;
+    }
+
     public function getLives(): int
     {
         return $this->lives;
     }
 
-    /**
-     * @param int $lives
-     */
-    public function setLives(int $lives): void
-    {
-        $this->lives = $lives;
-    }
-
     public function setFilehash(?string $filehash): self
     {
-        $this->filehash = $filehash;
+        $this->filehash = \is_null($filehash) ? null : mb_substr($filehash, 0, 64);
         return $this;
     }
 
@@ -106,7 +104,7 @@ class Attachment extends Entity
 
     public function setMimetype(?string $mimetype): self
     {
-        $this->mimetype = $mimetype;
+        $this->mimetype = \is_null($mimetype) ? null : mb_substr($mimetype, 0, 255);
         return $this;
     }
 
@@ -117,7 +115,7 @@ class Attachment extends Entity
 
     public function setFilename(?string $filename): self
     {
-        $this->filename = $filename;
+        $this->filename = \is_null($filename) ? null : mb_substr($filename, 0, 191);
         return $this;
     }
 
@@ -176,44 +174,36 @@ class Attachment extends Entity
     public function getMimetypeMajor(): ?string
     {
         $mime = $this->getMimetype();
-        return is_null($mime) ? $mime : GSFile::mimetypeMajor($mime);
+        return \is_null($mime) ? $mime : GSFile::mimetypeMajor($mime);
     }
 
     public function getMimetypeMinor(): ?string
     {
         $mime = $this->getMimetype();
-        return is_null($mime) ? $mime : GSFile::mimetypeMinor($mime);
+        return \is_null($mime) ? $mime : GSFile::mimetypeMinor($mime);
     }
 
-    /**
-     * @return int
-     */
     public function livesIncrementAndGet(): int
     {
         ++$this->lives;
         return $this->lives;
     }
 
-    /**
-     * @return int
-     */
     public function livesDecrementAndGet(): int
     {
         --$this->lives;
         return $this->lives;
     }
 
-    const FILEHASH_ALGO = 'sha256';
+    public const FILEHASH_ALGO = 'sha256';
 
     /**
      * Delete a file if safe, removes dependencies, cleanups and flushes
-     *
-     * @return bool
      */
     public function kill(): bool
     {
         if ($this->livesDecrementAndGet() <= 0) {
-            return $this->delete();
+            return DB::wrapInTransaction(fn () => $this->delete());
         }
         return true;
     }
@@ -223,7 +213,7 @@ class Attachment extends Entity
      */
     public function deleteStorage(): bool
     {
-        if (!is_null($filepath = $this->getPath())) {
+        if (!\is_null($filepath = $this->getPath())) {
             if (file_exists($filepath)) {
                 if (@unlink($filepath) === false) {
                     // @codeCoverageIgnoreStart
@@ -234,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::wrapInTransaction(fn () => DB::persist($this));
-                    DB::flush();
                 }
             } else {
                 // @codeCoverageIgnoreStart
@@ -248,6 +237,8 @@ class Attachment extends Entity
 
     /**
      * Attachment delete always removes dependencies, cleanups and flushes
+     * WARNING: Wrap this function in a transaction!
+     *
      * @see kill() It's more likely that you want to use that rather than call delete directly
      */
     protected function delete(): bool
@@ -261,7 +252,7 @@ class Attachment extends Entity
 
         // Collect files starting with the one associated with this attachment
         $files = [];
-        if (!is_null($filepath = $this->getPath())) {
+        if (!\is_null($filepath = $this->getPath())) {
             $files[] = $filepath;
         }
 
@@ -306,25 +297,21 @@ class Attachment extends Entity
     /**
      * TODO: Maybe this isn't the best way of handling titles
      *
-     * @param null|Note $note
-     *
      * @throws DuplicateFoundException
      * @throws NotFoundException
      * @throws ServerException
-     *
-     * @return string
      */
     public function getBestTitle(?Note $note = null): string
     {
         // If we have a note, then the best title is the title itself
-        if (!is_null(($note))) {
+        if (!\is_null(($note))) {
             $title = Cache::get('attachment-title-' . $this->getId() . '-' . $note->getId(), function () use ($note) {
                 try {
                     $attachment_to_note = DB::findOneBy('attachment_to_note', [
                         'attachment_id' => $this->getId(),
                         'note_id'       => $note->getId(),
                     ]);
-                    if (!is_null($attachment_to_note->getTitle())) {
+                    if (!\is_null($attachment_to_note->getTitle())) {
                         return $attachment_to_note->getTitle();
                     }
                 } catch (NotFoundException) {
@@ -332,14 +319,13 @@ class Attachment extends Entity
                     Event::handle('AttachmentGetBestTitle', [$this, $note, &$title]);
                     return $title;
                 }
-                return null;
             });
             if ($title != null) {
                 return $title;
             }
         }
         // Else
-        if (!is_null($filename = $this->getFilename())) {
+        if (!\is_null($filename = $this->getFilename())) {
             // A filename would do just as well
             return $filename;
         } else {
@@ -353,38 +339,51 @@ 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()
     {
         $filename = $this->getFilename();
-        return is_null($filename) ? null : Common::config('attachments', 'dir') . DIRECTORY_SEPARATOR . $filename;
+        return \is_null($filename) ? null : Common::config('attachments', 'dir') . \DIRECTORY_SEPARATOR . $filename;
     }
 
-    public function getUrl(int $type = Router::ABSOLUTE_URL): string
+    public function getUrl(Note|int $note, int $type = Router::ABSOLUTE_URL): string
     {
-        return Router::url(id: 'attachment_view', args: ['id' => $this->getId()], type: $type);
+        return Router::url(id: 'note_attachment_view', args: ['note_id' => \is_int($note) ? $note : $note->getId(), 'attachment_id' => $this->getId()], type: $type);
+    }
+
+    public function getShowUrl(Note|int $note, int $type = Router::ABSOLUTE_URL): string
+    {
+        return Router::url(id: 'note_attachment_show', args: ['note_id' => \is_int($note) ? $note : $note->getId(), 'attachment_id' => $this->getId()], type: $type);
+    }
+
+    public function getDownloadUrl(Note|int $note, int $type = Router::ABSOLUTE_URL): string
+    {
+        return Router::url(id: 'note_attachment_download', args: ['note_id' => \is_int($note) ? $note : $note->getId(), 'attachment_id' => $this->getId()], type: $type);
     }
 
     /**
-     * @param null|string $size
-     * @param bool        $crop
-     *
      * @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(?string $size = null)
+    public function getThumbnailUrl(Note|int $note, ?string $size = null): string
     {
-        return Router::url('attachment_thumbnail', ['id' => $this->getId(), 'size' => $size ?? Common::config('thumbnail', 'default_size')]);
+        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')]);
     }
 
     public static function schemaDef(): array
@@ -393,7 +392,7 @@ class Attachment extends Entity
             'name'   => 'attachment',
             'fields' => [
                 'id'       => ['type' => 'serial',    'not null' => true],
-                'lives'    => ['type' => 'int',       'not null' => true, 'description' => 'RefCount'],
+                'lives'    => ['type' => 'int',       'default' => 1, 'not null' => true, 'description' => 'RefCount, starts with 1'],
                 'filehash' => ['type' => 'varchar',   'length' => 64,  'description' => 'sha256 of the file contents, if the file is stored locally'],
                 'mimetype' => ['type' => 'varchar',   'length' => 255,  'description' => 'resource mime type 127+1+127 as per rfc6838#section-4.2'],
                 'filename' => ['type' => 'varchar',   'length' => 191, 'description' => 'file name of resource when available'],

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;
@@ -66,12 +67,11 @@ class AttachmentThumbnail extends Entity
         'medium' => self::SIZE_MEDIUM,
         'big'    => self::SIZE_BIG,
     ];
-
     // {{{ Autocode
     // @codeCoverageIgnoreStart
     private int $attachment_id;
-    private ?string $mimetype;
+    private ?string $mimetype = null;
-    private int $size = self::SIZE_SMALL;
+    private int $size         = 0;
     private string $filename;
     private int $width;
     private int $height;
@@ -90,7 +90,7 @@ class AttachmentThumbnail extends Entity
 
     public function setMimetype(?string $mimetype): self
     {
-        $this->mimetype = $mimetype;
+        $this->mimetype = \is_null($mimetype) ? null : mb_substr($mimetype, 0, 129);
         return $this;
     }
 
@@ -99,20 +99,20 @@ class AttachmentThumbnail extends Entity
         return $this->mimetype;
     }
 
-    public function getSize(): int
-    {
-        return $this->size;
-    }
-
     public function setSize(int $size): self
     {
         $this->size = $size;
         return $this;
     }
 
+    public function getSize(): int
+    {
+        return $this->size;
+    }
+
     public function setFilename(string $filename): self
     {
-        $this->filename = $filename;
+        $this->filename = mb_substr($filename, 0, 191);
         return $this;
     }
 
@@ -121,6 +121,28 @@ class AttachmentThumbnail extends Entity
         return $this->filename;
     }
 
+    public function setWidth(int $width): self
+    {
+        $this->width = $width;
+        return $this;
+    }
+
+    public function getWidth(): int
+    {
+        return $this->width;
+    }
+
+    public function setHeight(int $height): self
+    {
+        $this->height = $height;
+        return $this;
+    }
+
+    public function getHeight(): int
+    {
+        return $this->height;
+    }
+
     public function setModified(DateTimeInterface $modified): self
     {
         $this->modified = $modified;
@@ -132,28 +154,6 @@ class AttachmentThumbnail extends Entity
         return $this->modified;
     }
 
-    public function getWidth(): int
-    {
-        return $this->width;
-    }
-
-    public function setWidth(int $width): self
-    {
-        $this->width = $width;
-        return $this;
-    }
-
-    public function getHeight(): int
-    {
-        return $this->height;
-    }
-
-    public function setHeight(int $height): self
-    {
-        $this->height = $height;
-        return $this;
-    }
-
     // @codeCoverageIgnoreEnd
     // }}} Autocode
 
@@ -180,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]);
         }
     }
 
@@ -205,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())) {
@@ -214,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();
@@ -254,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())]);
     }
 
     /**
@@ -278,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

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 // {{{ License
 // This file is part of GNU social - https://www.gnu.org/software/social
 //
@@ -19,7 +21,7 @@
 
 namespace Component\Attachment\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use DateTimeInterface;
 
@@ -37,20 +39,9 @@ class AttachmentToLink extends Entity
 {
     // {{{ Autocode
     // @codeCoverageIgnoreStart
-    private int $attachment_id;
     private int $link_id;
-    private \DateTimeInterface $modified;
+    private int $attachment_id;
-
+    private DateTimeInterface $modified;
-    public function setAttachmentId(int $attachment_id): self
-    {
-        $this->attachment_id = $attachment_id;
-        return $this;
-    }
-
-    public function getAttachmentId(): int
-    {
-        return $this->attachment_id;
-    }
 
     public function setLinkId(int $link_id): self
     {
@@ -63,6 +54,17 @@ class AttachmentToLink extends Entity
         return $this->link_id;
     }
 
+    public function setAttachmentId(int $attachment_id): self
+    {
+        $this->attachment_id = $attachment_id;
+        return $this;
+    }
+
+    public function getAttachmentId(): int
+    {
+        return $this->attachment_id;
+    }
+
     public function setModified(DateTimeInterface $modified): self
     {
         $this->modified = $modified;
@@ -77,10 +79,6 @@ class AttachmentToLink extends Entity
     // @codeCoverageIgnoreEnd
     // }}} Autocode
 
-    /**
-     * @param int $attachment_id
-     * @return mixed
-     */
     public static function removeWhereAttachmentId(int $attachment_id): mixed
     {
         return DB::dql(
@@ -92,11 +90,6 @@ class AttachmentToLink extends Entity
         );
     }
 
-    /**
-     * @param int $link_id
-     * @param int $attachment_id
-     * @return mixed
-     */
     public static function removeWhere(int $link_id, int $attachment_id): mixed
     {
         return DB::dql(
@@ -109,10 +102,6 @@ class AttachmentToLink extends Entity
         );
     }
 
-    /**
-     * @param int $link_id
-     * @return mixed
-     */
     public static function removeWhereLinkId(int $link_id): mixed
     {
         return DB::dql(

components/Attachment/Entity/AttachmentToNote.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 // {{{ License
 // This file is part of GNU social - https://www.gnu.org/software/social
 //
@@ -19,8 +21,7 @@
 
 namespace Component\Attachment\Entity;
 
-use App\Core\Cache;
+use App\Core\DB;
-use App\Core\DB\DB;
 use App\Core\Entity;
 use DateTimeInterface;
 
@@ -44,8 +45,8 @@ class AttachmentToNote extends Entity
     // @codeCoverageIgnoreStart
     private int $attachment_id;
     private int $note_id;
-    private ?string $title;
+    private ?string $title = null;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
     public function setAttachmentId(int $attachment_id): self
     {
@@ -94,11 +95,6 @@ class AttachmentToNote extends Entity
     // @codeCoverageIgnoreEnd
     // }}} Autocode
 
-    /**
-     * @param int $note_id
-     * @param int $attachment_id
-     * @return mixed
-     */
     public static function removeWhere(int $note_id, int $attachment_id): mixed
     {
         return DB::dql(
@@ -111,10 +107,6 @@ class AttachmentToNote extends Entity
         );
     }
 
-    /**
-     * @param int $note_id
-     * @return mixed
-     */
     public static function removeWhereNoteId(int $note_id): mixed
     {
         return DB::dql(
@@ -126,10 +118,6 @@ class AttachmentToNote extends Entity
         );
     }
 
-    /**
-     * @param int $attachment_id
-     * @return mixed
-     */
     public static function removeWhereAttachmentId(int $attachment_id): mixed
     {
         return DB::dql(

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');
+        $client->request('GET', '/object/note/1/attachment/0');
-        $this->assertResponseStatusCodeSame(404);
-        $client->request('GET', '/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();
+        $client        = static::createClient();
-        $id      = DB::findOneBy('attachment', ['filehash' => '5d8ee7ead51a28803b4ee5cb2306a0b90b6ba570f1e5bcc2209926f6ab08e7ea'])->getId();
+        $attachment_id = DB::findOneBy(Attachment::class, ['filehash' => '5d8ee7ead51a28803b4ee5cb2306a0b90b6ba570f1e5bcc2209926f6ab08e7ea'])->getId();
-        $crawler = $client->request('GET', "/attachment/{$id}{$suffix}");
+        $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 Component\Attachment\Entity\AttachmentToNote;
+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,13 +19,14 @@ 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 Component\Attachment\Entity\AttachmentThumbnail;
 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;
 use SplFileInfo;
@@ -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()];
+        $actual = $attachment->getThumbnails();
-        $at_thumbs = F\sort($attachment->getThumbnails(), $sort);
+        static::assertSame(\count($expected), \count($actual));
-        static::assertSame($thumbs, $at_thumbs);
+        foreach ($expected as $e) {
-        array_pop($thumbs);
+            $a = array_shift($actual);
-        $thumb->delete(flush: true);
+            static::assertObjectEquals($e, $a);
-        $at_thumbs = F\sort($attachment->getThumbnails(), $sort);
+        }
-        static::assertSame($thumbs, $at_thumbs);
+
+        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";
+        $expected   = "/object/note/42/attachment/{$id}/thumbnail/big";
-        static::assertSame($url, $thumb->getUrl());
+        static::assertSame($expected, $thumb->getUrl(note: 42));
     }
 }

components/Avatar/Avatar.php

@@ -22,13 +22,14 @@ 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;
-use App\Core\Router\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 Symfony\Component\HttpFoundation\Request;
@@ -39,10 +40,10 @@ class Avatar extends Component
     {
     }
 
-    public function onAddRoute(RouteLoader $r): bool
+    public function onAddRoute(Router $r): bool
     {
-        $r->connect('avatar_actor', '/actor/{actor_id<\d+>}/avatar/{size<full|big|medium|small>?full}', [Controller\Avatar::class, 'avatar_view']);
+        $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>?full}', [Controller\Avatar::class, 'default_avatar_view']);
+        $r->connect('avatar_default', '/avatar/default/{size<full|big|medium|small>?medium}', [Controller\Avatar::class, 'default_avatar_view']);
         $r->connect('avatar_settings', '/settings/avatar', [Controller\Avatar::class, 'settings_avatar']);
         return Event::next;
     }
@@ -102,7 +103,7 @@ class Avatar extends Component
     /**
      * Get the cached avatar associated with the given Actor id, or the current user if not given
      */
-    public static function getUrl(int $actor_id, string $size = 'full', int $type = Router::ABSOLUTE_PATH): string
+    public static function getUrl(int $actor_id, string $size = 'medium', int $type = Router::ABSOLUTE_PATH): string
     {
         try {
             return self::getAvatar($actor_id)->getUrl($size, $type);
@@ -111,13 +112,13 @@ class Avatar extends Component
         }
     }
 
-    public static function getDimensions(int $actor_id, string $size = 'full')
+    public static function getDimensions(int $actor_id, string $size = 'medium')
     {
         try {
             $attachment = self::getAvatar($actor_id)->getAttachment();
-            return ['width' => $attachment->getWidth(), 'height' => $attachment->getHeight()];
+            return ['width' => (int) $attachment->getWidth(), 'height' => (int) $attachment->getHeight()];
         } catch (NoAvatarException) {
-            return ['width' => Common::config('thumbnail', 'small'), 'height' => Common::config('thumbnail', 'small')];
+            return ['width' => (int) (Common::config('thumbnail', 'small')), 'height' => (int) (Common::config('thumbnail', 'small'))];
         }
     }
 
@@ -127,7 +128,7 @@ class Avatar extends Component
      * Returns the avatar file's hash, mimetype, title and path.
      * Ensures exactly one cached value exists
      */
-    public static function getAvatarFileInfo(int $actor_id, string $size = 'full'): array
+    public static function getAvatarFileInfo(int $actor_id, string $size = 'medium'): array
     {
         $res = Cache::get(
             "avatar-file-info-{$actor_id}-{$size}",
@@ -151,8 +152,12 @@ class Avatar extends Component
                 'title'    => 'default_avatar.svg',
             ];
         } else {
-            $res             = $res[0]; // A user must always only have one avatar.
+            $res = $res[0]; // A user must always only have one avatar.
-            $res['filepath'] = DB::findOneBy('attachment', ['id' => $res['id']])->getPath();
+            if ($size === 'full') {
+                $res['filepath'] = Attachment::getByPK(['id' => $res['id']])->getPath();
+            } else {
+                $res['filepath'] = AttachmentThumbnail::getOrCreate(Attachment::getByPK(['id' => $res['id']]), $size)->getPath();
+            }
             return $res;
         }
     }

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;
@@ -33,7 +33,6 @@ use function App\Core\I18n\_m;
 use App\Core\Log;
 use App\Util\Common;
 use App\Util\Exception\ClientException;
-use App\Util\Exception\NotFoundException;
 use App\Util\TemporaryFile;
 use Component\Avatar\Entity\Avatar as AvatarEntity;
 use Exception;
@@ -57,13 +56,8 @@ class Avatar extends Controller
      */
     public function avatar_view(Request $request, int $actor_id, string $size): Response
     {
-        switch ($size) {
+        $res = \Component\Avatar\Avatar::getAvatarFileInfo($actor_id, $size);
-            case 'full':
+        return M::sendFile($res['filepath'], $res['mimetype'], $res['title']);
-                $res = \Component\Avatar\Avatar::getAvatarFileInfo($actor_id);
-                return M::sendFile($res['filepath'], $res['mimetype'], $res['title']);
-            default:
-                throw new Exception('Not implemented');
-        }
     }
 
     /**
@@ -85,15 +79,14 @@ class Avatar extends Controller
             $user     = Common::user();
             $actor_id = $user->getId();
             if ($data['remove'] == true) {
-                try {
+                if (\is_null($avatar = DB::findOneBy(AvatarEntity::class, ['actor_id' => $actor_id], return_null: true))) {
-                    $avatar = DB::findOneBy('avatar', ['actor_id' => $actor_id]);
+                    $form->addError(new FormError(_m('No avatar set, so cannot delete.')));
+                } else {
                     $avatar->delete();
-                    Event::handle('AvatarUpdate', [$user->getId()]);
-                } catch (NotFoundException) {
-                    $form->addError(new FormError(_m('No avatar set, so cannot delete')));
                 }
             } else {
                 $attachment = null;
+                $title      = $data['avatar']?->getClientOriginalName() ?? null;
                 if (isset($data['hidden'])) {
                     // Cropped client side
                     $matches = [];
@@ -113,15 +106,18 @@ class Avatar extends Controller
                     $file       = $data['avatar'];
                     $attachment = GSFile::storeFileAsAttachment($file);
                 } else {
-                    throw new ClientException('Invalid form');
+                    throw new ClientException(_m('Invalid form.'));
                 }
                 // Delete current avatar if there's one
-                $avatar = DB::find('avatar', ['actor_id' => $actor_id]);
+                if (!\is_null($avatar = DB::findOneBy(AvatarEntity::class, ['actor_id' => $actor_id], return_null: true))) {
-                $avatar?->delete();
+                    $avatar->delete();
+                }
                 DB::persist($attachment);
-                // Can only get new id after inserting
+                DB::persist(AvatarEntity::create([
-                DB::flush();
+                    'actor_id'      => $actor_id,
-                DB::persist(AvatarEntity::create(['actor_id' => $actor_id, 'attachment_id' => $attachment->getId()]));
+                    'attachment_id' => $attachment->getId(),
+                    'title'         => $title,
+                ]));
                 DB::flush();
                 Event::handle('AvatarUpdate', [$user->getId()]);
             }

components/Avatar/Entity/Avatar.php

@@ -24,11 +24,13 @@ 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\Router\Router;
+use App\Core\Event;
-use Component\Attachment\Entity\Attachment;
+use App\Core\Router;
 use App\Util\Common;
+use Component\Attachment\Entity\Attachment;
+use Component\Attachment\Entity\AttachmentThumbnail;
 use DateTimeInterface;
 
 /**
@@ -51,7 +53,7 @@ class Avatar extends Entity
     // @codeCoverageIgnoreStart
     private int $actor_id;
     private int $attachment_id;
-    private ?string $title;
+    private ?string $title = null;
     private DateTimeInterface $created;
     private DateTimeInterface $modified;
 
@@ -77,16 +79,17 @@ class Avatar extends Entity
         return $this->attachment_id;
     }
 
+    public function setTitle(?string $title): self
+    {
+        $this->title = \is_null($title) ? null : mb_substr($title, 0, 191);
+        return $this;
+    }
+
     public function getTitle(): ?string
     {
         return $this->title;
     }
 
-    public function setTitle(?string $title): void
-    {
-        $this->title = $title;
-    }
-
     public function setCreated(DateTimeInterface $created): self
     {
         $this->created = $created;
@@ -114,7 +117,7 @@ class Avatar extends Entity
 
     private ?Attachment $attachment = null;
 
-    public function getUrl(string $size = 'full', int $type = Router::ABSOLUTE_PATH): string
+    public function getUrl(string $size = 'medium', int $type = Router::ABSOLUTE_PATH): string
     {
         $actor_id = $this->getActorId();
         return Cache::get("avatar-url-{$actor_id}-{$size}-{$type}", fn () => Router::url('avatar_actor', ['actor_id' => $actor_id, 'size' => $size], $type));
@@ -122,10 +125,15 @@ class Avatar extends Entity
 
     public function getAttachment(): Attachment
     {
-        $this->attachment ??= DB::findOneBy('attachment', ['id' => $this->attachment_id]);
+        $this->attachment ??= DB::findOneBy('attachment', ['id' => $this->getAttachmentId()]);
         return $this->attachment;
     }
 
+    public function getAttachmentThumbnail(string $size): ?AttachmentThumbnail
+    {
+        return AttachmentThumbnail::getOrCreate($this->getAttachment(), $size);
+    }
+
     public static function getFilePathStatic(string $filename): string
     {
         return Common::config('avatar', 'dir') . $filename;
@@ -141,10 +149,11 @@ class Avatar extends Entity
      */
     public function delete(): bool
     {
-        DB::remove($this);
+        $actor_id   = $this->getActorId();
         $attachment = $this->getAttachment();
+        DB::wrapInTransaction(fn () => DB::removeBy(static::class, ['actor_id' => $actor_id]));
         $attachment->kill();
-        DB::flush();
+        Event::handle('AvatarUpdate', [$actor_id]);
         return true;
     }
 

components/Bridge/Entity/ForeignLink.php

@@ -44,12 +44,12 @@ class ForeignLink
     private int $user_id;
     private int $foreign_id;
     private int $service;
-    private ?string $credentials;
+    private ?string $credentials                = null;
-    private int $noticesync  = 1;
+    private int $noticesync                     = 1;
-    private int $friendsync  = 2;
+    private int $friendsync                     = 2;
-    private int $profilesync = 1;
+    private int $profilesync                    = 1;
-    private ?DateTimeInterface $last_noticesync;
+    private ?DateTimeInterface $last_noticesync = null;
-    private ?DateTimeInterface $last_friendsync;
+    private ?DateTimeInterface $last_friendsync = null;
     private DateTimeInterface $created;
     private DateTimeInterface $modified;
 
@@ -88,7 +88,7 @@ class ForeignLink
 
     public function setCredentials(?string $credentials): self
     {
-        $this->credentials = $credentials;
+        $this->credentials = \is_null($credentials) ? null : mb_substr($credentials, 0, 191);
         return $this;
     }
 

components/Bridge/Entity/ForeignService.php

@@ -43,7 +43,7 @@ class ForeignService
     // @codeCoverageIgnoreStart
     private int $id;
     private string $name;
-    private ?string $description;
+    private ?string $description = null;
     private DateTimeInterface $created;
     private DateTimeInterface $modified;
 
@@ -60,7 +60,7 @@ class ForeignService
 
     public function setName(string $name): self
     {
-        $this->name = $name;
+        $this->name = mb_substr($name, 0, 32);
         return $this;
     }
 
@@ -71,7 +71,7 @@ class ForeignService
 
     public function setDescription(?string $description): self
     {
-        $this->description = $description;
+        $this->description = \is_null($description) ? null : mb_substr($description, 0, 191);
         return $this;
     }
 

components/Bridge/Entity/ForeignUser.php

@@ -44,7 +44,7 @@ class ForeignUser
     private int $id;
     private int $service;
     private string $uri;
-    private ?string $nickname;
+    private ?string $nickname = null;
     private DateTimeInterface $created;
     private DateTimeInterface $modified;
 
@@ -72,7 +72,7 @@ class ForeignUser
 
     public function setUri(string $uri): self
     {
-        $this->uri = $uri;
+        $this->uri = mb_substr($uri, 0, 191);
         return $this;
     }
 
@@ -83,7 +83,7 @@ class ForeignUser
 
     public function setNickname(?string $nickname): self
     {
-        $this->nickname = $nickname;
+        $this->nickname = \is_null($nickname) ? null : mb_substr($nickname, 0, 191);
         return $this;
     }
 

components/Circle/Circle.php

@@ -0,0 +1,232 @@
+<?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 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
+{
+    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): bool
+    {
+        $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): bool
+    {
+        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;
+    }
+
+    public function onPostingFillTargetChoices(Request $request, Actor $actor, array &$targets): bool
+    {
+        $circles = $actor->getCircles();
+        foreach ($circles as $circle) {
+            $tag                = $circle->getTag();
+            $targets["#{$tag}"] = $tag;
+        }
+        return Event::next;
+    }
+
+    // Meta Collection -------------------------------------------------------------------
+
+    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
+    {
+        $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();
+    }
+
+    protected function createCollection(Actor $owner, array $vars, string $name)
+    {
+        $this->createCircle($owner, $name);
+        DB::persist(ActorTag::create([
+            'tagger' => $owner->getId(),
+            'tagged' => self::getActorIdFromVars($vars),
+            'tag'    => $name,
+        ]));
+    }
+
+    protected function removeItem(Actor $owner, array $vars, $items, array $collections)
+    {
+        $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']);
+    }
+
+    protected function addItem(Actor $owner, array $vars, $items, array $collections)
+    {
+        $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
+     */
+    protected function shouldAddToRightPanel(Actor $user, $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 $vars     Page vars sent by AppendRightPanelBlock event
+     * @param bool       $ids_only true if only the Collections ids are to be returned
+     */
+    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)
+    {
+        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,69 @@
+<?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
+     */
+    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(),
+            ];
+        }
+    }
+
+    public function circleByTaggerIdAndTag(int $tagger_id, string $tag): array
+    {
+        return $this->circleById(ActorCircle::getByPK(['tagger' => $tagger_id, 'tag' => $tag]));
+    }
+
+    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,107 @@
+<?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;
+
+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)
+    {
+        return \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],
+        );
+    }
+
+    public function getCollectionItems(int $owner_id, $collection_id): array
+    {
+        $notes = []; // TODO: Use Feed::query
+        return [
+            '_template' => 'collection/notes.html.twig',
+            'notes'     => $notes,
+        ];
+    }
+
+    public function feedByCircleId(int $circle_id)
+    {
+        // Owner id isn't used
+        return $this->getCollectionItems(0, $circle_id);
+    }
+
+    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);
+    }
+
+    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): ActorCircle
+    {
+        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)
+    {
+        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)
+    {
+        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,11 +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;
 use DateTimeInterface;
 
 /**
@@ -48,10 +49,10 @@ class ActorCircle extends Entity
     // {{{ Autocode
     // @codeCoverageIgnoreStart
     private int $id;
-    private int $tagger;
+    private ?int $tagger = null;
     private string $tag;
-    private ?string $description;
+    private ?string $description = null;
-    private ?bool $private;
+    private ?bool $private       = false;
     private DateTimeInterface $created;
     private DateTimeInterface $modified;
 
@@ -66,20 +67,20 @@ class ActorCircle extends Entity
         return $this->id;
     }
 
-    public function setTagger(int $tagger): self
+    public function setTagger(?int $tagger): self
     {
         $this->tagger = $tagger;
         return $this;
     }
 
-    public function getTagger(): int
+    public function getTagger(): ?int
     {
         return $this->tagger;
     }
 
     public function setTag(string $tag): self
     {
-        $this->tag = $tag;
+        $this->tag = mb_substr($tag, 0, 64);
         return $this;
     }
 
@@ -135,60 +136,86 @@ class ActorCircle extends Entity
     // @codeCoverageIgnoreEnd
     // }}} Autocode
 
-    public function getActorTag()
+    /**
+     * For use with MetaCollection trait only
+     */
+    public function getName(): string
+    {
+        return $this->tag;
+    }
+
+    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(
+            "circle-{$this->getId()}-tagged",
+            $handle,
+        );
+    }
+
+    public function getTaggedActors()
     {
         return Cache::get(
-            "actor-tag-{$this->getTag()}",
+            "circle-{$this->getId()}-tagged-actors",
-            fn () => DB::findBy('actor_tag', ['tagger' => $this->getTagger(), 'canonical' => $this->getTag()], limit: 1)[0], // TODO jank
+            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()]);
+                }
+            },
         );
     }
 
     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
+                    FROM actor a
-                    JOIN App\Entity\ActorCircleSubscription s
+                    JOIN actor_circle_subscription s
                         WITH a.id = s.actor_id
                     ORDER BY s.created DESC, a.id DESC
                     EOQ,
-                options: ['offset' => $offset,
+                options: [
-                    'limit'        => $limit, ],
+                    'offset' => $offset,
+                    'limit'  => $limit,
+                ],
             ),
         );
     }
 
+    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'],
+                'id'          => ['type' => 'serial',    'not null' => true, 'description' => 'unique identifier'], // An actor can be tagged by many actors
-                // 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'],
-                'tagger' => ['type' => 'int',       'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'many to one', 'name' => 'actor_list_tagger_fkey', 'not null' => true, 'description' => 'user making the tag'],
+                '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
-                // Many Actor Circles can reference (and probably will) an Actor Tag
-                '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
                 '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;
@@ -59,13 +61,13 @@ class ActorCircleSubscription extends Entity
         return $this->actor_id;
     }
 
-    public function setCircleid(int $circle_id): self
+    public function setCircleId(int $circle_id): self
     {
         $this->circle_id = $circle_id;
         return $this;
     }
 
-    public function getCircleid(): int
+    public function getCircleId(): int
     {
         return $this->circle_id;
     }
@@ -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;
-use App\Core\DB\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,8 +54,6 @@ class ActorTag extends Entity
     private int $tagger;
     private int $tagged;
     private string $tag;
-    private string $canonical;
-    private bool $use_canonical;
     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 = $tag;
+        $this->tag = mb_substr($tag, 0, 64);
         return $this;
     }
 
@@ -91,28 +89,6 @@ class ActorTag extends Entity
         return $this->tag;
     }
 
-    public function setCanonical(string $canonical): self
-    {
-        $this->canonical = $canonical;
-        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
     {
         $this->modified = $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 ($this->getTagger() === $this->getTagged()) { // Self-tag
-        if (!\is_null($actor)) {
+            return DB::findOneBy(ActorCircle::class, ['tagger' => null, 'tag' => $this->getTag()]);
-            $params['lang'] = $actor->getTopLanguage()->getLocale();
+        } 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'],
+                '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',       'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'name' => 'actor_tag_tagged_fkey', 'not null' => true, 'description' => 'actor tagged'],
+                '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' => 'hash tag associated with this actor'],
+                'tag'      => ['type' => 'varchar',  'length' => Tag::MAX_TAG_LENGTH, 'not null' => true, 'description' => 'hashtag associated with this note'],
-                'canonical'     => ['type' => 'varchar',   'length' => Tag::MAX_TAG_LENGTH, 'not null' => true, 'description' => 'ascii slug of tag'],
+                'modified' => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
-                'use_canonical' => ['type' => 'bool',      'not null' => true, 'description' => 'whether the user wanted to block canonical tags'],
+            ], // We will always assume the tagger's preferred language for tags and circles
-                'modified'      => ['type' => 'timestamp', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
+            'primary key' => ['tagger', 'tagged', 'tag'],
-            ],
-            'primary key' => ['tagger', 'tagged', 'tag', 'use_canonical'],
             '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,13 +2,11 @@
 
 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 Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\HttpFoundation\Request;
@@ -16,31 +14,27 @@ use Symfony\Component\HttpFoundation\Request;
 abstract class SelfTagsForm
 {
     /**
-     * @param E\ActorTag[]|E\ActorTagBlock[]|E\NoteTagBlock[] $tags
-     *
      * @return array [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) {
+        foreach ($actor_self_tags as $tag) {
-            $canon             = $tag->getCanonical();
+            $tag               = $tag->getTag();
-            $form_definition[] = ["{$canon}:old-tag", TextType::class, ['data' => '#' . $tag->getTag(), 'label' => ' ', 'disabled' => true]];
+            $form_definition[] = ["{$tag}:old-tag", TextType::class, ['data' => $tag, '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 = "{$tag}:remove", SubmitType::class, ['label' => $remove_label]];
-            $form_definition[] = [$existing_form_name = "{$canon}: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', TextType::class, ['label' => ' ', 'data' => [], 'required' => false, 'help' => _m('Tags for this actor (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]],
             [$add_form_name = 'new-tags-add', SubmitType::class, ['label' => $add_label]],
         ]);
 

components/Collection/Collection.php

@@ -0,0 +1,163 @@
+<?php
+
+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;
+
+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
+     */
+    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): bool
+    {
+        $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
+     */
+    public function onCollectionQueryCreateExpression(ExpressionBuilder $eb, string $term, ?string $locale, ?Actor $actor, &$note_expr, &$actor_expr)
+    {
+        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/Controller/CircleController.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Component\Collection\Util\Controller;
+
+class CircleController extends OrderedCollection
+{
+}

components/Collection/Util/Controller/Collection.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Component\Collection\Util\Controller;
+
+use App\Core\Controller;
+use App\Entity\Actor;
+use App\Util\Common;
+use Component\Collection\Collection as CollectionModule;
+
+class Collection extends Controller
+{
+    public function query(string $query, ?string $locale = null, ?Actor $actor = null, array $note_order_by = [], array $actor_order_by = []): array
+    {
+        $actor  ??= Common::actor();
+        $locale ??= Common::currentLanguage()->getLocale();
+        return CollectionModule::query($query, $this->int('page') ?? 1, $locale, $actor, $note_order_by, $actor_order_by);
+    }
+}

components/Collection/Util/Controller/FeedController.php

@@ -30,29 +30,36 @@ declare(strict_types = 1);
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
 
-namespace Component\Feed\Util;
+namespace Component\Collection\Util\Controller;
 
-use App\Core\Controller;
 use App\Core\Event;
+use App\Entity\Actor;
+use App\Entity\Note;
 use App\Util\Common;
+use Functional as F;
 
-abstract class FeedController extends Controller
+abstract class FeedController extends OrderedCollection
 {
     /**
-     * Post process the result of a feed controller, to remove any
+     * 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
      */
-    public static function post_process(array $result): array
+    protected function postProcess(array $result): array
     {
         $actor = Common::actor();
-
         if (\array_key_exists('notes', $result)) {
             $notes = $result['notes'];
+            self::enforceScope($notes, $actor, $result['actor'] ?? null);
             Event::handle('FilterNoteList', [$actor, &$notes, $result['request']]);
-            Event::handle('FormatNoteList', [$notes, &$result['notes']]);
+            Event::handle('FormatNoteList', [$notes, &$result['notes'], &$result['request']]);
         }
 
         return $result;
     }
+
+    private static function enforceScope(array &$notes, ?Actor $actor, ?Actor $in = null): void
+    {
+        $notes = F\select($notes, fn (Note $n) => $n->isVisibleTo($actor, $in));
+    }
 }

components/Collection/Util/Controller/MetaCollectionController.php

@@ -3,7 +3,6 @@
 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,109 +17,123 @@ 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/>.
-
 // }}}
+/**
+ * Collections Controller for GNU social
+ *
+ * @package   GNUsocial
+ * @category  Plugin
+ *
+ * @author    Phablulo <phablulo@gmail.com>
+ * @copyright 2018-2019, 2021 Free Software Foundation, Inc http://www.fsf.org
+ * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ */
 
-namespace Plugin\AttachmentCollections\Controller;
+namespace Component\Collection\Util\Controller;
 
+use App\Core\DB;
 use App\Core\Form;
-use App\Core\DB\DB;
-use App\Util\Common;
-use App\Core\Router\Router;
 use function App\Core\I18n\_m;
-use Component\Feed\Util\FeedController;
+use App\Entity\LocalUser;
-use Symfony\Component\HttpFoundation\Request;
+use App\Util\Common;
-use Plugin\AttachmentCollections\Entity\Collection;
+use App\Util\Exception\RedirectException;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\HttpFoundation\Request;
 
-class Controller extends FeedController
+abstract class MetaCollectionController extends FeedController
 {
-    public function collectionsByActorNickname(Request $request, string $nickname): array
+    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);
+
+    public function collectionsViewByActorNickname(Request $request, string $nickname): array
     {
-        $user = DB::findOneBy('local_user', ['nickname' => $nickname]);
+        $user = DB::findOneBy(LocalUser::class, ['nickname' => $nickname]);
         return self::collectionsView($request, $user->getId(), $nickname);
     }
+
     public function collectionsViewByActorId(Request $request, int $id): array
     {
         return self::collectionsView($request, $id, null);
     }
+
     /**
      * Generate Collections page
+     *
      * @param int     $id       actor id
      * @param ?string $nickname actor nickname
-     * @return array            twig template options
+     *
+     * @return array twig template options
      */
     public function collectionsView(Request $request, int $id, ?string $nickname): array
     {
-        $collections = DB::dql(
+        $collections = $this->getCollectionsByActorId($id);
-            'select collection from Plugin\AttachmentCollections\Entity\Collection collection '
+
-            . 'where collection.actor_id = :id',
+        $create_title      = _m('Create a ' . mb_strtolower(preg_replace('/([a-z0-9])([A-Z])/', '$1 $2', static::SLUG)));
-            ['id' => $id]
+        $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) {
             $create = Form::create([
                 ['name', TextType::class, [
-                    'label' => _m('Create collection'),
+                    'label' => $create_title,
-                    'attr' => [
+                    'attr'  => [
                         'placeholder' => _m('Name'),
-                        'required' => 'required'
+                        'required'    => 'required',
                     ],
                     'data' => '',
                 ]],
                 ['add_collection', SubmitType::class, [
-                    'label' => _m('Create collection'),
+                    'label' => $create_title,
                     'attr'  => [
-                        'title' => _m('Create collection'),
+                        'title' => $create_title,
                     ],
                 ]],
             ]);
             $create->handleRequest($request);
             if ($create->isSubmitted() && $create->isValid()) {
-                DB::persist(Collection::create([
+                $this->createCollection($id, $create->getData()['name']);
-                    'name' => $create->getData()['name'],
-                    'actor_id' => $id,
-                ]));
                 DB::flush();
+                throw new RedirectException();
             }
         }
 
         // We need to inject some functions in twig,
-        // but i don't want to create an enviroment for this
+        // but I don't want to create an environment for this
         // as twig docs suggest in https://twig.symfony.com/doc/2.x/advanced.html#functions.
         //
         // Instead, I'm using an anonymous class to encapsulate
-        // the functions and passing how the class to the template.
+        // the functions and passing that class to the template.
-        // It's suggested at https://stackoverflow.com/a/50364502.
+        // 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)
+        $fn = new class($id, $nickname, $request, $this, static::SLUG) {
-        {
             private $id;
             private $nick;
             private $request;
-            public function __construct($id, $nickname, $request)
+            private $parent;
+            private $slug;
+
+            public function __construct($id, $nickname, $request, $parent, $slug)
             {
-                $this->id = $id;
+                $this->id      = $id;
-                $this->nick = $nickname;
+                $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)
             {
-                if (\is_null($this->nick)) {
+                return $this->parent->getCollectionUrl($this->id, $this->nick, $cid);
-                    return Router::url(
-                        'collection_notes_view_by_actor_id',
-                        ['id' => $this->id, 'cid' => $cid]
-                    );
-                }
-                return Router::url(
-                    'collection_notes_view_by_nickname',
-                    ['nickname' => $this->nick, 'cid' => $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
@@ -133,11 +146,11 @@ class Controller extends FeedController
                     ['name', TextType::class, [
                         'attr' => [
                             'placeholder' => 'New name',
-                            'required' => 'required'
+                            'required'    => 'required',
                         ],
                         'data' => '',
                     ]],
-                    ['update_'.$collection->getId(), SubmitType::class, [
+                    ['update_' . $collection->getId(), SubmitType::class, [
                         'label' => _m('Save'),
                         'attr'  => [
                             'title' => _m('Save'),
@@ -146,61 +159,58 @@ class Controller extends FeedController
                 ]);
                 $edit->handleRequest($this->request);
                 if ($edit->isSubmitted() && $edit->isValid()) {
-                    $collection->setName($edit->getData()['name']);
+                    $this->parent->setCollectionName($this->id, $this->nick, $collection, $edit->getData()['name']);
-                    DB::persist($collection);
                     DB::flush();
+                    throw new RedirectException();
                 }
                 return $edit->createView();
             }
+
             // creating the remove form
             public function rmForm($collection)
             {
                 $rm = Form::create([
-                    ['remove_'.$collection->getId(), SubmitType::class, [
+                    ['remove_' . $collection->getId(), SubmitType::class, [
-                        'label' => _m('Delete collection'),
+                        'label' => _m('Delete ' . $this->slug),
                         'attr'  => [
-                            'title' => _m('Delete collection'),
+                            'title' => _m('Delete ' . $this->slug),
                             'class' => 'danger',
                         ],
                     ]],
                 ]);
                 $rm->handleRequest($this->request);
                 if ($rm->isSubmitted()) {
-                    DB::remove($collection);
+                    $this->parent->removeCollection($this->id, $this->nick, $collection);
                     DB::flush();
+                    throw new RedirectException();
                 }
                 return $rm->createView();
             }
         };
 
         return [
-            '_template'      => 'AttachmentCollections/collections.html.twig',
+            '_template'      => 'collection/meta_collections.html.twig',
-            'page_title'     => 'Attachment Collections list',
+            'page_title'     => $this->page_title,
+            'list_title'     => $collections_title,
             'add_collection' => $create?->createView(),
             'fn'             => $fn,
             'collections'    => $collections,
         ];
     }
 
-    public function collectionNotesByNickname(Request $request, string $nickname, int $cid): array
+    public function collectionsEntryViewNotesByNickname(Request $request, string $nickname, int $cid): array
     {
-        $user = DB::findOneBy('local_user', ['nickname' => $nickname]);
+        $user = DB::findOneBy(LocalUser::class, ['nickname' => $nickname]);
-        return self::collectionNotesByActorId($request, $user->getId(), $cid);
+        return self::collectionsEntryViewNotesByActorId($request, $user->getId(), $cid);
     }
-    public function collectionNotesByActorId(Request $request, int $id, int $cid): array
+
+    public function collectionsEntryViewNotesByActorId(Request $request, int $id, int $cid): array
     {
-        $collection = DB::findOneBy('attachment_collection', ['id' => $cid]);
+        $collection = $this->getCollectionBy($id, $cid);
-        $attchs = DB::dql(
+        $vars       = $this->getCollectionItems($id, $cid);
-            'select attch from attachment_album_entry entry '
+        return array_merge([
-            . 'left join Component\Attachment\Entity\Attachment attch '
+            '_template'  => 'collections/collection_entry_view.html.twig',
-                . 'with entry.attachment_id = attch.id '
+            'page_title' => $collection->getName(),
-            . 'where entry.collection_id = :cid',
+        ], $vars);
-            ['cid' => $cid]
-        );
-        return [
-            '_template'   => 'AttachmentCollections/collection.html.twig',
-            'page_title'  => $collection->getName(),
-            'attachments' => $attchs,
-        ];
     }
 }

components/Collection/Util/Controller/OrderedCollection.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Component\Collection\Util\Controller;
+
+class OrderedCollection extends Collection
+{
+}

components/Collection/Util/MetaCollectionTrait.php

@@ -0,0 +1,195 @@
+<?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/>.
+// }}}
+/**
+ * Collections for GNU social
+ *
+ * @package   GNUsocial
+ * @category  Plugin
+ *
+ * @author    Phablulo <phablulo@gmail.com>
+ * @copyright 2018-2019, 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;
+use App\Core\Event;
+use App\Core\Form;
+use function App\Core\I18n\_m;
+use App\Entity\Actor;
+use App\Util\Common;
+use App\Util\Exception\RedirectException;
+use App\Util\Formatting;
+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;
+
+trait MetaCollectionTrait
+{
+    //protected const SLUG        = 'collection';
+    //protected const PLURAL_SLUG = 'collections';
+
+    /**
+     * create a collection owned by Actor $owner.
+     *
+     * @param Actor  $owner The collection's owner
+     * @param array  $vars  Page vars sent by AppendRightPanelBlock event
+     * @param string $name  Collection's name
+     */
+    abstract protected function createCollection(Actor $owner, array $vars, string $name);
+    /**
+     * remove item from collections.
+     *
+     * @param Actor $owner       Current user
+     * @param array $vars        Page vars sent by AppendRightPanelBlock event
+     * @param array $items       Array of collections's ids to remove the current item from
+     * @param array $collections List of ids of collections owned by $owner
+     */
+    abstract protected function removeItem(Actor $owner, array $vars, array $items, array $collections);
+    /**
+     * add item to collections.
+     *
+     * @param Actor $owner       Current user
+     * @param array $vars        Page vars sent by AppendRightPanelBlock event
+     * @param array $items       Array of collections's ids to add the current item to
+     * @param array $collections List of ids of collections owned by $owner
+     */
+    abstract protected function addItem(Actor $owner, array $vars, array $items, array $collections);
+
+    /**
+     * Check the route to determine whether the widget should be added
+     */
+    abstract protected function shouldAddToRightPanel(Actor $user, $vars, Request $request): bool;
+    /**
+     * Get array of collections's owned by $actor
+     *
+     * @param Actor  $owner    Collection's owner
+     * @param ?array $vars     Page vars sent by AppendRightPanelBlock event
+     * @param bool   $ids_only if true, the function must return only the primary key or each collections
+     */
+    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.
+     */
+    public function onAppendRightPanelBlock(Request $request, $vars, &$res): bool
+    {
+        $user = Common::actor();
+        if (\is_null($user)) {
+            return Event::next;
+        }
+        if (!$this->shouldAddToRightPanel($user, $vars, $request)) {
+            return Event::next;
+        }
+        $collections = $this->getCollectionsBy($user);
+
+        // form: add to collection
+        $choices = [];
+        foreach ($collections as $col) {
+            $choices[$col->getName()] = $col->getId();
+        }
+
+        $collections = array_map(fn ($x) => $x->getId(), $collections);
+
+        $already_selected = $this->getCollectionsBy($user, $vars, true);
+        $add_form         = Form::create([
+            ['collections', ChoiceType::class, [
+                'choices'     => $choices,
+                'multiple'    => true,
+                'required'    => false,
+                'choice_attr' => function ($id) use ($already_selected) {
+                    if (\in_array($id, $already_selected)) {
+                        return ['selected' => 'selected'];
+                    }
+                    return [];
+                },
+            ]],
+            ['add', SubmitType::class, [
+                'label' => _m('Add to ' . static::PLURAL_SLUG),
+                'attr'  => [
+                    'title' => _m('Add to ' . static::PLURAL_SLUG),
+                ],
+            ]],
+        ]);
+        $add_form->handleRequest($request);
+        if ($add_form->isSubmitted() && $add_form->isValid()) {
+            $selected = $add_form->getData()['collections'];
+            $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->removeItem($user, $vars, $removed, $collections);
+            }
+            if (\count($added) > 0) {
+                $this->addItem($user, $vars, $added, $collections);
+            }
+            DB::flush();
+            throw new RedirectException();
+        }
+
+        // form: add to new collection
+        $create_form = Form::create([
+            ['name', TextType::class, [
+                'label' => _m('Add to a new ' . static::SLUG),
+                'attr'  => [
+                    'placeholder' => _m('New ' . static::SLUG . ' name'),
+                    'required'    => 'required',
+                ],
+                'data' => '',
+            ]],
+            ['create', SubmitType::class, [
+                'label' => _m('Create a new ' . static::SLUG),
+                'attr'  => [
+                    'title' => _m('Create a new ' . static::SLUG),
+                ],
+            ]],
+        ]);
+        $create_form->handleRequest($request);
+        if ($create_form->isSubmitted() && $create_form->isValid()) {
+            $name = $create_form->getData()['name'];
+            $this->createCollection($user, $vars, $name);
+            DB::flush();
+            throw new RedirectException();
+        }
+
+        $res[] = Formatting::twigRenderFile(
+            'collection/widget_add_to.html.twig',
+            [
+                'ctitle'          => _m('Add to ' . static::PLURAL_SLUG),
+                'user'            => $user,
+                'has_collections' => \count($collections) > 0,
+                'add_form'        => $add_form->createView(),
+                'create_form'     => $create_form->createView(),
+            ],
+        );
+        return Event::next;
+    }
+
+    public function onEndShowStyles(array &$styles, string $route): bool
+    {
+        $styles[] = 'components/Collection/assets/css/widget.css';
+        $styles[] = 'components/Collection/assets/css/pages.css';
+        return Event::next;
+    }
+}

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;
@@ -50,10 +50,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 +79,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)) {
+                    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)) {
+                    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($note_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);
                         }
@@ -103,9 +105,10 @@ abstract class Parser
                         $last_op = $delimiter;
                     }
                     $match = true;
-                    continue 2;
+                    break;
                 }
             }
+            // TODO
             if (!$match) {
                 ++$right;
             }
@@ -117,7 +120,7 @@ abstract class Parser
             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)) {
+        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

@@ -0,0 +1,70 @@
+{% extends 'stdgrid.html.twig' %}
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block body %}
+<section class="frame-section frame-section-padding">
+    <header class="feed-header">
+        {% if actors_feed_title is defined %}
+            {{ actors_feed_title.getHtml() }}
+        {% endif %}
+    </header>
+
+    {% 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>
+    </details>
+
+    <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/blocks/profile.html.twig' %}{% endblock profile_view %}
+                <hr>
+            {% endfor %}
+            <span class="frame-section-button-like">{% trans %}Page: %page%{% endtrans %}</span>
+        {% else %}
+            <span>{{ empty_message }}</span>
+        {% endif %}
+    </section>
+</section>
+{% endblock body %}

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

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

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

@@ -0,0 +1,34 @@
+{% extends 'stdgrid.html.twig' %}
+
+{% block title %}{% trans %}%page_title%{% endtrans %}{% endblock %}
+
+{% block body %}
+    <div class="frame-section frame-section-padding">
+        <h2 class="frame-section-title">{% trans %}%page_title%{% endtrans %}</h2>
+        {% if add_collection %}
+            <div class="frame-section section-form">
+                {{ form(add_collection) }}
+            </div>
+        {% endif %}
+        <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>
+                    <details title="Expand if you want to edit the collection's name">
+                        <summary>
+                            <span class="collection-action">{{ icon('edit') | raw }}</span>
+                        </summary>
+                        {{ form(fn.editForm(col)) }}
+                    </details>
+                    <details title="Expand if you want to delete the collection">
+                        <summary>
+                            <span class="collection-action">{{ icon('delete') | raw }}</span>
+                        </summary>
+                        {{ form(fn.rmForm(col)) }}
+                    </details>
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+{% endblock body %}

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

@@ -0,0 +1,58 @@
+{% extends 'stdgrid.html.twig' %}
+{% import '/cards/macros/note/factory.html.twig' as NoteFactory %}
+
+{% block title %}{% if page_title is defined %}{% trans %}%page_title%{% endtrans %}{% endif %}{% endblock %}
+
+{% block stylesheets %}
+    {{ parent() }}
+    <link rel="stylesheet" href="{{ asset('assets/default_theme/feeds.css') }}" type="text/css">
+{% endblock stylesheets %}
+
+{% block body %}
+    {% for block in handle_event('BeforeFeed', app.request) %}
+        {{ block | raw }}
+    {% endfor %}
+
+    {% 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') %}
+                            {% 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 class="hr-replies-end" role="separator" aria-label="{% trans %}Marks the end of previous conversation's initial note{% endtrans %}">
+                    {% endblock current_note %}
+                {% endfor %}
+            </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

@@ -0,0 +1,27 @@
+<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 %}
+            <section class="section-form">
+                {{ form(add_form) }}
+            </section>
+
+            <details class="frame-section-padding section-details-subtitle"
+                     title="Expand if you want to access more options.">
+                <summary class="details-summary-subtitle">
+                    <strong>{% trans %}Other options{% endtrans %}</strong>
+                </summary>
+                <section class="section-form">
+                    {{ form(create_form) }}
+                </section>
+            </details>
+        {% else %}
+            <section class="section-form">
+                {{ form(create_form) }}
+            </section>
+        {% endif %}
+    </details>
+</section>
+

components/Conversation/Controller/Conversation.php

@@ -20,42 +20,133 @@ declare(strict_types = 1);
 
 /**
  * @author    Hugo Sales <hugo@hsal.es>
- * @copyright 2021 Free Software Foundation, Inc http://www.fsf.org
+ * @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\Controller;
 
+use App\Core\Cache;
+use App\Core\DB;
+use App\Core\Form;
 use function App\Core\I18n\_m;
-use Component\Feed\Feed;
+use App\Core\Log;
-use Component\Feed\Util\FeedController;
+use App\Core\Router;
+use App\Entity\Note;
+use App\Util\Common;
+use App\Util\Exception\ClientException;
+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;
 
 class Conversation extends FeedController
 {
     /**
-     * Render conversation page
+     * Render conversation page.
+     *
+     * @param int $conversation_id To identify what Conversation is to be rendered
+     *
+     * @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)
+     */
+    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}",
+                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)),
+        ];
+    }
+
+    /**
+     * Controller for the note reply non-JS page
+     *
+     * Leverages the `PostingModifyData` event to add the `reply_to_id` field from the GET variable 'reply_to_id'
+     *
+     * @throws ClientException
+     * @throws NoLoggedInUser
+     * @throws NoSuchNoteException
+     * @throws ServerException
      *
      * @return array
      */
-    public function showConversation(Request $request, int $conversation_id)
+    public function addReply(Request $request)
     {
-        // TODO:
+        $user            = Common::ensureLoggedIn();
-        // if note is root -> just link
+        $note_id         = $this->int('reply_to_id', new ClientException(_m('Malformed query.')));
-        // if note is a reply -> link from above plus anchor
+        $note            = Note::ensureCanInteract(Note::getByPK($note_id), $user);
+        $conversation_id = $note->getConversationId();
+        return $this->showConversation($request, $conversation_id);
+    }
+
+    /**
+     * Creates form view for Muting Conversation extra action.
+     *
+     * @param int $conversation_id The Conversation id that this action targets
+     *
+     * @throws \App\Util\Exception\NoLoggedInUser
+     * @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
+     */
+    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('Unmute') : _m('Mute'), 'attr' => ['class' => '']]],
+        ]);
+
+        $form->handleRequest($request);
+        if ($form->isSubmitted() && $form->isValid()) {
+            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']);
+
+            // 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');
+            }
+        }
 
-        /*        $notes = DB::findBy(
-                    table: 'note',
-                    criteria: ['conversation_id' => $conversation_id],
-                    order_by: ['created' => 'DESC', 'id' => 'DESC']
-                );*/
-        $data  = Feed::query(query: "note-conversation:{$conversation_id}", page: $this->int('p') ?? 1);
-        $notes = $data['notes'];
         return [
-            '_template'     => 'feed/feed.html.twig',
+            '_template' => 'conversation/mute.html.twig',
-            'notes'         => $notes,
+            'notes'     => $this->query(
-            'should_format' => false,
+                query: "note-conversation:{$conversation_id}",
-            'page_title'    => _m('Conversation'),
+                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,29 +16,46 @@ 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\DB\DB;
+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\RouteLoader;
+use App\Core\Router;
-use App\Core\Router\Router;
+use App\Entity\Activity;
 use App\Entity\Actor;
 use App\Entity\Note;
 use App\Util\Common;
 use App\Util\Formatting;
-use Component\Conversation\Controller\Reply as ReplyController;
 use Component\Conversation\Entity\Conversation as ConversationEntity;
+use Component\Conversation\Entity\ConversationMute;
+use Functional as F;
 use Symfony\Component\HttpFoundation\Request;
 
 class Conversation extends Component
 {
+    public function onAddRoute(Router $r): bool
+    {
+        $r->connect('conversation', '/conversation/{conversation_id<\d+>}', [Controller\Conversation::class, 'showConversation']);
+        $r->connect('conversation_mute', '/conversation/{conversation_id<\d+>}/mute', [Controller\Conversation::class, 'muteConversation']);
+        $r->connect('conversation_reply_to', '/conversation/reply', [Controller\Conversation::class, 'addReply']);
+
+        return Event::next;
+    }
+
     /**
-     * **Assigns** the given local Note it's corresponding **Conversation**
+     * **Assigns** the given local Note it's corresponding **Conversation**.
      *
      * **If a _$parent_id_ is not given**, then the Actor is not attempting a reply,
      * therefore, we can assume (for now) that we need to create a new Conversation and assign it
@@ -48,6 +63,9 @@ class Conversation extends Component
      *
      * **On the other hand**, given a _$parent_id_, the Actor is attempting to post a reply. Meaning that,
      * this Note conversation_id should be same as the parent Note
+     *
+     * @param \App\Entity\Note $current_note Local Note currently being assigned a Conversation
+     * @param null|int         $parent_id    If present, it's a reply
      */
     public static function assignLocalConversation(Note $current_note, ?int $parent_id): void
     {
@@ -64,20 +82,27 @@ 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);
-        DB::flush();
     }
 
     /**
      * HTML rendering event that adds a reply link as a note
-     * action, if a user is logged in
+     * 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)
+     *
+     * @throws \App\Util\Exception\ServerException
+     *
+     * @return bool EventHook
      */
     public function onAddNoteActions(Request $request, Note $note, array &$actions): bool
     {
@@ -85,15 +110,19 @@ class Conversation extends Component
             return Event::next;
         }
 
-        // Generating URL for reply action route
+        $from = $request->query->has('from')
-        $args             = ['note_id' => $note->getId(), 'actor_id' => $note->getActor()->getId()];
+              ? $request->query->get('from')
-        $type             = Router::ABSOLUTE_PATH;
+              : $request->getPathInfo();
-        $reply_action_url = Router::url('reply_add', $args, $type);
 
-        $query_string = $request->getQueryString();
+        $reply_action_url = Router::url(
-        // Concatenating get parameter to redirect the user to where he came from
+            'conversation_reply_to',
-        $reply_action_url .= !\is_null($query_string) ? '?from=' : '&from=';
+            [
-        $reply_action_url .= mb_substr($query_string, 2);
+                'reply_to_id' => $note->getId(),
+                'from'        => $from,
+                '_fragment'   => 'note-anchor-' . $note->getId(),
+            ],
+            Router::ABSOLUTE_PATH,
+        );
 
         $reply_action = [
             'url'     => $reply_action_url,
@@ -103,79 +132,179 @@ class Conversation extends Component
         ];
 
         $actions[] = $reply_action;
-        return Event::next;
-    }
 
-    public function onAddExtraArgsToNoteContent(Request $request, Actor $actor, array $data, array &$extra_args): bool
-    {
-        // If Actor is adding a reply, get parent's Note id
-        // Else it's null
-        $extra_args['reply_to'] = $request->get('_route') === 'reply_add' ? (int) $request->get('note_id') : null;
         return Event::next;
     }
 
     /**
-     * Append on note information about user actions
+     * 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'])
+     *
+     * @return bool EventHook
      */
     public function onAppendCardNote(array $vars, array &$result): bool
     {
-        // if note is the original, append on end "user replied to this"
+        if (str_contains($vars['request']->getPathInfo(), 'conversation')) {
-        // if note is the reply itself: append on end "in response to user in conversation"
+            return Event::next;
-        $check_user = !\is_null(Common::user());
-        $note       = $vars['note'];
-
-        $complementary_info = '';
-        $reply_actor        = [];
-        $note_replies       = $note->getReplies();
-
-        // Get actors who replied
-        foreach ($note_replies as $reply) {
-            $reply_actor[] = Actor::getByPK($reply->getActorId());
         }
-        if (\count($reply_actor) < 1) {
+
+        // The current Note being rendered
+        $note = $vars['note'];
+
+        // Will have actors array, and action string
+        // Actors are the subjects, action is the verb (in the final phrase)
+        $reply_actors = F\map(
+            $note->getReplies(),
+            fn (Note $reply) => Actor::getByPK($reply->getActorId()),
+        );
+
+        if (empty($reply_actors)) {
             return Event::next;
         }
 
         // Filter out multiple replies from the same actor
-        $reply_actor = array_unique($reply_actor, \SORT_REGULAR);
+        $reply_actors = array_unique($reply_actors, \SORT_REGULAR);
+        $result[]     = ['actors' => $reply_actors, 'action' => 'replied to'];
 
-        // Add to complementary info
+        return Event::next;
-        foreach ($reply_actor as $actor) {
+    }
-            $reply_actor_url      = $actor->getUrl();
-            $reply_actor_nickname = $actor->getNickname();
 
-            if ($check_user && $actor->getId() === (Common::actor())->getId()) {
+    private function getReplyToIdFromRequest(Request $request): ?int
-                // If the reply is yours
+    {
-                $you_translation    = _m('You');
+        if (!\is_array($request->get('post_note')) || !\array_key_exists('_next', $request->get('post_note'))) {
-                $prepend            = "<a href={$reply_actor_url}>{$you_translation}</a>, " . ($prepend = &$complementary_info);
+            return null;
-                $complementary_info = $prepend;
+        }
-            } else {
+        $next = parse_url($request->get('post_note')['_next']);
-                // If the repeat is from someone else
+        if (!\array_key_exists('query', $next)) {
-                $complementary_info .= "<a href={$reply_actor_url}>{$reply_actor_nickname}</a>, ";
+            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
+     * Note **targeting** that specific Group.
+     *
+     * @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
+     *
+     * @return bool EventHook
+     */
+    public function onPostingGetContextActor(Request $request, Actor $actor, ?Actor &$context_actor): bool
+    {
+        $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());
+            return Event::stop;
+        }
+        return Event::next;
+    }
+
+    /**
+     * Posting event to add extra information to Component\Posting form data
+     *
+     * @param array $data Transport data to be filled with reply_to_id
+     *
+     * @throws \App\Util\Exception\ClientException
+     * @throws \App\Util\Exception\NoSuchNoteException
+     *
+     * @return bool EventHook
+     */
+    public function onPostingModifyData(Request $request, Actor $actor, array &$data): bool
+    {
+        $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;
         }
 
-        $complementary_info = rtrim(trim($complementary_info), ',');
+        return Event::next;
-        $complementary_info .= _m(' replied to this note.');
+    }
-        $result[] = Formatting::twigRenderString($complementary_info, []);
+
+    /**
+     * Add minimal Note card to RightPanel template
+     */
+    public function onPrependPostingForm(Request $request, array &$elements): bool
+    {
+        $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.
+     *
+     * @param \App\Entity\Note  $note  Note being deleted
+     * @param \App\Entity\Actor $actor Actor that performed the delete action
+     *
+     * @return bool EventHook
+     */
+    public function onNoteDeleteRelated(Note &$note, Actor $actor): bool
+    {
+        // Ensure we have the most up to date replies
+        Cache::delete(Note::cacheKeys($note->getId())['replies']);
+        DB::wrapInTransaction(fn () => F\each($note->getReplies(), fn (Note $note) => $note->setReplyTo(null)));
+        Cache::delete(Note::cacheKeys($note->getId())['replies']);
+        return Event::next;
+    }
+
+    /**
+     * 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)
+     *
+     * @throws \App\Util\Exception\ServerException
+     *
+     * @return bool EventHook
+     */
+    public function onAddExtraNoteActions(Request $request, Note $note, array &$actions): bool
+    {
+        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('Unmute conversation') : _m('Mute conversation'),
+            'classes' => '',
+            'url'     => $mute_extra_action_url,
+        ];
 
         return Event::next;
     }
 
-    public function onAddRoute(RouteLoader $r): bool
+    /**
+     * Prevents new Notifications to appear for muted conversations
+     *
+     * @param Activity $activity Notification Activity
+     *
+     * @return bool EventHook
+     */
+    public function onNewNotificationShould(Activity $activity, Actor $actor): bool
     {
-        $r->connect('reply_add', '/object/note/new?to={actor_id<\d+>}&reply_to={note_id<\d+>}', [ReplyController::class, 'addReply']);
+        if ($activity->getObjectType() === 'note' && ConversationMute::isMuted($activity, $actor)) {
-        $r->connect('conversation', '/conversation/{conversation_id<\d+>}', [Controller\Conversation::class, 'showConversation']);
-
-        return Event::next;
-    }
-
-    public function onPostingGetContextActor(Request $request, Actor $actor, ?Actor $context_actor)
-    {
-        $to_query = $request->get('actor_id');
-        if (!\is_null($to_query)) {
-            // Getting the actor itself
-            $context_actor = Actor::getById((int) $to_query);
             return Event::stop;
         }
         return Event::next;

components/Conversation/Entity/Conversation.php

@@ -23,8 +23,9 @@ declare(strict_types = 1);
 
 namespace Component\Conversation\Entity;
 
+use App\Core\DB;
 use App\Core\Entity;
-use App\Core\Router\Router;
+use App\Core\Router;
 
 /**
  * Entity class for Conversations
@@ -46,7 +47,6 @@ class Conversation extends Entity
     // {{{ Autocode
     // @codeCoverageIgnoreStart
     private int $id;
-    private string $uri;
     private int $initial_note_id;
 
     public function setId(int $id): self

components/Conversation/Entity/ConversationMute.php

@@ -0,0 +1,132 @@
+<?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\Conversation\Entity;
+
+use App\Core\Cache;
+use App\Core\DB;
+use App\Core\Entity;
+use App\Entity\Activity;
+use App\Entity\Actor;
+use App\Entity\LocalUser;
+use App\Entity\Note;
+use DateTimeInterface;
+
+/**
+ * Entity class for Conversations Mutes
+ *
+ * @category  DB
+ * @package   GNUsocial
+ *
+ * @author    Hugo Sales <hugo@hsal.es>
+ * @copyright 2022 Free Software Foundation, Inc http://www.fsf.org
+ * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
+ */
+class ConversationMute extends Entity
+{
+    // {{{ Autocode
+    // @codeCoverageIgnoreStart
+    private int $conversation_id;
+    private int $actor_id;
+    private DateTimeInterface $created;
+
+    public function setConversationId(int $conversation_id): self
+    {
+        $this->conversation_id = $conversation_id;
+        return $this;
+    }
+
+    public function getConversationId(): int
+    {
+        return $this->conversation_id;
+    }
+
+    public function setActorId(int $actor_id): self
+    {
+        $this->actor_id = $actor_id;
+        return $this;
+    }
+
+    public function getActorId(): int
+    {
+        return $this->actor_id;
+    }
+
+    public function setCreated(DateTimeInterface $created): self
+    {
+        $this->created = $created;
+        return $this;
+    }
+
+    public function getCreated(): DateTimeInterface
+    {
+        return $this->created;
+    }
+
+    // @codeCoverageIgnoreEnd
+    // }}} Autocode
+
+    public static function cacheKeys(int $conversation_id, int $actor_id): array
+    {
+        return [
+            'mute' => "conversation-mute-{$conversation_id}-{$actor_id}",
+        ];
+    }
+
+    /**
+     * Check if a conversation referenced by $object is muted form $actor
+     */
+    public static function isMuted(Activity|Note|int $object, Actor|LocalUser $actor): bool
+    {
+        $conversation_id = null;
+        if (\is_int($object)) {
+            $conversation_id = $object;
+        } elseif ($object instanceof Note) {
+            $conversation_id = $object->getConversationId();
+        } elseif ($object instanceof Activity) {
+            $conversation_id = Note::getById($object->getObjectId())->getConversationId();
+        }
+
+        return Cache::get(
+            self::cacheKeys($conversation_id, $actor->getId())['mute'],
+            fn () => (bool) DB::count('conversation_mute', ['conversation_id' => $conversation_id, 'actor_id' => $actor->getId()]),
+        );
+    }
+
+    public static function schemaDef(): array
+    {
+        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'],
+            ],
+            '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']],
+            ],
+        ];
+    }
+}

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

@@ -0,0 +1,21 @@
+{% extends 'collection/notes.html.twig' %}
+
+{% block body %}
+    <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/Conversation/templates/reply/add_reply.html.twig

@@ -1,18 +0,0 @@
-{% extends 'stdgrid.html.twig' %}
-{% import "/cards/note/view.html.twig" as noteView %}
-
-{% block title %}{{ 'Reply to ' | trans }}{{ note.getActorNickname() }}{{ '\'s note.' | trans }}{% endblock %}
-
-{% block stylesheets %}
-    {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('assets/default_theme/css/pages/feeds.css') }}" type="text/css">
-{% endblock stylesheets %}
-
-{% block body %}
-    {{ parent() }}
-    <div class="page">
-        <div class="main">
-            {{ noteView.macro_note_minimal(note) }}
-        </div>
-    </div>
-{% endblock body %}

components/Feed/Controller/Feeds.php

@@ -33,38 +33,28 @@ declare(strict_types = 1);
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
 
-namespace App\Controller;
+namespace Component\Feed\Controller;
 
 use function App\Core\I18n\_m;
-use App\Core\VisibilityScope;
 use App\Util\Common;
-use Component\Feed\Feed;
+use App\Util\HTML\Heading;
-use Component\Feed\Util\FeedController;
+use Component\Collection\Util\Controller\FeedController;
 use Symfony\Component\HttpFoundation\Request;
 
 class Feeds extends FeedController
 {
-    // Can't have constants inside herestring
-    private $public_scope     = VisibilityScope::PUBLIC;
-    private $instance_scope   = VisibilityScope::PUBLIC | VisibilityScope::SITE;
-    private $message_scope    = VisibilityScope::MESSAGE;
-    private $subscriber_scope = VisibilityScope::PUBLIC | VisibilityScope::SUBSCRIBER;
-
     /**
      * The Planet feed represents every local post. Which is what this instance has to share with the universe.
      */
     public function public(Request $request): array
     {
-        $data = Feed::query(
+        $data       = $this->query('note-local:true');
-            query: 'note-local:true',
+        $page_title = _m(\is_null(Common::user()) ? 'Feed' : 'Planet');
-            page: $this->int('p'),
-            language: Common::actor()?->getTopLanguage()?->getLocale(),
-        );
         return [
-            '_template'     => 'feed/feed.html.twig',
+            '_template'        => 'collection/notes.html.twig',
-            'page_title'    => _m(\is_null(Common::user()) ? 'Feed' : 'Planet'),
+            'page_title'       => $page_title,
-            'should_format' => true,
+            'notes_feed_title' => (new Heading(level: 1, classes: ['feed-title'], text: $page_title)),
-            'notes'         => $data['notes'],
+            'notes'            => $data['notes'],
         ];
     }
 
@@ -74,17 +64,12 @@ class Feeds extends FeedController
     public function home(Request $request): array
     {
         Common::ensureLoggedIn();
-        $data = Feed::query(
+        $data = $this->query('note-from:subscribed-person,subscribed-group,subscribed-organisation');
-            query: 'note-from:subscribed-person,subscribed-group,subscribed-organization,subscribed-business',
-            page: $this->int('p'),
-            language: Common::actor()?->getTopLanguage()?->getLocale(),
-            actor: Common::actor(),
-        );
         return [
-            '_template'     => 'feed/feed.html.twig',
+            '_template'        => 'collection/notes.html.twig',
-            'page_title'    => _m('Home'),
+            'page_title'       => _m('Home'),
-            'should_format' => true,
+            'notes_feed_title' => (new Heading(level: 1, classes: ['feed-title'], text: 'Home')),
-            'notes'         => $data['notes'],
+            'notes'            => $data['notes'],
         ];
     }
 }

components/Feed/Feed.php

@@ -23,142 +23,17 @@ declare(strict_types = 1);
 
 namespace Component\Feed;
 
-use App\Core\DB\DB;
 use App\Core\Event;
 use App\Core\Modules\Component;
-use App\Entity\Actor;
+use App\Core\Router;
-use App\Entity\Subscription;
+use Component\Feed\Controller as C;
-use App\Util\Formatting;
-use Component\Search\Util\Parser;
-use Doctrine\Common\Collections\ExpressionBuilder;
-use Doctrine\ORM\Query\Expr;
-use Doctrine\ORM\QueryBuilder;
 
 class Feed extends Component
 {
-    /**
+    public function onAddRoute(Router $r): bool
-     * 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;
+        $r->connect('feed_public', '/feed/public', [C\Feeds::class, 'public']);
-        $actor_criteria = null;
+        $r->connect('feed_home', '/feed/home', [C\Feeds::class, 'home']);
-        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')->orderBy('note.id', 'DESC');
-        $actor_qb->select('actor')->from('App\Entity\Actor', 'actor')->orderBy('actor.created', 'DESC')->orderBy('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();
-
-        // TODO: Enforce scoping on the notes before returning
-        return ['notes' => $notes ?? null, 'actors' => $actors ?? null];
-    }
-
-    public function onSearchQueryAddJoins(QueryBuilder &$note_qb, QueryBuilder &$actor_qb)
-    {
-        $note_qb->leftJoin(Subscription::class, 'subscription', Expr\Join::WITH, 'note.actor_id = subscription.subscribed')
-            ->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', $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/templates/feed/feed.html.twig

@@ -1,42 +0,0 @@
-{% extends 'stdgrid.html.twig' %}
-{% import '/cards/note/view.html.twig' as noteView %}
-
-{% block title %}{% if page_title is defined %}{{ page_title | trans }}{% endif %}{% endblock %}
-
-{% block stylesheets %}
-    {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('assets/default_theme/css/pages/feeds.css') }}" type="text/css">
-{% endblock stylesheets %}
-
-{% block body %}
-    <header class="feed-header">
-        {% if page_title is defined %}
-            <h1>{{ page_title | trans }} {{ 'feed' | trans }}</h1>
-        {% endif %}
-        <nav class="feed-actions" role=navigation>
-            {% for block in handle_event('AddFeedActions', app.request) %}
-                {{ block | raw }}
-            {% endfor %}
-        </nav>
-    </header>
-
-    {# 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 %}
-                {% 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>
-{% endblock body %}

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,11 +34,10 @@ 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\Feed\Feed;
+use Component\Collection\Util\Controller\FeedController;
-use Component\Feed\Util\FeedController;
 use Symfony\Component\HttpFoundation\Request;
 
 class Feeds extends FeedController
@@ -52,13 +51,9 @@ class Feeds extends FeedController
     public function network(Request $request): array
     {
         Common::ensureLoggedIn();
-        $data = Feed::query(
+        $data = $this->query('note-local:false');
-            query: 'note-local:false',
-            page: $this->int('p'),
-            language: Common::actor()?->getTopLanguage()?->getLocale(),
-        );
         return [
-            '_template'     => 'feed/feed.html.twig',
+            '_template'     => 'collection/notes.html.twig',
             'page_title'    => _m('Meteorites'),
             'should_format' => true,
             'notes'         => $data['notes'],
@@ -73,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
@@ -86,7 +82,7 @@ class Feeds extends FeedController
                 EOF,
         );
         return [
-            '_template'     => 'feed/feed.html.twig',
+            '_template'     => 'collection/notes.html.twig',
             'page_title'    => _m('Planetary System'),
             'should_format' => true,
             'notes'         => $notes,
@@ -101,13 +97,9 @@ class Feeds extends FeedController
     public function federated(Request $request): array
     {
         Common::ensureLoggedIn();
-        $data = Feed::query(
+        $data = $this->query('notes-all:yeah');
-            query: '',
-            page: $this->int('p'),
-            language: Common::actor()?->getTopLanguage()?->getLocale(),
-        );
         return [
-            '_template'     => 'feed/feed.html.twig',
+            '_template'     => 'collection/notes.html.twig',
             'page_title'    => _m('Galaxy'),
             'should_format' => true,
             'notes'         => $data['notes'],

components/FreeNetwork/Controller/HostMeta.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 /**
  * @author   James Walker <james@status.net>
  * @author   Craig Andrews <candrews@integralblue.com>
@@ -8,17 +10,13 @@
 
 namespace Component\FreeNetwork\Controller;
 
-use App\Core\Controller;
 use App\Core\Event;
 use Component\FreeNetwork\Util\Discovery;
 use Component\FreeNetwork\Util\XrdController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use XML_XRD;
 
 class HostMeta extends XrdController
 {
-    protected string $default_mimetype = Discovery::XRD_MIMETYPE;
+    protected string $default_mimetype = Discovery::JRD_MIMETYPE;
 
     public function setXRD()
     {

components/FreeNetwork/Controller/OwnerXrd.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types = 1);
 // 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
@@ -30,7 +32,6 @@ use App\Util\Common;
 use Component\FreeNetwork\Util\Discovery;
 use Component\FreeNetwork\Util\XrdController;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
 
 class OwnerXrd extends XrdController
 {

components/FreeNetwork/Controller/Webfinger.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types = 1);
 /*
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2010, StatusNet, Inc.
@@ -69,7 +71,7 @@ class Webfinger extends XrdController
         $this->xrd->subject = $this->resource;
 
         foreach ($this->target->getAliases() as $alias) {
-            if ($alias != $this->xrd->subject && !in_array($alias, $this->xrd->aliases)) {
+            if ($alias != $this->xrd->subject && !\in_array($alias, $this->xrd->aliases)) {
                 $this->xrd->aliases[] = $alias;
             }
         }

components/FreeNetwork/Entity/FreeNetworkActorProtocol.php

@@ -32,17 +32,11 @@ declare(strict_types = 1);
 
 namespace Component\FreeNetwork\Entity;
 
-use App\Core\Cache;
+use App\Core\DB;
-use App\Core\DB\DB;
 use App\Core\Entity;
-use function App\Core\I18n\_m;
-use App\Core\Log;
 use App\Entity\Actor;
 use Component\FreeNetwork\Util\Discovery;
 use DateTimeInterface;
-use Exception;
-use Plugin\ActivityPub\Util\DiscoveryHints;
-use Plugin\ActivityPub\Util\Explorer;
 
 /**
  * Table Definition for free_network_actor_protocol
@@ -53,27 +47,27 @@ use Plugin\ActivityPub\Util\Explorer;
 class FreeNetworkActorProtocol extends Entity
 {
     // {{{ Autocode
-    // @codeCoverageIgnoreStart;
+    // @codeCoverageIgnoreStart
     private int $actor_id;
-    private ?string $protocol;
+    private ?string $protocol = null;
-    private ?string $addr;
+    private string $addr;
     private DateTimeInterface $created;
     private DateTimeInterface $modified;
 
-    public function getActorId(): int
-    {
-        return $this->actor_id;
-    }
-
     public function setActorId(int $actor_id): self
     {
         $this->actor_id = $actor_id;
         return $this;
     }
 
+    public function getActorId(): int
+    {
+        return $this->actor_id;
+    }
+
     public function setProtocol(?string $protocol): self
     {
-        $this->protocol = $protocol;
+        $this->protocol = \is_null($protocol) ? null : mb_substr($protocol, 0, 32);
         return $this;
     }
 
@@ -93,14 +87,20 @@ class FreeNetworkActorProtocol extends Entity
         return $this->addr;
     }
 
+    public function setCreated(DateTimeInterface $created): self
+    {
+        $this->created = $created;
+        return $this;
+    }
+
     public function getCreated(): DateTimeInterface
     {
         return $this->created;
     }
 
-    public function setCreated(DateTimeInterface $created): self
+    public function setModified(DateTimeInterface $modified): self
     {
-        $this->created = $created;
+        $this->modified = $modified;
         return $this;
     }
 
@@ -109,19 +109,14 @@ class FreeNetworkActorProtocol extends Entity
         return $this->modified;
     }
 
-    public function setModified(DateTimeInterface $modified): self
-    {
-        $this->modified = $modified;
-        return $this;
-    }
     // @codeCoverageIgnoreEnd
     // }}} Autocode
 
     public static function protocolSucceeded(string $protocol, int|Actor $actor_id, string $addr): void
     {
-        $actor_id = is_int($actor_id) ? $actor_id : $actor_id->getId();
+        $actor_id            = \is_int($actor_id) ? $actor_id : $actor_id->getId();
         $attributed_protocol = self::getByPK(['actor_id' => $actor_id]);
-        if (is_null($attributed_protocol)) {
+        if (\is_null($attributed_protocol)) {
             $attributed_protocol = self::create([
                 'actor_id' => $actor_id,
                 'protocol' => $protocol,
@@ -130,14 +125,14 @@ 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
     {
-        $actor_id = is_int($actor_id) ? $actor_id : $actor_id->getId();
+        $actor_id            = \is_int($actor_id) ? $actor_id : $actor_id->getId();
         $attributed_protocol = self::getByPK(['actor_id' => $actor_id])?->getProtocol();
-        if (is_null($attributed_protocol)) {
+        if (\is_null($attributed_protocol)) {
             // If it is not attributed, you can go ahead.
             return true;
         } else {
@@ -149,9 +144,9 @@ class FreeNetworkActorProtocol extends Entity
     public static function canIAddr(string $protocol, string $target): bool
     {
         // Normalize $addr, i.e. add 'acct:' if missing
-        $addr = Discovery::normalize($target);
+        $addr                = Discovery::normalize($target);
         $attributed_protocol = self::getByPK(['addr' => $addr])?->getProtocol();
-        if (is_null($attributed_protocol)) {
+        if (\is_null($attributed_protocol)) {
             // If it is not attributed, you can go ahead.
             return true;
         } else {
@@ -167,7 +162,7 @@ class FreeNetworkActorProtocol extends Entity
             'fields' => [
                 'actor_id' => ['type' => 'int', 'not null' => true],
                 'protocol' => ['type' => 'varchar',  'length' => 32, 'description' => 'the protocol plugin that should handle federation of this actor'],
-                'addr' => ['type' => 'text',  'not null' => true, 'description' => 'webfinger acct'],
+                'addr'     => ['type' => 'text',  'not null' => true, 'description' => 'webfinger acct'],
                 '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'],
             ],

components/FreeNetwork/Exception/WebfingerReconstructionException.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types = 1);
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
@@ -50,7 +52,7 @@ use Throwable;
  */
 class WebfingerReconstructionException extends ServerException
 {
-    public function __construct(string $message = '', int $code = 500, Throwable $previous = null)
+    public function __construct(string $message = '', int $code = 500, ?Throwable $previous = null)
     {
         // We could log an entry here with the search parameters
         parent::__construct(_m('WebFinger URI generation failed.'));

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;
-use App\Core\Router\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,9 +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 Exception;
-use Plugin\ActivityPub\Entity\ActivitypubActivity;
-use Plugin\ActivityPub\Util\TypeResponse;
 use const PREG_SET_ORDER;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Response;
@@ -78,8 +77,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(): bool
+    {
+        Event::handle('AddFreeNetworkProtocol', [&self::$protocols]);
+        return Event::next;
+    }
+
+    public function onAddRoute(Router $m): bool
     {
         // Feeds
         $m->connect('feed_network', '/feed/network', [Feeds::class, 'network']);
@@ -154,7 +160,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.'));
                 }
 
@@ -171,7 +177,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';
@@ -209,9 +215,8 @@ class FreeNetwork extends Component
             return Event::stop; // We got our target, stop handler execution
         }
 
-        $APNote = ActivitypubActivity::getByPK(['object_uri' => $resource]);
+        if (!\is_null($note = DB::findOneBy(Note::class, ['url' => $resource], return_null: true))) {
-        if ($APNote instanceof ActivitypubActivity) {
+            $target = new WebfingerResourceNote($note);
-            $target = new WebfingerResourceNote(Note::getByPK(['id' => $APNote->getObjectId()]));
             return Event::stop; // We got our target, stop handler execution
         }
 
@@ -270,7 +275,7 @@ class FreeNetwork extends Component
      * @throws ClientException
      * @throws ServerException
      */
-    public function onControllerResponseInFormat(string $route, array $accept_header, array $vars, ?TypeResponse &$response = null): bool
+    public function onControllerResponseInFormat(string $route, array $accept_header, array $vars, ?Response &$response = null): bool
     {
         if (!\in_array($route, ['freenetwork_hostmeta', 'freenetwork_hostmeta_format', 'freenetwork_webfinger', 'freenetwork_webfinger_format', 'freenetwork_ownerxrd'])) {
             return Event::next;
@@ -300,6 +305,9 @@ class FreeNetwork extends Component
             Discovery::XRD_MIMETYPE => new Response(content: $vars['xrd']->to('xml'), headers: $headers),
             Discovery::JRD_MIMETYPE, Discovery::JRD_MIMETYPE_OLD => new JsonResponse(data: $vars['xrd']->to('json'), headers: $headers, json: true),
         };
+
+        $response->headers->set('cache-control', 'no-store, no-cache, must-revalidate');
+
         return Event::stop;
     }
 
@@ -379,7 +387,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 +416,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';
@@ -489,17 +497,39 @@ class FreeNetwork extends Component
 
     public static function notify(Actor $sender, Activity $activity, array $targets, ?string $reason = null): bool
     {
-        $protocols = [];
+        foreach (self::$protocols as $protocol) {
-        Event::handle('AddFreeNetworkProtocol', [&$protocols]);
+            $protocol::freeNetworkDistribute($sender, $activity, $targets, $reason);
-        $delivered = [];
-        foreach ($protocols as $protocol) {
-            $protocol::freeNetworkDistribute($sender, $activity, $targets, $reason, $delivered);
         }
-        $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 mentionTagToName(string $nickname, string $uri): string
+    {
+        return '@' . $nickname . '@' . parse_url($uri, \PHP_URL_HOST);
+    }
+
+    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
+     */
+    public function onCollectionQueryCreateExpression(ExpressionBuilder $eb, string $term, ?string $locale, ?Actor $actor, &$note_expr, &$actor_expr): bool
+    {
+        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): bool
     {
         $versions[] = [

components/FreeNetwork/Util/LinkHeader.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types = 1);
 /**
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2010, StatusNet, Inc.
@@ -69,7 +71,7 @@ class LinkHeader
         $this->type = null;
 
         // remove uri-reference from header
-        $str = substr($str, strlen($uri_reference[0]));
+        $str = mb_substr($str, mb_strlen($uri_reference[0]));
 
         // parse link-params
         $params = explode(';', $str);
@@ -78,7 +80,7 @@ class LinkHeader
             if (empty($param)) {
                 continue;
             }
-            list($param_name, $param_value) = explode('=', $param, 2);
+            [$param_name, $param_value] = explode('=', $param, 2);
 
             $param_name  = trim($param_name);
             $param_value = preg_replace('(^"|"$)', '', trim($param_value));
@@ -110,18 +112,17 @@ class LinkHeader
         $headers = $response->getHeader('Link');
         if ($headers) {
             // Can get an array or string, so try to simplify the path
-            if (!is_array($headers)) {
+            if (!\is_array($headers)) {
                 $headers = [$headers];
             }
 
             foreach ($headers as $header) {
                 $lh = new self($header);
 
-                if ((is_null($rel) || $lh->rel == $rel) && (is_null($type) || $lh->type == $type)) {
+                if ((\is_null($rel) || $lh->rel == $rel) && (\is_null($type) || $lh->type == $type)) {
                     return $lh->href;
                 }
             }
         }
-        return null;
     }
 }

components/FreeNetwork/Util/LrddMethod/LrddMethodHostMeta.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Component\FreeNetwork\Util\LrddMethod;
 
 // This file is part of GNU social - https://www.gnu.org/software/social
@@ -39,29 +41,27 @@ class LrddMethodHostMeta extends LRDDMethod
     /**
      * For RFC6415 and HTTP URIs, fetch the host-meta file
      * and look for LRDD templates
-     *
-     * @param mixed $uri
      */
     public function discover($uri)
     {
         // This is allowed for RFC6415 but not the 'WebFinger' RFC7033.
         $try_schemes = ['https', 'http'];
 
-        $scheme = mb_strtolower(parse_url($uri, PHP_URL_SCHEME));
+        $scheme = mb_strtolower(parse_url($uri, \PHP_URL_SCHEME));
         switch ($scheme) {
             case 'acct':
                 // We can't use parse_url data for this, since the 'host'
                 // entry is only set if the scheme has '://' after it.
-                $parts = explode('@', parse_url($uri, PHP_URL_PATH), 2);
+                $parts = explode('@', parse_url($uri, \PHP_URL_PATH), 2);
 
-                if (!Discovery::isAcct($uri) || count($parts) != 2) {
+                if (!Discovery::isAcct($uri) || \count($parts) != 2) {
                     throw new Exception('Bad resource URI: ' . $uri);
                 }
                 [, $domain] = $parts;
                 break;
             case 'http':
             case 'https':
-                $domain      = mb_strtolower(parse_url($uri, PHP_URL_HOST));
+                $domain      = mb_strtolower(parse_url($uri, \PHP_URL_HOST));
                 $try_schemes = [$scheme];
                 break;
             default:

components/FreeNetwork/Util/LrddMethod/LrddMethodLinkHtml.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Component\FreeNetwork\Util\LrddMethod;
 
 // This file is part of GNU social - https://www.gnu.org/software/social
@@ -38,10 +40,7 @@ class LrddMethodLinkHtml extends LRDDMethod
      * For HTTP IDs, fetch the URL and look for <link> elements
      * in the HTML response.
      *
-     * @param mixed $uri
-     *
      * @todo fail out of WebFinger URIs faster
-     *
      */
     public function discover($uri)
     {
@@ -65,7 +64,7 @@ class LrddMethodLinkHtml extends LRDDMethod
 
         preg_match('/<head(\s[^>]*)?>(.*?)<\/head>/is', $html, $head_matches);
 
-        if (count($head_matches) != 3) {
+        if (\count($head_matches) != 3) {
             return [];
         }
         [, , $head_html] = $head_matches;
@@ -78,23 +77,23 @@ class LrddMethodLinkHtml extends LRDDMethod
             $link_type = null;
 
             preg_match('/\srel=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $rel_matches);
-            if (count($rel_matches) > 3) {
+            if (\count($rel_matches) > 3) {
                 $link_rel = $rel_matches[3];
-            } elseif (count($rel_matches) > 1) {
+            } elseif (\count($rel_matches) > 1) {
                 $link_rel = $rel_matches[1];
             }
 
             preg_match('/\shref=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $href_matches);
-            if (count($href_matches) > 3) {
+            if (\count($href_matches) > 3) {
                 $link_uri = $href_matches[3];
-            } elseif (count($href_matches) > 1) {
+            } elseif (\count($href_matches) > 1) {
                 $link_uri = $href_matches[1];
             }
 
             preg_match('/\stype=(("|\')([^\\2]*?)\\2|[^"\'\s]+)/i', $link_html, $type_matches);
-            if (count($type_matches) > 3) {
+            if (\count($type_matches) > 3) {
                 $link_type = $type_matches[3];
-            } elseif (count($type_matches) > 1) {
+            } elseif (\count($type_matches) > 1) {
                 $link_type = $type_matches[1];
             }
 

components/FreeNetwork/Util/LrddMethod/LrddMethodWebfinger.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types = 1);
 // 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
@@ -36,19 +38,17 @@ class LrddMethodWebfinger extends LRDDMethod
     /**
      * Simply returns the WebFinger URL over HTTPS at the uri's domain:
      * https://{domain}/.well-known/webfinger?resource={uri}
-     *
-     * @param mixed $uri
      */
     public function discover($uri)
     {
-        $parts = explode('@', parse_url($uri, PHP_URL_PATH), 2);
+        $parts = explode('@', parse_url($uri, \PHP_URL_PATH), 2);
 
-        if (!Discovery::isAcct($uri) || count($parts) != 2) {
+        if (!Discovery::isAcct($uri) || \count($parts) != 2) {
             throw new Exception('Bad resource URI: ' . $uri);
         }
         [, $domain] = $parts;
-        if (!filter_var($domain, FILTER_VALIDATE_IP)
+        if (!filter_var($domain, \FILTER_VALIDATE_IP)
-            && !filter_var(gethostbyname($domain), FILTER_VALIDATE_IP)) {
+            && !filter_var(gethostbyname($domain), \FILTER_VALIDATE_IP)) {
             throw new Exception('Bad resource host.');
         }
 
@@ -56,7 +56,7 @@ class LrddMethodWebfinger extends LRDDMethod
             Discovery::LRDD_REL,
             'https://' . $domain . '/.well-known/webfinger?resource={uri}',
             Discovery::JRD_MIMETYPE,
-            true // isTemplate
+            true, // isTemplate
         );
 
         return [$link];

components/FreeNetwork/Util/WebfingerResource.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Component\FreeNetwork\Util;
 
 use App\Core\Entity;
@@ -40,8 +42,6 @@ abstract class WebfingerResource
 
     /**
      * List of alternative IDs of a certain Actor
-     *
-     * @return array
      */
     public function getAliases(): array
     {
@@ -53,7 +53,7 @@ abstract class WebfingerResource
         // you've run HTTPS all the time!
         if (Common::config('fix', 'legacy_http')) {
             foreach ($aliases as $alias => $id) {
-                if (!strtolower(parse_url($alias, PHP_URL_SCHEME)) === 'https') {
+                if (!mb_strtolower(parse_url($alias, \PHP_URL_SCHEME)) === 'https') {
                     continue;
                 }
                 $aliases[preg_replace('/^https:/i', 'http:', $alias, 1)] = $id;

components/FreeNetwork/Util/WebfingerResource/WebfingerResourceActor.php

@@ -1,10 +1,12 @@
 <?php
 
+declare(strict_types = 1);
+
 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;
@@ -24,9 +26,9 @@ use XML_XRD_Element_Link;
  */
 class WebfingerResourceActor extends WebFingerResource
 {
-    const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
+    public const PROFILEPAGE = 'http://webfinger.net/rel/profile-page';
 
-    public function __construct(Actor $object = null)
+    public function __construct(?Actor $object = null)
     {
         // The type argument above verifies that it's our class
         parent::__construct($object);
@@ -49,8 +51,9 @@ class WebfingerResourceActor extends WebFingerResource
     /**
      * Reconstruct WebFinger acct: from object
      *
-     * @return array|false|mixed|string|string[]|null
      * @throws WebfingerReconstructionException
+     *
+     * @return null|array|false|mixed|string|string[]
      */
     public function reconstructAcct()
     {
@@ -58,7 +61,7 @@ class WebfingerResourceActor extends WebFingerResource
 
         if (Event::handle('StartWebFingerReconstruction', [$this->object, &$acct])) {
             // TODO: getUri may not always give us the correct host on remote users?
-            $host = parse_url($this->object->getUri(Router::ABSOLUTE_URL), PHP_URL_HOST);
+            $host = parse_url($this->object->getUri(Router::ABSOLUTE_URL), \PHP_URL_HOST);
             if (empty($this->object->getNickname()) || empty($host)) {
                 throw new WebFingerReconstructionException(print_r($this->object, true));
             }
@@ -75,8 +78,11 @@ class WebfingerResourceActor extends WebFingerResource
         if (Event::handle('StartWebFingerProfileLinks', [$xrd, $this->object])) {
 
             // Profile page, can give more metadata from Link header or HTML parsing
-            $xrd->links[] = new XML_XRD_Element_Link(self::PROFILEPAGE,
+            $xrd->links[] = new XML_XRD_Element_Link(
-                $this->object->getUrl(Router::ABSOLUTE_URL), 'text/html');
+                self::PROFILEPAGE,
+                $this->object->getUrl(Router::ABSOLUTE_URL),
+                'text/html',
+            );
 
 //            // XFN
 //            $xrd->links[] = new XML_XRD_Element_Link('http://gmpg.org/xfn/11',

components/FreeNetwork/Util/WebfingerResource/WebfingerResourceNote.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Component\FreeNetwork\Util\WebfingerResource;
 
 use App\Core\Event;
@@ -22,7 +24,7 @@ use XML_XRD_Element_Link;
  */
 class WebfingerResourceNote extends WebfingerResource
 {
-    public function __construct(Note $object = null)
+    public function __construct(?Note $object = null)
     {
         // The type argument above verifies that it's our class
         parent::__construct($object);
@@ -30,29 +32,37 @@ class WebfingerResourceNote extends WebfingerResource
 
     /**
      * Update given XRD with self's data
-     *
-     * @param XML_XRD $xrd
      */
     public function updateXRD(XML_XRD $xrd)
     {
         if (Event::handle('StartWebFingerNoticeLinks', [$xrd, $this->object])) {
             if ($this->object->isLocal()) {
-                $xrd->links[] = new XML_XRD_Element_Link('alternate',
+                $xrd->links[] = new XML_XRD_Element_Link(
-                    common_local_url('ApiStatusesShow',
+                    'alternate',
+                    common_local_url(
+                        'ApiStatusesShow',
                         ['id'        => $this->object->id,
-                            'format' => 'atom', ]),
+                            'format' => 'atom', ],
-                    'application/atom+xml');
+                    ),
+                    'application/atom+xml',
+                );
 
-                $xrd->links[] = new XML_XRD_Element_Link('alternate',
+                $xrd->links[] = new XML_XRD_Element_Link(
-                    common_local_url('ApiStatusesShow',
+                    'alternate',
+                    common_local_url(
+                        'ApiStatusesShow',
                         ['id'        => $this->object->id,
-                            'format' => 'json', ]),
+                            'format' => 'json', ],
-                    'application/json');
+                    ),
+                    'application/json',
+                );
             } else {
                 try {
-                    $xrd->links[] = new XML_XRD_Element_Link('alternate',
+                    $xrd->links[] = new XML_XRD_Element_Link(
+                        'alternate',
                         $this->object->getUrl(),
-                        'text/html');
+                        'text/html',
+                    );
                 } catch (InvalidUrlException $e) {
                     // don't do a fallback in webfinger
                 }

components/FreeNetwork/Util/XrdController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 namespace Component\FreeNetwork\Util;
 
 use App\Core\Controller;

components/Group/Controller/Group.php

@@ -23,122 +23,161 @@ declare(strict_types = 1);
 
 namespace Component\Group\Controller;
 
+use App\Core\ActorLocalRoles;
 use App\Core\Cache;
-use App\Core\Controller\ActorController;
+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\Log;
-use App\Entity\Actor;
 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\Group\Entity\GroupMember;
+use Component\Group\Entity\LocalGroup;
+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 ActorController
+class Group extends Controller
 {
-    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
      */
-    public function groupViewNickname(Request $request, string $nickname)
+    public function groupCreate(Request $request): array
     {
-        Nickname::validate($nickname, which: Nickname::CHECK_LOCAL_GROUP); // throws
+        if (\is_null($actor = Common::actor())) {
-        $group = Actor::getByNickname($nickname, type: Actor::GROUP);
+            throw new RedirectException('security_login');
-        if (\is_null($group)) {
-            $actor = Common::actor();
-            if (!\is_null($actor)) {
-                $form = Form::create([
-                    ['create', SubmitType::class, ['label' => _m('Create this group')]],
-                ]);
-
-                $form->handleRequest($request);
-                if ($form->isSubmitted() && $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],
-                        ),
-                    );
-
-                    $group = Actor::create([
-                        'nickname' => $nickname,
-                        'type'     => Actor::GROUP,
-                        'is_local' => true,
-                    ]);
-                    DB::persist($group);
-                    DB::persist(E\Subscription::create([
-                        'subscriber' => $group->getId(),
-                        'subscribed' => $group->getId(),
-                    ]));
-                    DB::persist(E\Subscription::create([
-                        'subscriber' => $actor->getId(),
-                        'subscribed' => $group->getId(),
-                    ]));
-                    DB::persist(E\GroupMember::create([
-                        'group_id' => $group->getId(),
-                        'actor_id' => $actor->getId(),
-                        'is_admin' => true,
-                    ]));
-                    DB::flush();
-                    Cache::delete(Actor::cacheKeys($actor->getId())['subscriber']);
-                    Cache::delete(Actor::cacheKeys($actor->getId())['subscribed']);
-                    throw new RedirectException;
-                }
-
-                return [
-                    '_template'   => 'group/view.html.twig',
-                    'nickname'    => $nickname,
-                    'create_form' => $form->createView(),
-                ];
-            }
         }
 
-        $notes = !\is_null($group) ? DB::dql(
+        $create_form = self::getGroupCreateForm($request, $actor);
-            <<<'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
-                EOF,
-            ['group_id' => $group->getId()],
-        ) : [];
 
         return [
-            '_template' => 'group/view.html.twig',
+            '_template'   => 'group/create.html.twig',
-            'actor'     => $group,
+            'create_form' => $create_form->createView(),
-            'nickname'  => $group?->getNickname() ?? $nickname,
-            'notes'     => $notes,
         ];
     }
 
-    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
+     */
+    public function groupSettings(Request $request, int $id): array
     {
-        $group = Actor::getByNickname($nickname, type: Actor::GROUP);
+        $local_group = DB::findOneBy(LocalGroup::class, ['actor_id' => $id]);
-        $actor = Common::actor();
+        $group_actor = $local_group->getActor();
-        if (!\is_null($group) && $actor->canAdmin($group)) {
+        $actor       = Common::actor();
+        if (!\is_null($group_actor) && $actor->canModerate($group_actor)) {
             return [
                 '_template'          => 'group/settings.html.twig',
-                'group'              => $group,
+                'group'              => $group_actor,
-                'personal_info_form' => ActorForms::personalInfo($request, $group)->createView(),
+                '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,131 @@
+<?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;
+
+class GroupFeed extends FeedController
+{
+    /**
+     * @throws ServerException
+     */
+    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
+     */
+    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
+     */
+    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/GroupJoinQueue.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\Group\Entity;
 
 use App\Core\Entity;
 
@@ -74,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

@@ -19,8 +19,9 @@ declare(strict_types = 1);
 // along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
 // }}}
 
-namespace App\Entity;
+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;
+    private int $roles = ActorLocalRoles::VISITOR;
-    private ?string $uri;
     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;
+        return $this->roles;
-    }
-
-    public function setUri(?string $uri): self
-    {
-        $this->uri = $uri;
-        return $this;
-    }
-
-    public function getUri(): ?string
-    {
-        return $this->uri;
     }
 
     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'],
+                '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'],
+                '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?'],
+                'roles'    => ['type' => 'int', 'not null' => true, 'default' => ActorLocalRoles::VISITOR,  'description' => 'Bitmap of permissions this actor has'],
-                'uri'      => ['type' => 'varchar',   'length' => 191,       'description' => 'universal identifier'],
+                'created'  => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
-                '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'],
-                'modified' => ['type' => 'timestamp', 'not null' => true,    'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was modified'],
             ],
             'primary key' => ['group_id', 'actor_id'],
-            'unique keys' => [
+            'indexes'     => [
-                'group_member_uri_key' => ['uri'],
-            ],
-            '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

@@ -0,0 +1,174 @@
+<?php
+
+declare(strict_types = 1);
+
+// {{{ License
+// This file is part of GNU social - https://www.gnu.org/software/soci
+//
+// GNU social is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as publ
+// 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 Li
+// along with GNU social.  If not, see <http://www.gnu.org/licenses/>.
+// }}}
+
+namespace Component\Group\Entity;
+
+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;
+
+/**
+ * Entity for local groups
+ *
+ * @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 LocalGroup extends Entity
+{
+    // {{{ Autocode
+    // @codeCoverageIgnoreStart
+    private int $actor_id;
+    private string $nickname;
+    private string $type = 'group';
+    private DateTimeInterface $created;
+    private DateTimeInterface $modified;
+
+    public function setActorId(int $actor_id): self
+    {
+        $this->actor_id = $actor_id;
+        return $this;
+    }
+
+    public function getActorId(): int
+    {
+        return $this->actor_id;
+    }
+
+    public function setNickname(string $nickname): self
+    {
+        $this->nickname = mb_substr($nickname, 0, 64);
+        return $this;
+    }
+
+    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;
+        return $this;
+    }
+
+    public function getCreated(): DateTimeInterface
+    {
+        return $this->created;
+    }
+
+    public function setModified(DateTimeInterface $modified): self
+    {
+        $this->modified = $modified;
+        return $this;
+    }
+
+    public function getModified(): DateTimeInterface
+    {
+        return $this->modified;
+    }
+
+    // @codeCoverageIgnoreEnd
+    // }}} Autocode
+
+    public function getActor()
+    {
+        return DB::findOneBy(Actor::class, ['id' => $this->actor_id]);
+    }
+
+    public static function getByNickname(string $nickname): ?self
+    {
+        return DB::findOneBy(self::class, ['nickname' => $nickname]);
+    }
+
+    public static function getActorByNickname(string $nickname): ?Actor
+    {
+        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
+    {
+        return [
+            'name'        => 'local_group',
+            'description' => 'Record for a user group on the local site, with some additional info not in user_group',
+            'fields'      => [
+                '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' => ['actor_id'],
+            'unique keys' => [
+                'local_group_nickname_key' => ['nickname'],
+            ],
+        ];
+    }
+}

components/Group/Group.php

@@ -24,51 +24,61 @@ 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;
-use App\Core\Router\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\Tag\Controller\Tag as TagController;
+use Component\Group\Entity\LocalGroup;
+use Component\Notification\Notification;
 use Symfony\Component\HttpFoundation\Request;
 
 class Group extends Component
 {
-    public function onAddRoute(RouteLoader $r): bool
+    public function onAddRoute(Router $r): bool
     {
-        $r->connect(id: 'group_actor_view_id', uri_path: '/group/{id<\d+>}', target: [C\Group::class, 'groupViewId']);
+        $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\Group::class, 'groupViewNickname'], options: ['is_system_path' => false]);
+        $r->connect(id: 'group_actor_view_nickname', uri_path: '/!{nickname<' . Nickname::DISPLAY_FMT . '>}', target: [C\GroupFeed::class, 'groupViewNickname']);
-        $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_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.
+     */
+    public function onNewNotificationStart(Actor $sender, Activity $activity, array $targets = [], ?string $reason = null): bool
+    {
+        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;
+    }
+
+    /**
+     * Add an <a href=group_actor_settings> to the profile card for groups, if the current actor can access them
      */
     public function onAppendCardProfile(array $vars, array &$res): bool
     {
         $actor = Common::actor();
         $group = $vars['actor'];
-        if (!\is_null($actor) && $group->isGroup() && $actor->canAdmin($group)) {
+        if (!\is_null($actor) && $group->isGroup()) {
-            $url   = Router::url('group_settings', ['nickname' => $group->getNickname()]);
+            if ($actor->canModerate($group)) {
-            $res[] = HTML::html(['hr' => '', 'a' => ['attrs' => ['href' => $url, 'title' => _m('Edit group settings')], 'p' => _m('Group settings')]]);
+                $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;
+            }
-    }
-
-    public function onPopulateSettingsTabs(Request $request, string $section, array &$tabs)
-    {
-        if ($section === 'profile' && $request->get('_route') === 'group_settings') {
-            $nickname = $request->get('nickname');
-            $group    = Actor::getByNickname($nickname, type: Actor::GROUP);
-            $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'),
-            ];
         }
         return Event::next;
     }
@@ -78,27 +88,46 @@ class Group extends Component
      */
     private function getGroupFromContext(Request $request): ?Actor
     {
-        if (str_starts_with($request->get('_route'), 'group_actor_view_')) {
+        if (\is_array($request->get('post_note')) && \array_key_exists('_next', $request->get('post_note'))) {
-            if (!\is_null($id = $request->get('id'))) {
+            $next       = parse_url($request->get('post_note')['_next']);
-                return Actor::getById((int) $id);
+            $match      = Router::match($next['path']);
-            } elseif (!\is_null($nickname = $request->get('nickname'))) {
+            $route      = $match['_route'];
-                return Actor::getByNickname($nickname, type: Actor::GROUP);
+            $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)
+    public function onPostingFillTargetChoices(Request $request, Actor $actor, array &$targets): bool
     {
         $group = $this->getGroupFromContext($request);
         if (!\is_null($group)) {
-            $nick           = '!' . $group->getNickname();
+            $nick           = "!{$group->getNickname()}";
-            $targets[$nick] = $nick;
+            $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): bool
     {
         $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 %}
+{% import 'cards/macros/settings.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 %}
 
 {% 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,47 +1,16 @@
-{% extends 'stdgrid.html.twig' %}
+{% extends 'collection/notes.html.twig' %}
-{% import '/cards/note/view.html.twig' as noteView %}
 
 {% 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 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 %}
-
+        <hr>
-        <main class="feed" tabindex="0" role="feed">
+        {% if notes is defined %}
-            <div class="h-feed hfeed notes">
+            {{ parent() }}
-                {% if notes is defined and notes is not empty %}
+        {% endif %}
-                    {% 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>
     {% 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']);
+        $group = DB::findOneBy(LocalGroup::class, ['nickname' => 'taken_public_group']);
-        $actor = DB::findOneBy('actor', ['nickname' => 'taken_group']);
+        $actor = DB::findOneBy(Actor::class, ['nickname' => 'taken_public_group']);
-        static::assertSame($actor, $group->getActor());
+        static::assertObjectEquals($actor, $group->getActor());
     }
 }

components/Language/Controller/Language.php

@@ -25,16 +25,16 @@ 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\Entity\ActorLanguage;
-use App\Entity\Language as LangEntity;
 use App\Util\Common;
 use App\Util\Exception\NoLoggedInUser;
 use App\Util\Exception\RedirectException;
 use App\Util\Exception\ServerException;
 use App\Util\Form\FormFields;
+use Component\Language\Entity\ActorLanguage;
+use Component\Language\Entity\Language as LangEntity;
 use Functional as F;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -70,7 +70,7 @@ class Language extends Controller
                     ['actor_id' => $user->getId()],
                 );
 
-                $new_langs      = array_udiff($selected_langs, $existing_langs, fn ($l, $r) => $l->getId() <=> $r->getId());
+                $new_langs = array_udiff($selected_langs, $existing_langs, fn ($l, $r) => $l->getId() <=> $r->getId());
                 $removing_langs = array_udiff($existing_langs, $selected_langs, fn ($l, $r) => $l->getId() <=> $r->getId());
                 foreach ($new_langs as $l) {
                     DB::persist(ActorLanguage::create(['actor_id' => $user->getId(), 'language_id' => $l->getId(), 'ordering' => 0]));
@@ -134,12 +134,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

@@ -21,11 +21,13 @@ declare(strict_types = 1);
 
 // }}}
 
-namespace App\Entity;
+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;
 use App\Util\Common;
 use Functional as F;
 
@@ -69,16 +71,17 @@ class ActorLanguage extends Entity
         return $this->language_id;
     }
 
-    public function getOrdering(): int
-    {
-        return $this->ordering;
-    }
-
     public function setOrdering(int $ordering): self
     {
         $this->ordering = $ordering;
         return $this;
     }
+
+    public function getOrdering(): int
+    {
+        return $this->ordering;
+    }
+
     // @codeCoverageIgnoreEnd
     // }}} Autocode
 

components/Language/Entity/Language.php

@@ -21,12 +21,14 @@ declare(strict_types = 1);
 
 // }}}
 
-namespace App\Entity;
+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;
+use App\Entity\Note;
 use App\Util\Common;
 use DateTimeInterface;
 use Functional as F;
@@ -46,9 +48,9 @@ class Language extends Entity
     // {{{ Autocode
     // @codeCoverageIgnoreStart
     private int $id;
-    private string $locale;
+    private ?string $locale        = null;
-    private string $long_display;
+    private ?string $long_display  = null;
-    private string $short_display;
+    private ?string $short_display = null;
     private DateTimeInterface $created;
 
     public function setId(int $id): self
@@ -62,35 +64,35 @@ class Language extends Entity
         return $this->id;
     }
 
-    public function setLocale(string $locale): self
+    public function setLocale(?string $locale): self
     {
-        $this->locale = $locale;
+        $this->locale = \is_null($locale) ? null : mb_substr($locale, 0, 64);
         return $this;
     }
 
-    public function getLocale(): string
+    public function getLocale(): ?string
     {
         return $this->locale;
     }
 
-    public function setLongDisplay(string $long_display): self
+    public function setLongDisplay(?string $long_display): self
     {
-        $this->long_display = $long_display;
+        $this->long_display = \is_null($long_display) ? null : mb_substr($long_display, 0, 64);
         return $this;
     }
 
-    public function getLongDisplay(): string
+    public function getLongDisplay(): ?string
     {
         return $this->long_display;
     }
 
-    public function setShortDisplay(string $short_display): self
+    public function setShortDisplay(?string $short_display): self
     {
-        $this->short_display = $short_display;
+        $this->short_display = \is_null($short_display) ? null : mb_substr($short_display, 0, 12);
         return $this;
     }
 
-    public function getShortDisplay(): string
+    public function getShortDisplay(): ?string
     {
         return $this->short_display;
     }
@@ -105,6 +107,7 @@ class Language extends Entity
     {
         return $this->created;
     }
+
     // @codeCoverageIgnoreEnd
     // }}} Autocode
 
@@ -113,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()),
         );
     }
 
@@ -122,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()),
         );
     }
 
@@ -135,7 +138,7 @@ class Language extends Entity
     {
         $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()));
@@ -159,12 +162,12 @@ class Language extends Entity
         $preferred_language_choices = $actor->getPreferredLanguageChoices($context_actor);
         ksort($language_choices);
         if ($use_short_display ?? Common::config('posting', 'use_short_language_display')) {
-            $key    = array_key_first($preferred_language_choices);
+            $key      = array_key_first($preferred_language_choices);
-            $locale = $preferred_language_choices[$key];
+            $language = $preferred_language_choices[$key];
             unset($preferred_language_choices[$key], $language_choices[$key]);
-            $short_display                              = self::getByLocale($locale)->getShortDisplay();
+            $short_display                              = $language->getShortDisplay();
-            $preferred_language_choices[$short_display] = trim($locale);
+            $preferred_language_choices[$short_display] = ($locale = $language->getLocale());
-            $language_choices[$short_display]           = trim($locale);
+            $language_choices[$short_display]           = $locale;
         }
         return [$language_choices, $preferred_language_choices];
     }
@@ -175,10 +178,10 @@ class Language extends Entity
             'name'        => 'language',
             'description' => 'all known languages',
             'fields'      => [
-                'id'            => ['type' => 'serial',  'not null' => true, 'description' => 'unique identifier'],
+                'id'            => ['type' => 'serial', 'not null' => true, 'description' => 'unique identifier'],
                 'locale'        => ['type' => 'varchar', 'length' => 64, 'description' => 'The locale identifier for the language of a note. 2-leter-iso-language-code_4-leter-script-code_2-leter-iso-country-code, but kept longer in case we get a different format'],
                 'long_display'  => ['type' => 'varchar', 'length' => 64, 'description' => 'The long display string for the language, in english (translated later)'],
-                'short_display' => ['type' => 'varchar', 'length' => 12,  'description' => 'The short display string for the language (used for the first option)'],
+                'short_display' => ['type' => 'varchar', 'length' => 12, 'description' => 'The short display string for the language (used for the first option)'],
                 'created'       => ['type' => 'datetime', 'not null' => true, 'default' => 'CURRENT_TIMESTAMP', 'description' => 'date this record was created'],
             ],
             'primary key' => ['id'],

components/Language/Language.php

@@ -23,13 +23,13 @@ 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\ActorLanguage;
 use App\Entity\Note;
 use App\Util\Formatting;
 use App\Util\Functional as GSF;
 use Component\Language\Controller as C;
+use Component\Language\Entity\ActorLanguage;
 use Doctrine\Common\Collections\ExpressionBuilder;
 use Doctrine\ORM\Query\Expr;
 use Doctrine\ORM\QueryBuilder;
@@ -38,20 +38,20 @@ use Symfony\Component\HttpFoundation\Request;
 
 class Language extends Component
 {
-    public function onAddRoute(RouteLoader $r)
+    public function onAddRoute(Router $r): bool
     {
         $r->connect('settings_sort_languages', '/settings/sort_languages', [C\Language::class, 'sortLanguages']);
         return Event::next;
     }
 
-    public function onFilterNoteList(?Actor $actor, array &$notes, Request $request)
+    public function onFilterNoteList(?Actor $actor, array &$notes, Request $request): bool
     {
         if (\is_null($actor)) {
             return Event::next;
         }
         $notes = F\select(
             $notes,
-            fn (Note $n) => \in_array($n->getLanguageId(), ActorLanguage::getActorRelatedLanguagesIds($actor)),
+            fn (Note $n) => \is_null($n->getLanguageId()) || \in_array($n->getLanguageId(), ActorLanguage::getActorRelatedLanguagesIds($actor)),
         );
 
         return Event::next;
@@ -60,7 +60,7 @@ class Language extends Component
     /**
      * Populate $note_expr or $actor_expr with an expression to match a language
      */
-    public function onSearchCreateExpression(ExpressionBuilder $eb, string $term, ?string $language, ?Actor $actor, &$note_expr, &$actor_expr)
+    public function onCollectionQueryCreateExpression(ExpressionBuilder $eb, string $term, ?string $locale, ?Actor $actor, &$note_expr, &$actor_expr): bool
     {
         $search_term = str_contains($term, ':') ? explode(':', $term)[1] : $term;
 
@@ -90,26 +90,40 @@ class Language extends Component
             $note_expr  = $temp_note_expr;
             $actor_expr = $temp_actor_expr;
             return Event::stop;
-        } elseif (Formatting::startsWith($term, GSF::cartesianProduct(['-', '_'], ['note', 'post'], ['lang', 'language'], [':']))) {
+        } elseif (Formatting::startsWith($term, GSF::cartesianProduct([['note', 'post'], ['lang', 'language'], [':']], separator: ['-', '_']))) {
             $note_expr = $temp_note_expr;
             return Event::stop;
-        } elseif (Formatting::startsWith($term, GSF::cartesianProduct(['-', '_'], ['note', 'post'], ['author', 'actor', 'people', 'person'], ['lang', 'language'], [':']))) {
+        } elseif (Formatting::startsWith($term, GSF::cartesianProduct([['note', 'post'], ['author', 'actor', 'people', 'person'], ['lang', 'language'], [':']], separator: ['-', '_']))) {
             $note_expr = $temp_note_actor_expr;
             return Event::stop;
-        } elseif (Formatting::startsWith($term, GSF::cartesianProduct(['-', '_'], ['actor', 'people', 'person'], ['lang', 'language'], [':']))) {
+        } elseif (Formatting::startsWith($term, GSF::cartesianProduct([['actor', 'people', 'person'], ['lang', 'language'], [':']], separator: ['-', '_']))) {
             $actor_expr = $temp_actor_expr;
             return Event::stop;
         }
         return Event::next;
     }
 
-    public function onSearchQueryAddJoins(QueryBuilder &$note_qb, QueryBuilder &$actor_qb): bool
+    public function onCollectionQueryAddJoins(QueryBuilder &$note_qb, QueryBuilder &$actor_qb): bool
     {
-        $note_qb->leftJoin('App\Entity\Language', 'note_language', Expr\Join::WITH, 'note.language_id = note_language.id')
+        $note_aliases = $note_qb->getAllAliases();
-            ->leftJoin('App\Entity\ActorLanguage', 'actor_language', Expr\Join::WITH, 'note.actor_id = actor_language.actor_id')
+        if (!\in_array('note_language', $note_aliases)) {
-            ->leftJoin('App\Entity\Language', 'note_actor_language', Expr\Join::WITH, 'note_actor_language.id = actor_language.language_id');
+            $note_qb->leftJoin('Component\Language\Entity\Language', 'note_language', Expr\Join::WITH, 'note.language_id = note_language.id');
-        $actor_qb->leftJoin('App\Entity\ActorLanguage', 'actor_language', Expr\Join::WITH, 'actor.id = actor_language.actor_id')
+        }
-            ->leftJoin('App\Entity\Language', 'language', Expr\Join::WITH, 'actor_language.language_id = 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 = $note_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-widget-padded">
+    <div class="frame-section frame-section-padding">
-    <h3>{{ 'Put the languages in the order you\'d like to see them in your language selection dropdown, when posting' | trans}}</h3>
+        <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) }}
+        {{ form(form) }}
-  </div>
+    </div>
 {% endblock %}

components/LeftPanel/Controller/EditFeeds.php

@@ -25,15 +25,15 @@ 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;
 use App\Util\Exception\RedirectException;
-use Component\Feed\Util\FeedController;
+use Component\Collection\Util\Controller\FeedController;
 use Functional as F;
 use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;

components/LeftPanel/LeftPanel.php

@@ -22,12 +22,11 @@ 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;
-use App\Core\Router\Router;
 use App\Entity\Actor;
 use App\Entity\Feed;
 use App\Util\Exception\ClientException;
@@ -36,13 +35,18 @@ use Component\LeftPanel\Controller as C;
 
 class LeftPanel extends Component
 {
-    public function onAddRoute(RouteLoader $r): bool
+    public function onAddRoute(Router $r): bool
     {
         $r->connect('edit_feeds', '/edit-feeds', C\EditFeeds::class);
         return Event::next;
     }
 
-    public function onAppendFeed(Actor $actor, string $title, string $route, array $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): bool
     {
         $cache_key = Feed::cacheKey($actor);
         $feeds     = Feed::getFeeds($actor);
@@ -67,17 +71,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">
-
+        <h1 class="frame-section-title">{% trans %}Edit feed navigation links{% endtrans %}</h1>
-      <fieldset>
-        <legend class="section-form-legend">{{ "Edit feed navigation links" | trans }}</legend>
-
         {# Since the form is not separated into individual groups, this happened #}
         {{ form_start(edit_feeds) }}
-        {% for child in edit_feeds.children %}
+        {{ form_errors(edit_feeds) }}
-          {% if 'row_url' in child.vars.block_prefixes %}
+        <section class="container-grid">
-            <div class="section-widget section-padding">
+            {% for child in edit_feeds.children %}
-            {{ form_label(child) }}
+                {% if 'row_url' in child.vars.block_prefixes %}
-            {{ form_widget(child) }}
+                    <div class="frame-section frame-section-padding">
-          {% elseif 'row_title' in child.vars.block_prefixes %}
+                        {{ _self.edit_feeds_form_row(child) }}
-            {{ form_label(child) }}
+                {% elseif 'row_title' in child.vars.block_prefixes %}
-            {{ form_widget(child) }}
+                        {{ _self.edit_feeds_form_row(child) }}
-          {% elseif 'row_order' in child.vars.block_prefixes %}
+                {% elseif 'row_order' in child.vars.block_prefixes %}
-            {{ form_label(child) }}
+                        {{ _self.edit_feeds_form_row(child) }}
-            {{ form_widget(child) }}
+                {% elseif 'row_remove' in child.vars.block_prefixes %}
-          {% elseif 'row_remove' in child.vars.block_prefixes %}
+                        {{ _self.edit_feeds_form_row(child) }}
-            {{ form_label(child) }}
+                    </div>
-            {{ form_widget(child) }}
+                {% endif %}
-            </div>
+            {% endfor %}
-          {% endif %}
+        </section>
-        {% endfor %}
+
+        <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"
+<label class="panel-left-icon" for="toggle-panel-left" tabindex="-1">{{ icon('menu', 'icon icon-left') | raw }}</label>
-           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="panel-left-toggle" aria-hidden="true" tabindex="-1">
+<input type="checkbox" id="toggle-panel-left" tabindex="0" title="{% trans %}Open left panel{% endtrans %}">
 
-    <section class="header-panel section-panel-left">
+<aside class="section-panel section-panel-left">
-        <a id="anchor-left-panel" class="anchor-hidden" title="{{ 'Press tab to access selected region!' | trans }}"></a>
+    <section class="panel-content accessibility-target">
-        <aside class="panel-content accessibility-target">
+        {% if app.user %}
-            {% if app.user %}
+            <section class='frame-section frame-section-padding' title="{% trans %}Your profile information{% endtrans %}">
-                <section class='section-widget section-padding' title="{{ 'Your profile information.' | trans }}">
+                {% block profile_view %}{% include 'cards/blocks/profile.html.twig' with { actor: current_actor } %}{% endblock profile_view %}
-                    {% block profile_view %}{% include 'cards/profile/view.html.twig' with { actor: current_actor } %}{% endblock profile_view %}
+                {{ block("profile_current_actor", "cards/blocks/navigation.html.twig") }}
-                    {{ block("profile_current_actor", "cards/navigation/view.html.twig") }}
+            </section>
-                </section>
+        {% else %}
-            {% else %}
+            <section>
-                <section>
+                {{ block("profile_security", "cards/blocks/navigation.html.twig") }}
-                    {{ block("profile_security", "cards/navigation/view.html.twig") }}
+            </section>
-                </section>
+        {% endif %}
-            {% endif %}
 
-            {{ block("feeds", "cards/navigation/view.html.twig") }}
+        {{ block("feeds", "cards/blocks/navigation.html.twig") }}
 
-            {{ block("footer", "cards/navigation/view.html.twig") }}
+        {{ block("footer", "cards/blocks/navigation.html.twig") }}
-        </aside>
     </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;
@@ -49,9 +49,9 @@ class Link extends Entity
     // {{{ Autocode
     // @codeCoverageIgnoreStart
     private int $id;
-    private ?string $url;
+    private ?string $url      = null;
-    private ?string $url_hash;
+    private ?string $url_hash = null;
-    private ?string $mimetype;
+    private ?string $mimetype = null;
     private DateTimeInterface $modified;
 
     public function setId(int $id): self
@@ -65,20 +65,20 @@ class Link extends Entity
         return $this->id;
     }
 
-    public function getUrl(): ?string
-    {
-        return $this->url;
-    }
-
     public function setUrl(?string $url): self
     {
         $this->url = $url;
         return $this;
     }
 
+    public function getUrl(): ?string
+    {
+        return $this->url;
+    }
+
     public function setUrlHash(?string $url_hash): self
     {
-        $this->url_hash = $url_hash;
+        $this->url_hash = \is_null($url_hash) ? null : mb_substr($url_hash, 0, 64);
         return $this;
     }
 
@@ -89,7 +89,7 @@ class Link extends Entity
 
     public function setMimetype(?string $mimetype): self
     {
-        $this->mimetype = $mimetype;
+        $this->mimetype = \is_null($mimetype) ? null : mb_substr($mimetype, 0, 50);
         return $this;
     }
 
@@ -98,18 +98,6 @@ class Link extends Entity
         return $this->mimetype;
     }
 
-    public function getMimetypeMajor(): ?string
-    {
-        $mime = $this->getMimetype();
-        return \is_null($mime) ? $mime : GSFile::mimetypeMajor($mime);
-    }
-
-    public function getMimetypeMinor(): ?string
-    {
-        $mime = $this->getMimetype();
-        return \is_null($mime) ? $mime : GSFile::mimetypeMinor($mime);
-    }
-
     public function setModified(DateTimeInterface $modified): self
     {
         $this->modified = $modified;
@@ -138,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);
@@ -172,6 +160,18 @@ class Link extends Entity
         }
     }
 
+    public function getMimetypeMajor(): ?string
+    {
+        $mime = $this->getMimetype();
+        return \is_null($mime) ? $mime : GSFile::mimetypeMajor($mime);
+    }
+
+    public function getMimetypeMinor(): ?string
+    {
+        $mime = $this->getMimetype();
+        return \is_null($mime) ? $mime : GSFile::mimetypeMinor($mime);
+    }
+
     public static function schemaDef(): array
     {
         return [

components/Link/Entity/NoteToLink.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 // {{{ License
 // This file is part of GNU social - https://www.gnu.org/software/social
 //
@@ -19,7 +21,7 @@
 
 namespace Component\Link\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
 use DateTimeInterface;
@@ -40,7 +42,7 @@ class NoteToLink extends Entity
     // @codeCoverageIgnoreStart
     private int $link_id;
     private int $note_id;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
     public function setLinkId(int $link_id): self
     {
@@ -74,6 +76,7 @@ class NoteToLink extends Entity
     {
         return $this->modified;
     }
+
     // @codeCoverageIgnoreEnd
     // }}} Autocode
 
@@ -81,22 +84,16 @@ class NoteToLink extends Entity
      * Create an instance of NoteToLink or fill in the
      * properties of $obj with the associative array $args. Doesn't
      * persist the result
-     *
-     * @param null|mixed $obj
      */
-    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);
     }
 
-    /**
-     * @param int $note_id
-     * @return mixed
-     */
     public static function removeWhereNoteId(int $note_id): mixed
     {
         return DB::dql(
@@ -108,11 +105,6 @@ class NoteToLink extends Entity
         );
     }
 
-    /**
-     * @param int $link_id
-     * @param int $note_id
-     * @return mixed
-     */
     public static function removeWhere(int $link_id, int $note_id): mixed
     {
         return DB::dql(
@@ -125,10 +117,6 @@ class NoteToLink extends Entity
         );
     }
 
-    /**
-     * @param int $link_id
-     * @return mixed
-     */
     public static function removeWhereLinkId(int $link_id): mixed
     {
         return DB::dql(

components/Link/Link.php

@@ -23,9 +23,10 @@ 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;
 use App\Entity\Note;
 use App\Util\Common;
 use App\Util\HTML;
@@ -34,22 +35,37 @@ use InvalidArgumentException;
 
 class Link extends Component
 {
+    /**
+     * Note that this persists both a Link and a NoteToLink
+     *
+     * @return [Entity\Link, NoteToLink]
+     */
+    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
      */
-    public function onProcessNoteContent(Note $note, string $content): bool
+    public function onProcessNoteContent(Note $note, string $content, string $content_type, array $process_note_content_extra_args = []): bool
     {
+        $ignore = $process_note_content_extra_args['ignoreLinks'] ?? [];
         if (Common::config('attachments', 'process_links')) {
             $matched_urls = [];
             preg_match_all($this->getURLRegex(), $content, $matched_urls);
             $matched_urls = array_unique($matched_urls[1]);
             foreach ($matched_urls as $match) {
-                try {
+                if (\in_array($match, $ignore)) {
-                    $link_id = Entity\Link::getOrCreate($match)->getId();
-                    DB::persist(NoteToLink::create(['link_id' => $link_id, 'note_id' => $note->getId()]));
-                } catch (InvalidArgumentException) {
                     continue;
                 }
+                self::maybeCreateLink($match, $note_id);
             }
         }
         return Event::next;
@@ -259,9 +275,9 @@ class Link extends Component
         return HTML::html(['a' => ['attrs' => $attrs, $url]], options: ['indent' => false]);
     }
 
-    public function onNoteDeleteRelated(Note &$note): bool
+    public function onNoteDeleteRelated(Note &$note, Actor $actor): bool
     {
-        NoteToLink::removeWhereNoteId($note->getId());
+        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;
@@ -53,11 +53,11 @@ 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'     => 'feed/feed.html.twig',
+            '_template'     => 'collection/notes.html.twig',
             'page_title'    => _m('Notifications'),
             'should_format' => true,
             'notes'         => $notes,

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

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types = 1);
+
 // {{{ License
 // This file is part of GNU social - https://www.gnu.org/software/social
 //
@@ -19,24 +21,24 @@
 
 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>
+ * @author    Diogo Peralta Cordeiro <@diogo.site>
- * @copyright 2010 StatusNet Inc.
+ * @copyright 2021-2022 Free Software Foundation, Inc http://www.fsf.org
- * @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 Notification extends Entity
@@ -45,9 +47,9 @@ class Notification extends Entity
     // @codeCoverageIgnoreStart
     private int $activity_id;
     private int $target_id;
-    private ?string $reason;
+    private ?string $reason = null;
-    private \DateTimeInterface $created;
+    private DateTimeInterface $created;
-    private \DateTimeInterface $modified;
+    private DateTimeInterface $modified;
 
     public function setActivityId(int $activity_id): self
     {
@@ -73,7 +75,7 @@ class Notification extends Entity
 
     public function setReason(?string $reason): self
     {
-        $this->reason = $reason;
+        $this->reason = \is_null($reason) ? null : mb_substr($reason, 0, 191);
         return $this;
     }
 
@@ -107,9 +109,6 @@ class Notification extends Entity
     // @codeCoverageIgnoreEnd
     // }}} Autocode
 
-    /**
-     * @return Actor
-     */
     public function getTarget(): Actor
     {
         return Actor::getById($this->getTargetId());
@@ -122,21 +121,26 @@ class Notification extends Entity
      */
     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 = [];
+        $targets       = [];
         foreach ($notifications as $notification) {
             $targets[] = $notification->getTargetId();
         }
         return $targets;
     }
 
-    /**
-     * @param int|Activity $activity_id
-     * @return array
-     */
     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)]);
+    }
+
+    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
@@ -154,7 +158,7 @@ class Notification extends Entity
             'primary key' => ['activity_id', 'target_id'],
             'indexes'     => [
                 'attention_activity_id_idx' => ['activity_id'],
-                'attention_target_id_idx'    => ['target_id'],
+                'attention_target_id_idx'   => ['target_id'],
             ],
         ];
     }