eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

[COMPONENT][Language][ENTITY][ActorLanguage] Refactor cache keys in ActorLanguage. Add ActorLangauge::getActorRelatedLanguagesIds and use it in note filtering in the Language component

Browse Source
This commit is contained in:
Hugo Sales
2021-12-10 10:19:01 +00:00
parent 5dd9e5a3d7
commit 33fba0d970
3 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/Language/Language.php
View File

@@ -21,10 +21,10 @@ declare(strict_types = 1);
namespace Component\Language;
use App\Core\DB\DB;
use App\Core\Event;
use App\Core\Modules\Component;
use App\Entity\Actor;
use App\Entity\ActorLanguage;
use App\Entity\Note;
use Functional as F;
@@ -32,16 +32,9 @@ class Language extends Component
{
public function onFilterNoteList(Actor $actor, array &$notes)
{
$language = $actor->getTopLanguage();
$locale = explode('_', $language->getLocale())[0];
$language_family = F\reindex(
DB::dql('select l from language l where l.locale like :locale', ['locale' => $locale . '%']),
fn ($l) => $l->getId(),
);
$notes = F\select(
$notes,
fn (Note $n) => \array_key_exists($n->getLanguageId(), $language_family) && !str_contains($language_family[$n->getLanguageId()]->getLocale(), '_') ? \in_array($n->getLanguageId(), array_keys($language_family)) : $n->getLanguageId() === $language->getId(),
fn (Note $n) => \in_array($n->getLanguageId(), ActorLanguage::getActorRelatedLanguagesIds($actor)),
);
return Event::next;