Changeset 6479

Timestamp:

02/10/08 14:40:14 (5 years ago)

Author:

drry

Message:

lang/ruby/chokan/branches/citrus/plugins/simple_reply.rb
lang/ruby/chokan/branches/citrus/plugins/system.rb
lang/ruby/chokan/branches/citrus/lib/citrus/core.rb
lang/ruby/chokan/branches/citrus/config.yaml.sample: YAML で設定値に文字列と正規表現のどちらも書けるようにしました。ほか。

Location:

lang/ruby/chokan/branches/citrus

Files:

• config.yaml.sample (modified) (3 diffs)
• lib/citrus/core.rb (modified) (1 diff)
• plugins/simple_reply.rb (modified) (2 diffs)
• plugins/system.rb (modified) (1 diff)

lang/ruby/chokan/branches/citrus/config.yaml.sample

@@ -5 +5 @@
   user: chokan
   nick: chokan
-  real: chokan bot via tiarra
+  real: chokan bot via Tiarra
   error: "#chokan"
   plugin_dir: plugins
@@ -14 +14 @@
   System:
     operator: "foo!bar@localhost"
+    #operator: !ruby/regexp /^foo\w*?!bar@baz\d+\.example\.com$/i
 
   HTTP:
@@ -28 +29 @@
         reply: "pong"
 
-  Foobar:
-    disabled:
-      - "#foobar"
+  Foo:
+    disabled: &disabled_group
+      - "#PublicHoge"
+
+  Bar:
+    disabled: *disabled_group
+
+  Baz:
+    enabled: &enabled_group
+      - "#PrivateFuga"
+      - !ruby/regexp /^#P(?:rivate|ublic)Piyo@.+$/i
 
   Jitensya:
-    enabled:
-      - "#foobar"
+    enabled: *enabled_group
+
+...

lang/ruby/chokan/branches/citrus/lib/citrus/core.rb

@@ -147 +147 @@
                                         case
                                         when enabled
-                                                next unless enabled.include?(channel)
+                                                next unless enabled.find {|c| c === channel }
                                         when disabled
-                                                next if disabled.include?(channel)
+                                                next if disabled.find {|c| c === channel }
                                         end
                                 end

lang/ruby/chokan/branches/citrus/plugins/simple_reply.rb

@@ -3 +3 @@
         def on_privmsg(prefix, channel, message)
                 @config["replies"].each do |r|
-                        if  r["words"].include?(message) &&
-                           (!r["channel"] || r["channel"].include?(channel))
+                        if r["words"].include?(message) &&
+                           (!r["channels"] || r["channels"].include?(channel))
 
                                 notice channel, r["reply"]
@@ -23 +23 @@
                                 "replies" => [
                                         {
-                                                "words"   => ["foo", "bar"],
-                                                "channel" => "#test",
-                                                "reply"   => "Nice boat.",
+                                                "words"    => ["foo", "bar"],
+                                                "channels" => "#test",
+                                                "reply"    => "Nice boat.",
                                         }
                                 ]

lang/ruby/chokan/branches/citrus/plugins/system.rb

@@ -2 +2 @@
 class System < Citrus::Plugin
         def on_privmsg(prefix, channel, message)
-                return unless Regexp.new(@config['operator']) =~ prefix
+                return unless @config['operator'] === prefix
                 case message
                 when /^reload(?:\s+([a-z]+))?$/i