From bcba3e68a37cd2908a5fb5e8106a38352d3f8ee0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Wed, 13 Feb 2013 10:00:47 -0500
Subject: [PATCH] Updates to silencespammer from production

---
 plugins/ActivitySpam/scripts/silencespammer.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/ActivitySpam/scripts/silencespammer.php b/plugins/ActivitySpam/scripts/silencespammer.php
index 2eb9461e45..f08f080338 100644
--- a/plugins/ActivitySpam/scripts/silencespammer.php
+++ b/plugins/ActivitySpam/scripts/silencespammer.php
@@ -66,11 +66,17 @@ function silencespammer($filter, $user, $minimum, $percent) {
 
     $profile = Profile::staticGet('id', $user->id);
 
+    if ($profile->isSilenced()) {
+	printfnq("Already silenced %s\n", $user->nickname);
+	return;
+    }
+    
     $cnt = $profile->noticeCount();
 
     if ($cnt < $minimum) {
         printfnq("Only %d notices posted (minimum %d); skipping\n", $cnt, $minimum);
-    }   
+	return;
+    }
 
     $ss = new Spam_score();
 
@@ -85,7 +91,7 @@ function silencespammer($filter, $user, $minimum, $percent) {
     $spam_percent = ($spam_count * 100 / $cnt);
 
     if ($spam_percent > $percent) {
-        printfnq("Silencing user %d (%0.2f%% spam)\n", $user->nickname, $spam_percent);
+        printfnq("Silencing user %s (%0.2f%% spam)\n", $user->nickname, $spam_percent);
         try {
             $profile->silence();
         } catch(Exception $e) {