refactor known spam into a list

1 files changed, 41 insertions, 18 deletions

diff --git a/modules/m_spamfilter.sh b/modules/m_spamfilter.sh
index b7346e1..683d7cd 100644
--- a/modules/m_spamfilter.sh
+++ b/modules/m_spamfilter.sh
@@ -34,17 +34,22 @@ readonly SPAMFILTER_CHANNELS="${config_module_spamfilter_channels}"
 readonly BOT_PASS="${config_server_passwd}"
 
 # known spam trigger constants
-readonly SPAM1='blog by freenode staff'
-readonly SPAM2='IRC investigative journalists'
-readonly SPAM3='IRC ad service'
-readonly SPAM4="Australia's #1 hacker"
-readonly SPAM5='SP9002_@efnet'
-readonly SPAM6='/!\ ATTN: '
-readonly SPAM7='acquisition by Private'
-readonly SPAM8='"denial" on the freenode blog'
-readonly SPAM9=' ICO scam'
-readonly SPAM10='Oh, and about those donations she speaks of:'
-
+readonly SPAM=(
+  'blog by freenode staff'
+  'IRC investigative journalists'
+  'IRC ad service'
+  "Australia's #1 hacker"
+  'SP9002_@efnet'
+  '/!\ ATTN: '
+  'acquisition by Private'
+  '"denial" on the freenode blog'
+  ' ICO scam'
+  'Oh, and about those donations she speaks of:'
+  'kaniini has invited you'
+)
+
+
+## setup/teardown ##
 
 module_spamfilter_INIT()
 {
@@ -63,6 +68,9 @@ module_spamfilter_REHASH()
   return 0
 }
 
+
+## events ##
+
 module_spamfilter_on_JOIN()
 {
   local whojoined=
@@ -119,22 +127,37 @@ DBG_CONDITIONS ${sender} ${target} ${log_line} ${chat_log}
 DBG_UNREGISTERED ${sender}
 
   # this chat is from an unregistered user - relay it to the channel unless it is known spam
-  case "${query}" in
-    *$SPAM10*|*$SPAM9*|*$SPAM8*|*$SPAM7*|*$SPAM6*|*$SPAM5*|*$SPAM4*|*$SPAM3*|*$SPAM2*|*$SPAM1*)
+  if is_spam "${query}"
+  then
 
 DBG_SPAM ${sender}
 
-       ;;
-    *) [ "$(echo ${query})" ] && send_msg "${channel}" "(${sender} said): ${query}"
-#        echo "(${sender} said): ${query}" > ${II_DIR}/${channel}/in
-       ;;
-  esac
+  else
+    send_msg "${channel}" "(${sender} said): ${query}"
+    #echo "(${sender} said): ${query}" > ${II_DIR}/${channel}/in
+  fi
 
   # supress further handling of this message
   return 1
 }
 
 
+## helpers ##
+
+is_spam()
+{
+  local needle=$1
+  local haystack=("${SPAM[@]}")
+  local straw
+
+  [ -z "$(echo ${needle})" ] && return 0
+
+  for straw in "${haystack[@]}"; do [[ ${needle} = *"${straw}"* ]] && return 0 ; done ;
+
+  return 1
+}
+
+
 ## DEBUG ##
 
 DBG_JOIN() { (( $DEBUG )) || return ; local whojoined=$1 ; local channel=$2 ; echo "[SPAMFILTER]: whojoined=${whojoined} channel=${channel}" ; }