GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-10-03 09:58:42 +02:00
Code Issues Projects Releases Wiki Activity

ChanOpCommands: invite now catches events to send responses

Browse Source 
Clean up previous commit a lot
This commit is contained in:
Pragmatic Software 2020-01-14 20:01:19 -08:00
parent 753328b77b
commit f789bd1206
1 changed files with 69 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
PBot/ChanOpCommands.pm
View File

@ -19,12 +19,8 @@ use Time::Duration;
use Time::HiRes qw/gettimeofday/; use Time::HiRes qw/gettimeofday/;
sub new { sub new {
if (ref($_[1]) eq 'HASH') { Carp::croak("Options to " . __FILE__ . " should be key/value pairs, not hash reference") if ref($_[1]) eq 'HASH';
Carp::croak("Options to ChanOpCommands should be key/value pairs, not hash reference");
}
my ($class, %conf) = @_; my ($class, %conf) = @_;
my $self = bless {}, $class; my $self = bless {}, $class;
$self->initialize(%conf); $self->initialize(%conf);
return $self; return $self;
@ -33,65 +29,93 @@ sub new {
sub initialize { sub initialize {
my ($self, %conf) = @_; my ($self, %conf) = @_;
my $pbot = delete $conf{pbot}; $self->{pbot} = $conf{pbot} // Carp::croak("Missing pbot reference to " . __FILE__);
if (not defined $pbot) {
Carp::croak("Missing pbot reference to ChanOpCommands"); $self->{pbot}->{commands}->register(sub { return $self->ban_user(@_) }, "ban", 10);
$self->{pbot}->{commands}->register(sub { return $self->unban_user(@_) }, "unban", 10);
$self->{pbot}->{commands}->register(sub { return $self->mute_user(@_) }, "mute", 10);
$self->{pbot}->{commands}->register(sub { return $self->unmute_user(@_) }, "unmute", 10);
$self->{pbot}->{commands}->register(sub { return $self->kick_user(@_) }, "kick", 10);
$self->{pbot}->{commands}->register(sub { return $self->checkban(@_) }, "checkban", 0);
$self->{pbot}->{commands}->register(sub { return $self->checkmute(@_) }, "checkmute", 0);
$self->{pbot}->{commands}->register(sub { return $self->op_user(@_) }, "op", 10);
$self->{pbot}->{commands}->register(sub { return $self->deop_user(@_) }, "deop", 10);
$self->{pbot}->{commands}->register(sub { return $self->voice_user(@_) }, "voice", 10);
$self->{pbot}->{commands}->register(sub { return $self->devoice_user(@_) }, "devoice", 10);
$self->{pbot}->{commands}->register(sub { return $self->mode(@_) }, "mode", 40);
$self->{pbot}->{commands}->register(sub { return $self->invite(@_) }, "invite", 10);
$self->{invites} = {}; # track who invited who in order to direct invite responses to them
# handle invite responses
$self->{pbot}->{event_dispatcher}->register_handler('irc.inviting', sub { return $self->on_inviting(@_) });
$self->{pbot}->{event_dispatcher}->register_handler('irc.useronchannel', sub { return $self->on_useronchannel(@_) });
$self->{pbot}->{event_dispatcher}->register_handler('irc.nosuchnick', sub { return $self->on_nosuchnick(@_) });
} }
$self->{pbot} = $pbot; sub on_inviting {
my ($self, $event_type, $event) = @_;
my ($botnick, $target, $channel) = $event->{event}->args;
$self->{pbot}->{logger}->log("User $target invited to channel $channel.\n");
return 0 if not exists $self->{invites}->{lc $channel} and not exists $self->{invites}->{lc $channel}->{lc $target};
$event->{conn}->privmsg($self->{invites}->{lc $channel}->{lc $target}, "$target invited to $channel.");
delete $self->{invites}->{lc $channel}->{lc $target};
return 1;
}
$pbot->{commands}->register(sub { return $self->ban_user(@_) }, "ban", 10); sub on_useronchannel {
$pbot->{commands}->register(sub { return $self->unban_user(@_) }, "unban", 10); my ($self, $event_type, $event) = @_;
$pbot->{commands}->register(sub { return $self->mute_user(@_) }, "mute", 10); my ($botnick, $target, $channel) = $event->{event}->args;
$pbot->{commands}->register(sub { return $self->unmute_user(@_) }, "unmute", 10); $self->{pbot}->{logger}->log("User $target is already on channel $channel.\n");
$pbot->{commands}->register(sub { return $self->kick_user(@_) }, "kick", 10); return 0 if not exists $self->{invites}->{lc $channel} and not exists $self->{invites}->{lc $channel}->{lc $target};
$pbot->{commands}->register(sub { return $self->checkban(@_) }, "checkban", 0); $event->{conn}->privmsg($self->{invites}->{lc $channel}->{lc $target}, "$target is already on $channel.");
$pbot->{commands}->register(sub { return $self->checkmute(@_) }, "checkmute", 0); delete $self->{invites}->{lc $channel}->{lc $target};
$pbot->{commands}->register(sub { return $self->op_user(@_) }, "op", 10); return 1;
$pbot->{commands}->register(sub { return $self->deop_user(@_) }, "deop", 10); }
$pbot->{commands}->register(sub { return $self->voice_user(@_) }, "voice", 10);
$pbot->{commands}->register(sub { return $self->devoice_user(@_) }, "devoice", 10); sub on_nosuchnick {
$pbot->{commands}->register(sub { return $self->mode(@_) }, "mode", 40); my ($self, $event_type, $event) = @_;
$pbot->{commands}->register(sub { return $self->invite(@_) }, "invite", 10); my ($botnick, $target, $msg) = $event->{event}->args;
$self->{pbot}->{logger}->log("$target: $msg\n");
my $nick;
foreach my $channel (keys %{$self->{invites}}) {
if (exists $self->{invites}->{$channel}->{lc $target}) {
$nick = $self->{invites}->{$channel}->{lc $target};
delete $self->{invites}->{$channel}->{lc $target};
last;
}
}
return 0 if not defined $nick;
$event->{conn}->privmsg($nick, "$target: $msg");
return 1;
} }
sub invite { sub invite {
my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_; my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_;
my ($channel, $target); my ($channel, $target);
if ($from !~ m/^#/) { if ($from !~ m/^#/) {
# from /msg # from /msg
if (not length $arguments) { my $usage = "Usage from /msg: invite <channel> [nick]; if you omit [nick] then you will be invited";
return "Usage from /msg: invite <channel> [nick]; if you omit [nick] then you will be invited"; return $usage if not length $arguments;
}
($channel, $target) = $self->{pbot}->{interpreter}->split_args($stuff->{arglist}, 2); ($channel, $target) = $self->{pbot}->{interpreter}->split_args($stuff->{arglist}, 2);
return "$channel is not a channel; $usage" if $channel !~ m/^#/;
if ($channel !~ m/^#/) { $target = $nick if not defined $target;
return "$channel is not a channel; usage from /msg: invite <channel> [nick]; if you omit [nick] then you will be invited";
}
if (not defined $target) {
$target = $nick;
}
} else { } else {
# in channel # in channel
if (not length $arguments) { return "Usage: invite [channel] <nick>" if not length $arguments;
return "Usage: invite [channel] <nick>";
}
# add current channel as default channel # add current channel as default channel
if ($stuff->{arglist}[0] !~ m/^#/) { $self->{pbot}->{interpreter}->unshift_arg($stuff->{arglist}, $from) if $stuff->{arglist}[0] !~ m/^#/;
$self->{pbot}->{interpreter}->unshift_arg($stuff->{arglist}, $from);
}
($channel, $target) = $self->{pbot}->{interpreter}->split_args($stuff->{arglist}, 2); ($channel, $target) = $self->{pbot}->{interpreter}->split_args($stuff->{arglist}, 2);
} }
$self->{invites}->{lc $channel}->{lc $target} = $nick;
$self->{pbot}->{chanops}->add_op_command($channel, "sl invite $target $channel"); $self->{pbot}->{chanops}->add_op_command($channel, "sl invite $target $channel");
$self->{pbot}->{chanops}->gain_ops($channel); $self->{pbot}->{chanops}->gain_ops($channel);
return ""; return ""; # responses handled by events
} }
sub generic_mode_user { sub generic_mode_user {