Skip to content

fixes #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brightcloudy wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fixes #5

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c023a7
fix some capitalization inconsistencies with admin names
Jun 27, 2012
0df4ac0
fix a regexp in the die admin command
Jun 27, 2012
fd28294
filter out early fountain scumming deaths
Jul 20, 2012
8c707e4
Merge branch 'master' of git://github.com/paxed/Rodney
Jul 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Rodney.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1393,7 +1393,7 @@ sub on_d_tick {

my %dat = parse_xlogline($line);

if (($dat{'points'} < 1000) && ($dat{'death'} =~ /^quit|^escaped/)) { next; }
if (($dat{'points'} < 1000) && ($dat{'death'} =~ /^quit|^escaped|water/)) { next; }
# someone thought of spamming
# elsif ($death =~ /((http)|(www\.)|(ipod)|(tinyurl)|(xrl)/i)) { next; }

Expand Down Expand Up @@ -2884,7 +2884,7 @@ sub is_learndb_trigger {
}

sub can_edit_learndb {
my $nick = shift;
my $nick = lc(shift);
my $term = shift;
if (is_learndb_trigger($term)) {
return 1 if ($admin_nicks->is_identified($nick));
Expand Down Expand Up @@ -3313,7 +3313,7 @@ my $parsestr_cmd_args = "";
sub admin_msg {
my ( $self, $who, $nicks, $msg ) = @_;

my $nick = ( split /!/, $who )[0];
my $nick = lc(( split /!/, $who )[0]);

if ($msg =~ m/^!say\s(\S+)\s(.+)$/i) {
my $chn = $1;
Expand Down Expand Up @@ -3485,7 +3485,7 @@ sub admin_msg {
$self->botspeak("Showing privmsgs to you.", $nick);
}
}
elsif ($msg =~ m/^!die(\s.+)?$/i) {
elsif ($msg =~ m/^!die\s(\S.+)?$/i) {
$self->botspeak(paramstr_trim($1)) if ($1);
kill_bot();
}
Expand Down