[PLUGIN][RelatedTags] Remove duplicate results

This commit is contained in:
Hugo Sales 2021-11-30 22:11:48 +00:00 committed by Diogo Peralta Cordeiro
parent 4f7e243bee
commit 3fbd2cd2b9
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0

View File

@ -25,6 +25,7 @@ use App\Core\Cache;
use App\Core\DB\DB; use App\Core\DB\DB;
use App\Core\Event; use App\Core\Event;
use App\Core\Modules\Plugin; use App\Core\Modules\Plugin;
use App\Entity\ActorTag;
use App\Entity\NoteTag; use App\Entity\NoteTag;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
@ -43,7 +44,8 @@ class RelatedTags extends Plugin
'related-note-tags-' . implode('-', $tags), 'related-note-tags-' . implode('-', $tags),
fn () => DB::sql( fn () => DB::sql(
<<<'EOQ' <<<'EOQ'
select {select} from note_tag nt select distinct on (nt.canonical) canonical, nt.tag, nt.note_id, nt.created
from note_tag nt
where nt.note_id in (select n.id from note n join note_tag nt on n.id = nt.note_id where nt.canonical in (:tags)) where nt.note_id in (select n.id from note n join note_tag nt on n.id = nt.note_id where nt.canonical in (:tags))
and not nt.canonical in (:tags) and not nt.canonical in (:tags)
limit 5 limit 5
@ -61,12 +63,14 @@ class RelatedTags extends Plugin
'related-actor-tags-' . implode('-', $tags), 'related-actor-tags-' . implode('-', $tags),
fn () => DB::sql( fn () => DB::sql(
<<<'EOQ' <<<'EOQ'
select {select} from actor_tag at select distinct on (at.canonical) canonical, at.tagger, at.tagged, at.tag, at.modified
from actor_tag at
where at.tagged in (select at.tagged from actor_tag at where at.canonical in (:tags)) where at.tagged in (select at.tagged from actor_tag at where at.canonical in (:tags))
and not at.canonical in (:tags) and not at.canonical in (:tags)
limit 5 limit 5
EOQ, EOQ,
['tags' => $tags], ['tags' => $tags],
entities: ['at' => ActorTag::class],
), ),
); );
$pinned[] = ['template' => 'related_tags/actor_tags.html.twig', 'vars' => $related]; $pinned[] = ['template' => 'related_tags/actor_tags.html.twig', 'vars' => $related];