RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-01-31 02:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge two join triggers; use nick from store instead of config

Browse Source 
The second one had a slightly wrong regex, and didn't get a match anyway because of the previous one returning before.
This commit is contained in:
MrBougo 2010-09-07 16:55:25 +02:00
parent ee5be7230f
commit 6e389d8b93
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/rcon2irc/rcon2irc.pl
View File

@ -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 $_ } @_;