GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2025-02-18 14:30:40 +01:00
Code Issues Projects Releases Wiki Activity

Track and remember channel modes and topicinfo

Browse Source
This commit is contained in:
Pragmatic Software 2018-08-05 22:47:38 -07:00
parent c57d7550ea
commit 9243a40228
2 changed files with 56 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PBot/ChanOps.pm
View File

@ -283,6 +283,8 @@ sub join_channel {
and $self->{pbot}->{channels}->{channels}->hash->{$channel}{permop}) { and $self->{pbot}->{channels}->{channels}->hash->{$channel}{permop}) {
$self->gain_ops($channel); $self->gain_ops($channel);
} }
$self->{pbot}->{conn}->mode($channel);
} }
} }

57
PBot/IRCHandlers.pm
View File

@ -54,6 +54,9 @@ sub initialize {
$self->{pbot}->{event_dispatcher}->register_handler('irc.map', sub { $self->on_map(@_) }); $self->{pbot}->{event_dispatcher}->register_handler('irc.map', sub { $self->on_map(@_) });
$self->{pbot}->{event_dispatcher}->register_handler('irc.whospcrpl', sub { $self->on_whospcrpl(@_) }); $self->{pbot}->{event_dispatcher}->register_handler('irc.whospcrpl', sub { $self->on_whospcrpl(@_) });
$self->{pbot}->{event_dispatcher}->register_handler('irc.endofwho', sub { $self->on_endofwho(@_) }); $self->{pbot}->{event_dispatcher}->register_handler('irc.endofwho', sub { $self->on_endofwho(@_) });
$self->{pbot}->{event_dispatcher}->register_handler('irc.channelmodeis', sub { $self->on_channelmodeis(@_) });
$self->{pbot}->{event_dispatcher}->register_handler('irc.topic', sub { $self->on_topic(@_) });
$self->{pbot}->{event_dispatcher}->register_handler('irc.topicinfo', sub { $self->on_topicinfo(@_) });
$self->{pbot}->{event_dispatcher}->register_handler('pbot.join', sub { $self->on_self_join(@_) }); $self->{pbot}->{event_dispatcher}->register_handler('pbot.join', sub { $self->on_self_join(@_) });
$self->{pbot}->{event_dispatcher}->register_handler('pbot.part', sub { $self->on_self_part(@_) }); $self->{pbot}->{event_dispatcher}->register_handler('pbot.part', sub { $self->on_self_part(@_) });
@ -187,6 +190,8 @@ sub on_action {
return 0; return 0;
} }
# FIXME: on_mode doesn't handle chanmodes that have parameters, e.g. +l
sub on_mode { sub on_mode {
my ($self, $event_type, $event) = @_; my ($self, $event_type, $event) = @_;
my ($nick, $user, $host) = ($event->{event}->nick, $event->{event}->user, $event->{event}->host); my ($nick, $user, $host) = ($event->{event}->nick, $event->{event}->user, $event->{event}->host);
@ -200,7 +205,7 @@ sub on_mode {
my $i = 0; my $i = 0;
my $target; my $target;
while($mode_string =~ m/(.)/g) { while ($mode_string =~ m/(.)/g) {
my $char = $1; my $char = $1;
if ($char eq '-' or $char eq '+') { if ($char eq '-' or $char eq '+') {
@ -218,12 +223,23 @@ sub on_mode {
$self->{pbot}->{bantracker}->track_mode("$nick!$user\@$host", $mode, $target, $channel); $self->{pbot}->{bantracker}->track_mode("$nick!$user\@$host", $mode, $target, $channel);
} }
if (defined $target) { if (defined $target and length $target) {
if ($modifier eq '-') { if ($modifier eq '-') {
$self->{pbot}->{nicklist}->delete_meta($channel, $target, "+$mode_char"); $self->{pbot}->{nicklist}->delete_meta($channel, $target, "+$mode_char");
} else { } else {
$self->{pbot}->{nicklist}->set_meta($channel, $target, $mode, 1); $self->{pbot}->{nicklist}->set_meta($channel, $target, $mode, 1);
} }
} else {
my $modes = $self->{pbot}->{channels}->get_meta($channel, 'MODE');
if (defined $modes) {
if ($modifier eq '+') {
$modes = '+' if not length $modes;
$modes .= $mode_char;
} else {
$modes =~ s/\Q$mode_char\E//g;
}
$self->{pbot}->{channels}->{channels}->set($channel, 'MODE', $modes, 1);
}
} }
if (defined $target && $target eq $event->{conn}->nick) { # bot targeted if (defined $target && $target eq $event->{conn}->nick) { # bot targeted
@ -481,7 +497,7 @@ sub on_nickchange {
sub on_nicknameinuse { sub on_nicknameinuse {
my ($self, $event_type, $event) = @_; my ($self, $event_type, $event) = @_;
my ($unused, $nick, $msg) = $event->{event}->args; my (undef, $nick, $msg) = $event->{event}->args;
my $from = $event->{event}->from; my $from = $event->{event}->from;
$self->{pbot}->{logger}->log("Received nicknameinuse for nick $nick from $from: $msg\n"); $self->{pbot}->{logger}->log("Received nicknameinuse for nick $nick from $from: $msg\n");
@ -489,6 +505,41 @@ sub on_nicknameinuse {
return 0; return 0;
} }
sub on_channelmodeis {
my ($self, $event_type, $event) = @_;
my (undef, $channel, $modes) = $event->{event}->args;
$self->{pbot}->{channels}->{channels}->set($channel, 'MODE', $modes, 1);
}
sub on_topic {
my ($self, $event_type, $event) = @_;
if (not length $event->{event}->{to}->[0]) {
# on join
my (undef, $channel, $topic) = $event->{event}->args;
$self->{pbot}->{logger}->log("Topic for $channel: $topic\n");
$self->{pbot}->{channels}->{channels}->set($channel, 'TOPIC', $topic, 1);
} else {
# user changing topic
my ($nick, $user, $host) = ($event->{event}->nick, $event->{event}->user, $event->{event}->host);
my $channel = $event->{event}->{to}->[0];
my $topic = $event->{event}->{args}->[0];
$self->{pbot}->{logger}->log("$nick!$user\@$host changed topic for $channel to: $topic\n");
$self->{pbot}->{channels}->{channels}->set($channel, 'TOPIC', $topic, 1);
$self->{pbot}->{channels}->{channels}->set($channel, 'TOPIC_SET_BY', "$nick!$user\@$host", 1);
$self->{pbot}->{channels}->{channels}->set($channel, 'TOPIC_SET_ON', gettimeofday);
}
}
sub on_topicinfo {
my ($self, $event_type, $event) = @_;
my (undef, $channel, $by, $timestamp) = $event->{event}->args;
$self->{pbot}->{logger}->log("Topic for $channel set by $by on $timestamp\n");
$self->{pbot}->{channels}->{channels}->set($channel, 'TOPIC_SET_BY', $by, 1);
$self->{pbot}->{channels}->{channels}->set($channel, 'TOPIC_SET_ON', $timestamp, 1);
}
sub normalize_hostmask { sub normalize_hostmask {
my ($self, $nick, $user, $host) = @_; my ($self, $nick, $user, $host) = @_;