diff options
| author | zotlabs <mike@macgirvin.com> | 2020-01-24 19:38:21 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2020-01-24 19:38:21 -0800 |
| commit | 19a8dfaa5c55b674df25ae7af5c1ffcf9070e522 (patch) | |
| tree | 72461b15f54d222d12a1657c5ec534c25f93a236 /Zotlabs/Lib/Activity.php | |
| parent | 293d411efb28b8f20a0208e3c52883e9fbb8cea7 (diff) | |
| parent | fa45ea1d84f27c6b4ddfdcffeed622cca354f3d9 (diff) | |
| download | volse-hubzilla-19a8dfaa5c55b674df25ae7af5c1ffcf9070e522.tar.gz volse-hubzilla-19a8dfaa5c55b674df25ae7af5c1ffcf9070e522.tar.bz2 volse-hubzilla-19a8dfaa5c55b674df25ae7af5c1ffcf9070e522.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Lib/Activity.php')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index a99bb36e4..43315a87f 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -1989,9 +1989,15 @@ class Activity { $s['plink'] = $s['mid']; } - if($act->recips && (! in_array(ACTIVITY_PUBLIC_INBOX,$act->recips))) + if ($act->recips && (! in_array(ACTIVITY_PUBLIC_INBOX,$act->recips))) $s['item_private'] = 1; + if (is_array($act->obj)) { + if (array_key_exists('directMessage',$act->obj) && intval($act->obj['directMessage'])) { + $s['item_private'] = 2; + } + } + set_iconfig($s,'activitypub','recips',$act->raw_recips); $parent = (($s['parent_mid'] && $s['parent_mid'] === $s['mid']) ? true : false); |