Take entity label, description and aliases from wbgetentities response

freearhey · Dec 20, 2020 · 8c96d40 · 8c96d40
1 parent d60cb2a
commit 8c96d40
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/Wikidata.php b/src/Wikidata.php
@@ -27,16 +27,11 @@ public function search($query, $lang = 'en', $limit = 10)
 
     $ids = $collection->pluck('id')->toArray();
 
-    $entities = $client->getEntities($ids, $lang, ['sitelinks/urls']);
-
-    $output = $collection->map(function ($item) use ($entities, $lang) {
-      $entity = $entities->get($item['id']);
-      if (isset($entity)) {
-        $site = $lang . 'wiki';
-        $item['wiki_url'] = isset($entity['sitelinks'][$site]) ? $entity['sitelinks'][$site]['url'] : null;
-      }
+    $entities = $client->getEntities($ids, $lang, ['sitelinks/urls', 'aliases', 'descriptions', 'labels']);
 
-      return new SearchResult($item, $lang);
+    $output = $entities->map(function ($item) use ($lang) {
+      $entity = new Entity($item, $lang);
+      return new SearchResult($entity->toArray(), $lang);
     });
 
     return $output;
@@ -84,7 +79,6 @@ public function searchBy($property, $value = null, $lang = 'en', $limit = 10)
 
     $output = $entities->map(function ($data) use ($lang) {
       $entity = new Entity($data, $lang);
-
       return new SearchResult($entity->toArray(), $lang);
     });