[GROUP] Simplify logic by making Actor::Organisation a type of Actor::Group

Some minor bug fixes
2022-02-10 04:31:06 +00:00
parent 35e907f7b2
commit 1f1524c2b3
12 changed files with 106 additions and 402 deletions
--- a/components/Collection/Collection.php
+++ b/components/Collection/Collection.php
@@ -127,8 +127,7 @@ class Collection extends Component
                        foreach (
                            [
                                Actor::PERSON => ['person', 'people'],
-                                Actor::GROUP => ['group', 'groups'],
-                                Actor::ORGANISATION => ['org', 'orgs', 'organization', 'organizations', 'organisation', 'organisations'],
+                                Actor::GROUP => ['group', 'groups', 'org', 'orgs', 'organisation', 'organisations', 'organization', 'organizations'],
                                Actor::BOT => ['bot', 'bots'],
                            ] as $type => $match) {
                            if (array_intersect(explode(',', $term[1]), $match) !== []) {