harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more zot6 delivery work

Browse Source
This commit is contained in:
zotlabs
2018-02-07 18:38:10 -08:00
parent 1d8d2c6e55
commit 3a0db39fa0
3 changed files with 91 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/queue_fn.php
View File

@@ -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);