diff options
| author | zotlabs <mike@macgirvin.com> | 2018-02-07 18:38:10 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-02-07 18:38:10 -0800 |
| commit | 3a0db39fa05668831e7661ac6edaabfd09d864e2 (patch) | |
| tree | 2a0a7718eafaaeb5564bd95cea7dee8e4bbfa625 /include/queue_fn.php | |
| parent | 1d8d2c6e5517ec7cbb9aa089993918ff6492f5c3 (diff) | |
| download | volse-hubzilla-3a0db39fa05668831e7661ac6edaabfd09d864e2.tar.gz volse-hubzilla-3a0db39fa05668831e7661ac6edaabfd09d864e2.tar.bz2 volse-hubzilla-3a0db39fa05668831e7661ac6edaabfd09d864e2.zip | |
more zot6 delivery work
Diffstat (limited to 'include/queue_fn.php')
| -rw-r--r-- | include/queue_fn.php | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/include/queue_fn.php b/include/queue_fn.php index d1c50de67..d31e41b61 100644 --- a/include/queue_fn.php +++ b/include/queue_fn.php @@ -219,18 +219,12 @@ function queue_deliver($outq, $immediate = false) { $channel = null; - if($outq['outq_msg']) { - $msg = json_decode($outq['outq_notify'],true); - $msg['pickup'] = [ 'notify' => json_decode($outq['outq_notify'],true), 'message' => json_decode($outq['outq_msg'],true) ]; - $msg = json_encode($msg); - if($outq['outq_channel']) { - $channel = channelx_by_n($outq['outq_channel']); - } - } - else { - $msg = $outq['outq_notify']; + if($outq['outq_msg'] && $outq['outq_channel']) { + $channel = channelx_by_n($outq['outq_channel']); } + $msg = $outq['outq_notify']; + $result = zot_zot($outq['outq_posturl'],$msg,$channel); |