From 8f8b11b9e650fa670efda5dc8599604c99e10a83 Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Sun, 23 Jun 2019 10:34:41 -0700 Subject: [PATCH] ChanOpCommands: respect effective-level override for chan op commands --- PBot/ChanOpCommands.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PBot/ChanOpCommands.pm b/PBot/ChanOpCommands.pm index a266b6ec..afa09c1c 100644 --- a/PBot/ChanOpCommands.pm +++ b/PBot/ChanOpCommands.pm @@ -80,7 +80,7 @@ sub ban_user { my $botnick = $self->{pbot}->{registry}->get_value('irc', 'botnick'); return "I don't think so." if $target =~ /^\Q$botnick\E!/i; - if (not $self->{pbot}->{admins}->loggedin($channel, "$nick!$user\@$host")) { + if (not $stuff->{'effective-level'} and not $self->{pbot}->{admins}->loggedin($channel, "$nick!$user\@$host")) { return "/msg $nick You are not an admin for $channel."; } @@ -129,7 +129,7 @@ sub unban_user { return "/msg $nick Usage for /msg: unban [false value to use unban queue]" if $channel !~ /^#/; - if (not $self->{pbot}->{admins}->loggedin($channel, "$nick!$user\@$host")) { + if (not $stuff->{'effective-level'} and not $self->{pbot}->{admins}->loggedin($channel, "$nick!$user\@$host")) { return "/msg $nick You are not an admin for $channel."; } @@ -188,7 +188,7 @@ sub mute_user { my $botnick = $self->{pbot}->{registry}->get_value('irc', 'botnick'); return "I don't think so." if $target =~ /^\Q$botnick\E!/i; - if (not $self->{pbot}->{admins}->loggedin($channel, "$nick!$user\@$host")) { + if (not $stuff->{'effective-level'} and not $self->{pbot}->{admins}->loggedin($channel, "$nick!$user\@$host")) { return "/msg $nick You are not an admin for $channel."; } @@ -237,7 +237,7 @@ sub unmute_user { return "/msg $nick Usage for /msg: unmute [false value to use unban queue]" if $channel !~ /^#/; - if (not $self->{pbot}->{admins}->loggedin($channel, "$nick!$user\@$host")) { + if (not $stuff->{'effective-level'} and not $self->{pbot}->{admins}->loggedin($channel, "$nick!$user\@$host")) { return "/msg $nick You are not an admin for $channel."; } @@ -291,7 +291,7 @@ sub kick_user { $channel = $1; } - if (not $self->{pbot}->{admins}->loggedin($channel, "$nick!$user\@$host")) { + if (not $stuff->{'effective-level'} and not $self->{pbot}->{admins}->loggedin($channel, "$nick!$user\@$host")) { return "/msg $nick You are not an admin for $channel."; }