mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #11186 from annando/acl-speed

Browse source 
Improve contact search speed / assume octet-stream on missing content type
This commit is contained in:
Hypolite Petovan 2022-01-26 23:29:37 -05:00 committed by GitHub
parent 3395c61649 c5337c81e7
commit 9d25c3a8f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Module/Search/Acl.php
View file

@ -110,7 +110,7 @@ class Acl extends BaseModule
$search = $_REQUEST['query'];
}
Logger::info('ACL {action} - {subaction}', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]);
Logger::info('ACL {action} - {subaction} - start', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]);
$sql_extra = '';
$condition = ["`uid` = ? AND NOT `deleted` AND NOT `pending` AND NOT `archive`", local_user()];
@ -207,7 +207,7 @@ class Acl extends BaseModule
foreach ($r as $g) {
$entry = [
'type' => 'c',
'photo' => Contact::getMicro($g),
'photo' => Contact::getMicro($g, true),
'name' => htmlspecialchars($g['name']),
'id' => intval($g['id']),
'network' => $g['network'],
@ -268,7 +268,7 @@ class Acl extends BaseModule
if (count($contact) > 0) {
$unknown_contacts[] = [
'type' => 'c',
'photo' => Contact::getMicro($contact),
'photo' => Contact::getMicro($contact, true),
'name' => htmlspecialchars($contact['name']),
'id' => intval($contact['id']),
'network' => $contact['network'],
@ -304,6 +304,7 @@ class Acl extends BaseModule
'items' => $results['items'],
];
Logger::info('ACL {action} - {subaction} - done', ['module' => 'acl', 'action' => 'content', 'subaction' => 'search', 'search' => $search, 'type' => $type, 'conversation' => $conv_id]);
return $o;
}
}

2
src/Util/ParseUrl.php
View file

@ -72,7 +72,7 @@ class ParseUrl
$contenttype = $curlResult->getHeader('Content-Type')[0] ?? '';
if (empty($contenttype)) {
return [];
return ['application', 'octet-stream'];
}
return explode('/', current(explode(';', $contenttype)));