aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-03-29 15:18:49 +0000
committerMario <mario@mariovavti.com>2020-03-29 15:18:49 +0000
commitb739f91caa1522522a4ce093d7c63f0f4c777085 (patch)
tree363847c74a9068f3c8cf5110a5ac377c5d40fba1 /Zotlabs
parentb1590ad645eca3f9d35e6fb7250547f2244c3140 (diff)
downloadvolse-hubzilla-b739f91caa1522522a4ce093d7c63f0f4c777085.tar.gz
volse-hubzilla-b739f91caa1522522a4ce093d7c63f0f4c777085.tar.bz2
volse-hubzilla-b739f91caa1522522a4ce093d7c63f0f4c777085.zip
use Libsync::build_sync_packet() in mod item, default Lib/Queue driver to zot6 and some whitespace cleanup in queue_deliver()
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Libsync.php1
-rw-r--r--Zotlabs/Lib/Queue.php2
-rw-r--r--Zotlabs/Module/Item.php7
3 files changed, 6 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php
index de389c0a9..b7cda1770 100644
--- a/Zotlabs/Lib/Libsync.php
+++ b/Zotlabs/Lib/Libsync.php
@@ -150,6 +150,7 @@ class Libsync {
'account_id' => $channel['channel_account_id'],
'channel_id' => $channel['channel_id'],
'posturl' => $hub['hubloc_callback'],
+ 'driver' => $hub['hubloc_network'],
'notify' => $n,
'msg' => EMPTY_STR
));
diff --git a/Zotlabs/Lib/Queue.php b/Zotlabs/Lib/Queue.php
index 49891a55b..6acc58bc5 100644
--- a/Zotlabs/Lib/Queue.php
+++ b/Zotlabs/Lib/Queue.php
@@ -116,7 +116,7 @@ class Queue {
dbesc($arr['hash']),
intval($arr['account_id']),
intval($arr['channel_id']),
- dbesc(($arr['driver']) ? $arr['driver'] : 'zot'),
+ dbesc(($arr['driver']) ? $arr['driver'] : 'zot6'),
dbesc($arr['posturl']),
intval(1),
intval(($arr['priority']) ? $arr['priority'] : 0),
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php
index 86b5c1c7a..fcc040e01 100644
--- a/Zotlabs/Module/Item.php
+++ b/Zotlabs/Module/Item.php
@@ -11,6 +11,7 @@ use Zotlabs\Lib\ActivityStreams;
use Zotlabs\Lib\LDSignatures;
use Zotlabs\Web\HTTPSig;
use Zotlabs\Lib\Libzot;
+use Zotlabs\Lib\Libsync;
use Zotlabs\Lib\ThreadListener;
use App;
@@ -1155,7 +1156,7 @@ class Item extends Controller {
if($r) {
xchan_query($r);
$sync_item = fetch_post_tags($r);
- build_sync_packet($profile_uid,array('item' => array(encode_item($sync_item[0],true))));
+ Libsync::build_sync_packet($profile_uid,array('item' => array(encode_item($sync_item[0],true))));
}
}
if(! $nopush)
@@ -1258,7 +1259,7 @@ class Item extends Controller {
if($r) {
xchan_query($r);
$sync_item = fetch_post_tags($r);
- build_sync_packet($profile_uid,array('item' => array(encode_item($sync_item[0],true))));
+ Libsync::build_sync_packet($profile_uid,array('item' => array(encode_item($sync_item[0],true))));
}
}
@@ -1360,7 +1361,7 @@ class Item extends Controller {
if($r) {
xchan_query($r);
$sync_item = fetch_post_tags($r);
- build_sync_packet($i[0]['uid'],array('item' => array(encode_item($sync_item[0],true))));
+ Libsync::build_sync_packet($i[0]['uid'],array('item' => array(encode_item($sync_item[0],true))));
}
if($complex) {