Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 08:55:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

announce improvements

Browse source
This commit is contained in:
zotlabs 2018-09-04 04:06:50 -07:00
parent fb068ac9f7
commit 0aa9c35d0c
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Zotlabs/Lib/Activity.php
View file

@ -1456,13 +1456,14 @@ class Activity {
$s['edited'] = $s['created'];
if(in_array($act->type,['Announce'])) {
$s['mid'] = $act->id;
$s['parent_mid'] = $act->id;
$announced_actor = ((isset($act->obj['actor'])) ? $act->obj['actor'] : $act->get_actor('attributedTo', $act->obj));
if(! $announced_actor) {
return [];
}
self::actor_store($announced_actor['id'],$announced_actor);
$s['author_xchan'] = $announced_actor['id'];
}
$s['title'] = self::bb_content($content,'name');
@ -1644,12 +1645,13 @@ class Activity {
$item['parent_mid'] = $p[0]['parent_mid'];
}
$r = q("select created, edited from item where mid = '%s' and uid = %d limit 1",
$r = q("select id, created, edited from item where mid = '%s' and uid = %d limit 1",
dbesc($item['mid']),
intval($item['uid'])
);
if($r) {
if($item['edited'] > $r[0]['edited']) {
$item['id'] = $r[0]['id'];
$x = item_store_update($item);
}
else {

5
Zotlabs/Lib/ActivityStreams.php
View file

@ -254,7 +254,7 @@ class ActivityStreams {
logger('blacklisted: ' . $url);
return null;
}
logger('fetch: ' . $url, LOGGER_DEBUG);
$x = z_fetch_url($url, true, $redirects,
[ 'headers' => [ 'Accept: application/activity+json, application/ld+json; profile="https://www.w3.org/ns/activitystreams"' ]]);
if($x['success']) {
@ -262,6 +262,9 @@ class ActivityStreams {
logger('returned: ' . json_encode($y,JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES));
return json_decode($x['body'], true);
}
else {
logger('fetch failed: ' . $url);
}
return null;
}