Merge pull request #13176 from MrPetovan/bug/warnings

[friendica.git] / src / Module / Api / Mastodon / Search.php

diff --git a/src/Module/Api/Mastodon/Search.php b/src/Module/Api/Mastodon/Search.php
index 96d41c3b2e810cd7317356f0b115940420636b5a..956e3d73b82a22562a2149cca1218c79689ed03f 100644 (file)
--- a/src/Module/Api/Mastodon/Search.php
+++ b/src/Module/Api/Mastodon/Search.php
@@ -77,7 +77,7 @@ class Search extends BaseApi
                        }
                }
 
-               if ((empty($request['type']) || ($request['type'] == 'statuses')) && (!strpos($request['q'], '@') || $request['resolve'])) {
+               if (empty($request['type']) || ($request['type'] == 'statuses')) {
                        $result['statuses'] = self::searchStatuses($uid, $request['q'], $request['account_id'], $request['max_id'], $request['min_id'], $limit, $request['offset']);
 
                        if (!is_array($result['statuses'])) {
@@ -115,7 +115,7 @@ class Search extends BaseApi
                }
 
                $accounts = [];
-               foreach (Contact::searchByName($q, '', $following ? $uid : 0, $limit, $offset) as $contact) {
+               foreach (Contact::searchByName($q, '', $following ? $uid : 0, false, $limit, $offset) as $contact) {
                        $accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid);
                }
 
@@ -183,8 +183,8 @@ class Search extends BaseApi
                        self::setBoundaries($item['uri-id']);
                        try {
                                $statuses[] = DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid, $display_quotes);
-                       } catch (\Throwable $th) {
-                               Logger::info('Post not fetchable', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'error' => $th]);
+                       } catch (\Exception $exception) {
+                               Logger::info('Post not fetchable', ['uri-id' => $item['uri-id'], 'uid' => $uid, 'exception' => $exception]);
                        }
                }
                DBA::close($items);