From 6e389d8b93cb9b62ba002e36bb48af82fa70ff84 Mon Sep 17 00:00:00 2001 From: MrBougo Date: Tue, 7 Sep 2010 16:55:25 +0200 Subject: [PATCH] merge two join triggers; use nick from store instead of config The second one had a slightly wrong regex, and didn't get a match anyway because of the previous one returning before. --- server/rcon2irc/rcon2irc.pl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/server/rcon2irc/rcon2irc.pl b/server/rcon2irc/rcon2irc.pl index a29a0a15..b5d3c89e 100755 --- a/server/rcon2irc/rcon2irc.pl +++ b/server/rcon2irc/rcon2irc.pl @@ -1321,12 +1321,20 @@ sub cond($) return irc_joinstage(0); } ], - # Catch joins of people in a channel the bot is in and catch our own joins of a channel + # Catch joins of people in a channel the bot is in and catch our own joins of a channel, + # detect channel join message and note hostname length to get the maximum allowed line length [ irc => q{:(([^! ]*)![^ ]*) JOIN (#.+)} => sub { my ($hostmask, $nick, $chan) = @_; + + if ($nick eq $store{irc_nick}) { + $store{irc_maxlen} = 510 - length($hostmask); + $store{irc_joined_channel} = 1; + print "* detected maximum line length for channel messages: $store{irc_maxlen}\n"; + } + return 0 unless ($store{irc_quakenet_users}); - if ($nick eq $config{irc_nick}) { + if ($nick eq $store{irc_nick}) { out irc => 0, "PRIVMSG Q :users $chan"; # get auths for all users } else { $store{quakenet_hosts}->{$nick} = $hostmask; @@ -1395,14 +1403,6 @@ sub cond($) return 0; } ], - # detect channel join message and note hostname length to get the maximum allowed line length - [ irc => q{(:(?i:(??{$store{irc_nick}}))![^ ]* )(?i:JOIN) :(?i:(??{$config{irc_channel}}))} => sub { - $store{irc_maxlen} = 510 - length($1); - $store{irc_joined_channel} = 1; - print "* detected maximum line length for channel messages: $store{irc_maxlen}\n"; - return 0; - } ], - # chat: Xonotic server -> IRC channel [ dp => q{\001(.*?)\^7: (.*)} => sub { my ($nick, $message) = map { color_dp2irc $_ } @_; -- 2.39.2