aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-02-03 16:53:49 -0800
committerzotlabs <mike@macgirvin.com>2019-02-03 16:53:49 -0800
commit8ff9a9ff08db1a6e821b9d74c0a58e8ced174d9b (patch)
treeb88764d7e68fef0a694c1d41fe08e21aa2281abd /Zotlabs/Lib
parenta56bc0e1e03aa6b369cf33fc4f4af49c55f3a276 (diff)
downloadvolse-hubzilla-8ff9a9ff08db1a6e821b9d74c0a58e8ced174d9b.tar.gz
volse-hubzilla-8ff9a9ff08db1a6e821b9d74c0a58e8ced174d9b.tar.bz2
volse-hubzilla-8ff9a9ff08db1a6e821b9d74c0a58e8ced174d9b.zip
fix linkify_tags() so it works with xchans across multiple protocols, also some fixes to activity parsing from upstream.
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/Activity.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 8cfa18997..259419f54 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -1411,6 +1411,9 @@ class Activity {
$s['owner_xchan'] = $act->actor['id'];
$s['author_xchan'] = $act->actor['id'];
+ // ensure we store the original actor
+ self::actor_store($act->actor['id'],$act->actor);
+
$s['mid'] = $act->obj['id'];
$s['parent_mid'] = $act->parent_id;
@@ -1483,7 +1486,8 @@ class Activity {
$s['verb'] = self::activity_decode_mapper($act->type);
- if($act->type === 'Tombstone') {
+
+ if($act->type === 'Tombstone' || ($act->type === 'Create' && $act->obj['type'] === 'Tombstone')) {
$s['item_deleted'] = 1;
}
@@ -1492,7 +1496,6 @@ class Activity {
$s['obj_type'] = ACTIVITY_OBJ_COMMENT;
}
-
if($act->obj['type'] === 'Event') {
$s['obj'] = [];
$s['obj']['asld'] = $act->obj;