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

initial z6 delivery

Browse Source
This commit is contained in:
zotlabs
2018-01-16 20:08:10 -08:00
parent 2de1285121
commit 05de59d4ad
3 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/queue_fn.php
View File

@@ -217,19 +217,19 @@ function queue_deliver($outq, $immediate = false) {
logger('deliver: dest: ' . $outq['outq_posturl'], LOGGER_DEBUG);
$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);
$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'];
}
$result = zot_zot($outq['outq_posturl'],$msg,$channel);