Merge branch 'dev' into collect

Code/Module/Fhublocs.php

@@ -20,7 +20,7 @@ class Fhublocs extends Controller {
 
 	function get() {
 
-		if (! is_site_admin()) {
+		if (!is_site_admin() && !isCli()) {
             return '';
         }
 

include/conversation.php

@@ -268,6 +268,9 @@ function visible_activity($item)
         return false;
     }
 
+    if (in_array($item['verb'], ['Add', 'Remove'])) {
+        return false;
+    }
     // normal poll responses
     if ($item['obj_type'] === 'Answer') {
         return false;

include/misc.php

@@ -4203,3 +4203,14 @@ function strip_share_content($str)
     return $output;
 }
 
+function isCli() {
+    if (defined('STDIN')) {
+      return true;
+    }
+
+    if (in_array(PHP_SAPI, ['cli', 'phpdbg', 'cli-server'])) {
+      return true;
+    }
+
+    return false;
+}

util/fhublocs

@@ -0,0 +1,20 @@
+#!/usr/bin/env php
+<?php
+
+    if(!file_exists('include/cli_startup.php')) {
+        echo 'Run config from the top level web directory, as util/config <args>' . PHP_EOL;
+        exit(1);
+    }
+
+    use Code\Web\Controller;
+    use Code\Module\Fhublocs;
+
+
+    require_once('include/cli_startup.php');
+
+    cli_startup();
+
+
+    $controller = new Fhublocs();
+    echo str_replace('<br>', '', $controller->get());
+    exit(0);