diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/rbot/rfc2812.rb | 20 |
2 files changed, 22 insertions, 2 deletions
@@ -2,6 +2,10 @@ * Topic plugin: fix a bug that prevented it from loading correctly. + * New IRC Framework: make sure that NOTICEs and PRIVMSGs do not + raise an exception when the target is in one of the special forms + #<mask> or $<mask>. Needs some work, though, since this case should be + handled specifically. 2006-08-17 Giuseppe Bilotta <giuseppe.bilotta@gmail.com> diff --git a/lib/rbot/rfc2812.rb b/lib/rbot/rfc2812.rb index e56c76bc..26549539 100644 --- a/lib/rbot/rfc2812.rb +++ b/lib/rbot/rfc2812.rb @@ -1095,7 +1095,15 @@ module Irc # parse it yourself, or you can bind to 'MSG', 'PUBLIC', # etc and get it all nicely split up for you. - data[:target] = @server.user_or_channel(argv[0]) + begin + data[:target] = @server.user_or_channel(argv[0]) + rescue + # The previous may fail e.g. when the target is a server or something + # like that (e.g. $<mask>). In any of these cases, we just use the + # String as a target + # FIXME we probably want to explicitly check for the #<mask> $<mask> + data[:target] = argv[0] + end data[:message] = argv[1] handle(:privmsg, data) @@ -1106,7 +1114,15 @@ module Irc handle(:msg, data) end when 'NOTICE' - data[:target] = @server.user_or_channel(argv[0]) + begin + data[:target] = @server.user_or_channel(argv[0]) + rescue + # The previous may fail e.g. when the target is a server or something + # like that (e.g. $<mask>). In any of these cases, we just use the + # String as a target + # FIXME we probably want to explicitly check for the #<mask> $<mask> + data[:target] = argv[0] + end data[:message] = argv[1] case data[:source] when User |