TheRON/core
1
0
Fork 0
mirror of https://framagit.org/hubzilla/core.git synced 2026-06-21 00:52:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

return hubloc_hash instead of hubloc_id_url for AP and improved check for location

Browse Source
This commit is contained in:
Mario
2023-05-24 09:08:32 +00:00
parent 404189f88c
commit af0b4a0fca
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Zotlabs/Lib/Activity.php
View File

@@ -841,7 +841,7 @@ class Activity {
if (isset($i['app']) && $i['app']) {
$ret['generator'] = ['type' => 'Application', 'name' => $i['app']];
}
if (isset($i['location']) || isset($i['coord'])) {
if (!empty($i['location']) || !empty($i['coord'])) {
$ret['location'] = ['type' => 'Place'];
if ($i['location']) {
$ret['location']['name'] = $i['location'];
@@ -929,7 +929,6 @@ class Activity {
];
call_hooks('encode_activity', $hookinfo);
return $hookinfo['encoded'];
}
@@ -974,10 +973,14 @@ class Activity {
$tmp = expand_acl($i['allow_cid']);
$list = stringify_array($tmp, true);
if ($list) {
$details = q("select hubloc_id_url from hubloc where hubloc_hash in (" . $list . ") and hubloc_id_url != '' and hubloc_deleted = 0");
$details = q("select hubloc_id_url, hubloc_hash, hubloc_network from hubloc where hubloc_hash in (" . $list . ") and hubloc_id_url != '' and hubloc_deleted = 0");
if ($details) {
foreach ($details as $d) {
$ret[] = $d['hubloc_id_url'];
if ($d['hubloc_network'] === 'activitypub') {
$ret[] = $d['hubloc_hash'];
} else {
$ret[] = $d['hubloc_id_url'];
}
}
}
}