Optionally ignore some notice sources for public page

We optionally ignore some notice sources from the public page.
Typically these are automatic notice sources like twitterfeed that
don't usually represent the community on the site very well.

diff --git a/classes/Notice.php b/classes/Notice.php
index 32998836862043f1ca74a9602f478a9328440774..cc7de63c206951df8a490927821778f366c80f52 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -136,10 +136,12 @@ class Notice extends Memcached_DataObject
         $notice->profile_id = $profile_id;
 
         $blacklist = common_config('public', 'blacklist');
+        $autosource = common_config('public', 'autosource');
 
         # Blacklisted are non-false, but not 1, either
 
-        if ($blacklist && in_array($profile_id, $blacklist)) {
+        if (($blacklist && in_array($profile_id, $blacklist)) ||
+            ($source && $autosource && in_array($source, $autosource))) {
             $notice->is_local = -1;
         } else {
             $notice->is_local = $is_local;

diff --git a/config.php.sample b/config.php.sample
index db1a216635a71efe8e93d5551fbc52467fb0d34e..efb5aa44327af741f2a1c6e9d38ac6c19d764869 100644 (file)
--- a/config.php.sample
+++ b/config.php.sample
@@ -107,6 +107,14 @@ $config['sphinx']['port'] = 3312;
 #$config['public']['blacklist'][] = 123;
 #$config['public']['blacklist'][] = 2307;
 
+#Mark certain notice sources as automatic and thus not
+#appropriate for public feed
+#$config['public]['autosource'][] = 'twitterfeed';
+#$config['public]['autosource'][] = 'rssdent';
+#$config['public]['autosource'][] = 'Ping.Fm';
+#$config['public]['autosource'][] = 'HelloTxt';
+#$config['public]['autosource'][] = 'Updating.Me';
+
 #Do notice broadcasts offline
 #If you use this, you must run the six offline daemons in the
 #background. See the README for details.

diff --git a/lib/common.php b/lib/common.php
index 5b4e3c40c87d12173ed1058eccaf0c55c56b1765..bf49fff6b40ac0407250ce468fef29ce20539cdd 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -100,7 +100,8 @@ $config =
         array('server' => null),
         'public' =>
         array('localonly' => true,
-              'blacklist' => array()),
+              'blacklist' => array(),
+              'autosource' => array()),
         'theme' =>
         array('server' => null),
         'throttle' =>