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

move the connected check to Activity::init_background_fetch() to omit redundant abook queries in each Activity::store()

Browse Source
This commit is contained in:
Mario
2025-10-26 20:32:43 +00:00
parent a570ef4691
commit e9c07c554a
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Lib/ASCollection.php
View File

@@ -34,7 +34,7 @@ class ASCollection {
$cached = ASCache::Get($obj);
if ($cached) {
// logger('cached: ' . $obj);
$data = unserialise($cached);
$data = $cached;
}
else {
// logger('fetching: ' . $obj);

42
Zotlabs/Lib/Activity.php
View File

@@ -3104,19 +3104,9 @@ class Activity {
sync_an_item($channel['channel_id'], $x['item_id']);
// if the thread owner is a connnection, we will already receive any additional comments to their posts
// but if they are not we can try to fetch others in the background
$connected = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash
WHERE abook_channel = %d and abook_xchan = '%s' LIMIT 1",
intval($channel['channel_id']),
dbesc($x['item']['owner_xchan'])
);
if (!$connected) {
if (isset($act->obj['replies']['id'])) {
App::$cache['as_fetch_collection'][$act->obj['replies']['id']]['channels'][] = $channel['channel_id'];
App::$cache['as_fetch_collection'][$act->obj['replies']['id']]['force'] = intval($force);
}
if (isset($act->obj['replies']['id'])) {
App::$cache['as_fetch_collection'][$act->obj['replies']['id']]['channels'][] = $channel['channel_id'];
App::$cache['as_fetch_collection'][$act->obj['replies']['id']]['force'] = intval($force);
}
}
}
@@ -3808,12 +3798,12 @@ class Activity {
}
}
if (isset(App::$cache['as_fetch_objects'])) {
if (!$observer_hash) {
logger('Attempt to initiate Fetchparents daemon without observer');
return;
}
if (!$observer_hash) {
logger('Attempt to initiate Fetchparents or Convo daemon without observer');
return;
}
if (isset(App::$cache['as_fetch_objects'])) {
foreach (App::$cache['as_fetch_objects'] as $mid => $info) {
$force = $info['force'];
$channels_str = '';
@@ -3830,13 +3820,20 @@ class Activity {
}
if (isset(App::$cache['as_fetch_collection'])) {
if (!$observer_hash) {
logger('Attempt to initiate Convo daemon without observer');
return;
}
$connected = q("SELECT abook_id FROM abook
WHERE abook_xchan = '%s' LIMIT 1",
dbesc($observer_hash)
);
foreach (App::$cache['as_fetch_collection'] as $mid => $info) {
$force = $info['force'];
if ($connected && !$force) {
// If the sender is a connnection with someone on the hub,
// we will already receive any additional comments to their posts
continue;
}
$channels_str = '';
foreach ($info['channels'] as $c) {
@@ -3845,6 +3842,7 @@ class Activity {
}
$channels_str .= $c;
}
Master::Summon(['Convo', $channels_str, $observer_hash, $mid, $force]);
}
}