Changeset 890

Timestamp:

02/17/08 14:00:21 (11 months ago)

Author:

james

Message:

tidy up

Location:

trunk

Files:

• modules/interbot.tcl (modified) (1 diff)
• plugins/admin_friendship.tcl (modified) (1 diff)

trunk/modules/interbot.tcl

@@ -85 +85 @@
 
 proc bMotion_interbot_catch { bot cmd args } {
-  global bMotionInfo
-  bMotion_putloglev 3 * "interbot: incoming !$args!"
-  set args [lindex $args 0]
-  regexp {([^ ]+) (.+)} $args matches function params
-
-  bMotion_putloglev 2 * "interbot: got command $function ($params) from $bot"
-
-  switch -exact $function {
-    "say" {
-      # bmotion say <channel> <text>
-      bMotionCatchSayChan $bot $params
-    }
-
-    "elect_initial" {
-      bMotion_interbot_next_incoming $bot $params
-    }
-
-    "elect_reply" {
-      bMotion_interbot_next_incoming_reply $bot $params
-    }
-
-    "fake_event" {
-      bMotion_interbot_fake_catch $bot $params
-    }
-
-    "HAY" {
-      bMotion_interbot_hay $bot $params
-    }
-
-    "SUP" {
-      bMotion_interbot_sup $bot $params
-    }
-  }
-
-  return 0
+        global bMotionInfo
+        bMotion_putloglev 3 * "interbot: incoming !$args!"
+        set args [lindex $args 0]
+        if [regexp {([^ ]+) (.+)} $args matches function params] {
+
+                bMotion_putloglev 2 * "interbot: got command $function ($params) from $bot"
+
+                switch -exact $function {
+                        "say" {
+                                # bmotion say <channel> <text>
+                                bMotionCatchSayChan $bot $params
+                        }
+
+                        "elect_initial" {
+                                bMotion_interbot_next_incoming $bot $params
+                        }
+
+                        "elect_reply" {
+                                bMotion_interbot_next_incoming_reply $bot $params
+                        }
+
+                        "fake_event" {
+                                bMotion_interbot_fake_catch $bot $params
+                        }
+
+                        "HAY" {
+                                bMotion_interbot_hay $bot $params
+                        }
+
+                        "SUP" {
+                                bMotion_interbot_sup $bot $params
+                        }
+                }
+        } else {
+                putlog "bMotion: ERROR: received unparsable interbot command from $bot: $cmd $args"
+        }
+
+        return 0
 }
 

trunk/plugins/admin_friendship.tcl

@@ -28 +28 @@
         }
 
-  if [regexp -nocase {set ([^ ]+) ([0-9]+)} $arg matches nick val] {
-     setFriendshipHandle $nick $val
-     bMotion_putadmin "Friendship rating for $nick is now [getFriendshipHandle $nick]%"
+        if [regexp -nocase {set ([^ ]+) ([0-9]+)} $arg matches nick val] {
+                setFriendshipHandle $nick $val
+                bMotion_putadmin "Friendship rating for $nick is now [getFriendshipHandle $nick]%"
                 return 0
-  }
-  
-  bMotion_putadmin "usage: friendship \[show|set\]"
+        }
+
+        bMotion_putadmin "usage: friendship \[show|set\]"
 }