Merge branch 'patch-20190113a' into 'dev'

Add collect_public_recipients hook

See merge request hubzilla/core!1467

3 files changed, 62 insertions, 2 deletions

diff --git a/doc/hook/collect_public_recipients.bb b/doc/hook/collect_public_recipients.bb
new file mode 100644
index 000000000..de3f4049e
--- /dev/null
+++ b/doc/hook/collect_public_recipients.bb
@@ -0,0 +1,42 @@
+[h2]collect_public_recipients[/h2]
+
+Replace the default list of public recipients (i.e., all contacts).
+
+Allow plugins to create a list of recipients for public messages instead of the default
+of all channel connections.
+
+Called with the following array:
+                       [
+                                'recipients' => [], 
+                                'item' => $item, 
+                                'private_envelope' => $private_envelope, 
+                                'include_groups' => $include_groups
+                        ];
+
+[code]
+                if(array_key_exists('public_policy',$item) && $item['public_policy'] !== 'self') {
+
+                        $hookinfo = [
+                                'recipients' => [], 
+                                'item' => $item, 
+                                'private_envelope' => $private_envelope, 
+                                'include_groups' => $include_groups
+                        ];
+
+                        call_hooks('collect_public_recipients',$hookinfo);
+
+                        if ($hookinfo['recipients']) {
+                                $r = $hookinfo['recipients'];
+                        } else {
+                                $r = q("select abook_xchan, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 and abook_pending = 0 and abook_archived = 0 ",
+                                intval($item['uid'])
+                                );
+                        }
+
+                        if($r) {
+
+			. . .
+
+[/code]
+
+see: include/item.php
diff --git a/doc/hooklist.bb b/doc/hooklist.bb
index afb2cebee..f7dbf3fa0 100644
--- a/doc/hooklist.bb
+++ b/doc/hooklist.bb
@@ -136,6 +136,9 @@ Hooks allow plugins/addons to "hook into" the code at many points and alter the
 [zrl=[baseurl]/help/hook/check_siteallowed]check_siteallowed[/zrl]
 	Used to over-ride or bypass the site black/white block lists
 
+[zrl=[baseurl]/help/hook/collect_public_recipients]collect_public_recipients[/zrl]
+	Used to establish a list of recipients to send a public message to.
+
 [zrl=[baseurl]/help/hook/comment_buttons]comment_buttons[/zrl]
 	Called when rendering the edit buttons for comments
 
diff --git a/include/items.php b/include/items.php
index 02d31fcb5..e5f2be003 100755
--- a/include/items.php
+++ b/include/items.php
@@ -95,9 +95,24 @@ function collect_recipients($item, &$private_envelope,$include_groups = true) {
 		//$sys = get_sys_channel();
 
 		if(array_key_exists('public_policy',$item) && $item['public_policy'] !== 'self') {
-			$r = q("select abook_xchan, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 and abook_pending = 0 and abook_archived = 0 ",
+
+			$hookinfo = [
+				'recipients' => [], 
+				'item' => $item, 
+				'private_envelope' => $private_envelope, 
+				'include_groups' => $include_groups
+			];
+
+			call_hooks('collect_public_recipients',$hookinfo);
+
+			if ($hookinfo['recipients']) {
+				$r = $hookinfo['recipients'];
+			} else {
+				$r = q("select abook_xchan, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 and abook_pending = 0 and abook_archived = 0 ",
 				intval($item['uid'])
-			);
+				);
+			}
+
 			if($r) {
 
 				// filter out restrictive public_policy settings from remote networks