summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-14 21:55:25 -0500
committerEvan Prodromou <evan@controlyourself.ca>2009-02-14 21:56:53 -0500
commited964ea980be63999860aaa5f39274768eca5d59 (patch)
treea02d7db221d552a2c889f03f630b3e6850ec5632
parent3db9c134a052b906c8c9cff946e63ee28457ce1b (diff)
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.
-rw-r--r--classes/Notice.php4
-rw-r--r--config.php.sample8
-rw-r--r--lib/common.php3
3 files changed, 13 insertions, 2 deletions
diff --git a/classes/Notice.php b/classes/Notice.php
index 329988368..cc7de63c2 100644
--- 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 db1a21663..efb5aa443 100644
--- 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 5b4e3c40c..bf49fff6b 100644
--- 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' =>