aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2019-11-15 09:43:39 +0000
committerMario <mario@mariovavti.com>2019-11-15 11:02:55 +0100
commita974d0d52dc0f1b40316f0c30e9794b7b700e59e (patch)
tree4b0248c1644b51dbf99faecee86f4b4ef17b6467
parentc850a61a896cfd42cb731f0e159e39e9ffee3236 (diff)
downloadvolse-hubzilla-a974d0d52dc0f1b40316f0c30e9794b7b700e59e.tar.gz
volse-hubzilla-a974d0d52dc0f1b40316f0c30e9794b7b700e59e.tar.bz2
volse-hubzilla-a974d0d52dc0f1b40316f0c30e9794b7b700e59e.zip
AP fixes
(cherry picked from commit 3009c88d246ddcafabf1965f88c5ebd8fe1717fd)
-rw-r--r--Zotlabs/Lib/Activity.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index e41e165b1..08a8b8d03 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -609,9 +609,15 @@ class Activity {
}
if($i['id'] != $i['parent']) {
- $ret['inReplyTo'] = ((strpos($i['thr_parent'],'http') === 0) ? $i['thr_parent'] : z_root() . '/item/' . urlencode($i['thr_parent']));
$reply = true;
+ // inReplyTo needs to be set in the activity for followup actiions (Like, Dislike, Attend, Announce, etc.),
+ // but *not* for comments, where it should only be present in the object
+
+ if (! in_array($ret['type'],[ 'Create','Update' ])) {
+ $ret['inReplyTo'] = ((strpos($i['thr_parent'],'http') === 0) ? $i['thr_parent'] : z_root() . '/item/' . urlencode($i['thr_parent']));
+ }
+
if($i['item_private']) {
$d = q("select xchan_url, xchan_addr, xchan_name from item left join xchan on xchan_hash = author_xchan where id = %d limit 1",
intval($i['parent'])