aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-05-04 22:08:12 -0700
committerzotlabs <mike@macgirvin.com>2017-05-04 22:08:12 -0700
commitc70ac572fabb7e808adb58ada201aa0e7acf0c36 (patch)
tree9f4eed92a63640c892d750482905a672991e1549 /Zotlabs
parentf0a2747d80b29810eddeb62063c231d7178ac3db (diff)
downloadvolse-hubzilla-c70ac572fabb7e808adb58ada201aa0e7acf0c36.tar.gz
volse-hubzilla-c70ac572fabb7e808adb58ada201aa0e7acf0c36.tar.bz2
volse-hubzilla-c70ac572fabb7e808adb58ada201aa0e7acf0c36.zip
do away with single delivery (delivery from clones to singleton networks attached to other clones)
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Daemon/Notifier.php23
1 files changed, 3 insertions, 20 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index e2dab4b2d..56a9691bc 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -64,8 +64,6 @@ require_once('include/bbcode.php');
* purge_all channel_id
* expire channel_id
* relay item_id (item was relayed to owner, we will deliver it as owner)
- * single_activity item_id (deliver to a singleton network from the appropriate clone)
- * single_mail mail_id (deliver to a singleton network from the appropriate clone)
* location channel_id
* request channel_id xchan_hash message_id
* rating xlink_id
@@ -105,7 +103,7 @@ class Notifier {
$normal_mode = true;
$packet_type = 'undefined';
- if($cmd === 'mail' || $cmd === 'single_mail') {
+ if($cmd === 'mail') {
$normal_mode = false;
$mail = true;
$private = true;
@@ -451,7 +449,7 @@ class Notifier {
'uplink' => $uplink,
'cmd' => $cmd,
'mail' => $mail,
- 'single' => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
+ 'single' => false,
'location' => $location,
'request' => $request,
'normal_mode' => $normal_mode,
@@ -558,7 +556,7 @@ class Notifier {
'uplink' => $uplink,
'cmd' => $cmd,
'mail' => $mail,
- 'single' => (($cmd === 'single_mail' || $cmd === 'single_activity') ? true : false),
+ 'single' => false,
'location' => $location,
'request' => $request,
'normal_mode' => $normal_mode,
@@ -577,21 +575,6 @@ class Notifier {
}
- // singleton deliveries by definition 'not got zot'.
- // Single deliveries are other federated networks (plugins) and we're essentially
- // delivering only to those that have this site url in their abook_instance
- // and only from within a sync operation. This means if you post from a clone,
- // and a connection is connected to one of your other clones; assuming that hub
- // is running it will receive a sync packet. On receipt of this sync packet it
- // will invoke a delivery to those connections which are connected to just that
- // hub instance.
-
- if($cmd === 'single_mail' || $cmd === 'single_activity') {
- continue;
- }
-
- // default: zot protocol
-
$hash = random_string();
$packet = null;