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

merge from downstream

Browse source
This commit is contained in:
zotlabs 2018-09-07 04:46:57 -07:00
parent 235c0a2865
commit 39d295462e
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Zotlabs/Lib/Activity.php
View file

@ -1388,7 +1388,7 @@ class Activity {
$s['mid'] = $act->obj['id'];
$s['parent_mid'] = $act->parent_id;
if(in_array($act->type, [ 'Like','Dislike' ]) && $s['parent_mid'] === $s['mid']) {
if(in_array($act->type, [ 'Like','Dislike' ])) {
$s['mid'] = $act->id;
$s['parent_mid'] = $act->obj['id'];
@ -1421,13 +1421,14 @@ class Activity {
$s['edited'] = $s['created'];
if(in_array($act->type,['Announce'])) {
$announced_actor = ((isset($act->obj['actor'])) ? $act->obj['actor'] : ActivityStreams::get_actor('attributedTo', $act->obj));
$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');

4
Zotlabs/Lib/ActivityStreams.php
View file

@ -100,9 +100,7 @@ class ActivityStreams {
$this->tgt['actor'] = $this->get_actor('actor',$this->tgt);
$this->parent_id = $this->get_property_obj('inReplyTo');
if(! $this->parent_id) {
$this->parent_id = $this->get_property_obj('inReplyTo',$this->obj);
}
if(! $this->parent_id) {
$this->parent_id = $this->obj['id'];
}