diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-16 18:15:58 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-16 18:15:58 -0800 |
| commit | 2de1285121b5f0260699a93249bab11dc74edec5 (patch) | |
| tree | 42a1dbf54c60e08ac73e3481b95b5e26c829958f /include/queue_fn.php | |
| parent | 82306682c601688041ccfd9a7b259bc607301a37 (diff) | |
| download | volse-hubzilla-2de1285121b5f0260699a93249bab11dc74edec5.tar.gz volse-hubzilla-2de1285121b5f0260699a93249bab11dc74edec5.tar.bz2 volse-hubzilla-2de1285121b5f0260699a93249bab11dc74edec5.zip | |
z6 deliver
Diffstat (limited to 'include/queue_fn.php')
| -rw-r--r-- | include/queue_fn.php | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/include/queue_fn.php b/include/queue_fn.php index 5fb0d5f1e..88da90479 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -216,7 +216,24 @@ function queue_deliver($outq, $immediate = false) { // normal zot delivery logger('deliver: dest: ' . $outq['outq_posturl'], LOGGER_DEBUG); - $result = zot_zot($outq['outq_posturl'],$outq['outq_notify']); + + + + $msg = $outq['outq_notify']; + $channel = null; + + if($outq['outq_msg']) { + $tmp = json_decode($msg,true); + $tmp['pickup'] = json_decode($outq['outq_msg'],true); + $msg = json_encode($tmp); + if($outq['outq_channel']) { + $channel = channelx_by_n($outq['outq_channel']); + } + } + + $result = zot_zot($outq['outq_posturl'],$msg,$channel); + + if($result['success']) { logger('deliver: remote zot delivery succeeded to ' . $outq['outq_posturl']); zot_process_response($outq['outq_posturl'],$result, $outq); |