Rejoin: Fix join-on-invitation

2 files changed, 16 insertions, 34 deletions

diff --git a/Plugin/Autojoin.pm b/Plugin/Autojoin.pm
index 4288c42..01c4a87 100644
--- a/Plugin/Autojoin.pm
+++ b/Plugin/Autojoin.pm
@@ -20,4 +20,20 @@ sub on_001_welcome {
 	$irc->yield(join => $_) for @{$config->{channels}};
 	return;
 }
+
+sub on_kick {
+	my ($self, $logger, $kicker, $where, $kickee, $why, $irc) = @_;
+	if ($kickee eq $irc->nick_name) {
+		$logger->("I was kicked from $where. Rejoining now...");
+		$irc->yield(join => $where);
+	}
+	return;
+}
+
+sub on_invite {
+	my ($self, $logger, $who, $where, $irc) = @_;
+
+	$irc->yield(join => $where) if (grep {$_ eq $where} @{$config->{channels}});
+	return;
+}
 1;
diff --git a/Plugin/Rejoin.pm b/Plugin/Rejoin.pm
deleted file mode 100644
index 127f5bc..0000000
--- a/Plugin/Rejoin.pm
+++ /dev/null
@@ -1,34 +0,0 @@
-package Plugin::Rejoin;
-
-use strict;
-use warnings;
-
-my $config;
-my $root_config;
-
-sub configure {
-	my $self = shift;
-	shift; # cmdref
-	shift; # run_command
-	$config = shift;
-	$root_config = shift;
-
-	return $self;
-}
-
-sub on_kick {
-	my ($self, $logger, $kicker, $where, $kickee, $why, $irc) = @_;
-	if ($kickee eq $irc->nick_name) {
-		$logger->("I was kicked from $where. Rejoining now...");
-		$irc->yield(join => $where);
-	}
-	return;
-}
-
-sub on_invite {
-	my ($self, $logger, $who, $where, $irc) = @_;
-
-	$irc->yield(join => $where) if (grep {$_ eq $where} @{$root_config->{channels}});
-	return;
-}
-1;