Move configuration around

1 files changed, 36 insertions, 32 deletions

diff --git a/lib/IRC/Client/Plugin/NickServ.pm6 b/lib/IRC/Client/Plugin/NickServ.pm6
index a6c8972..180ed4f 100644
--- a/lib/IRC/Client/Plugin/NickServ.pm6
+++ b/lib/IRC/Client/Plugin/NickServ.pm6
@@ -6,42 +6,46 @@ use Config;
 use IRC::Client;
 
 #| The IRC::Client::Plugin to deal with NickServ interaction.
-class IRC::Client::Plugin::NickServ does IRC::Client::Plugin
-{
-	has Config $.config;
-
-	#| Identify with NickServ. This is done on IRC code 376 (end of MOTD),
-	#| since this is what most servers accept as the earliest time to start
-	#| interacting with the server.
-	method irc-n376($e)
-	{
-		# Extract the config parameters
-		my Str $user = $!config<nickserv><nickname> // $!config<bot><nickname>;
-		my Str $pass = $!config<nickserv><password>;
-
-		# Nothing to do if we don't have a username and a password
-		if (!$user || !$pass) {
-			note "Missing username or password for NickServ auth";
-			return;
-		}
-
-		# Send the identify command
-		$e.irc.send-cmd: "NS identify $user $pass";
+unit class IRC::Client::Plugin::NickServ does IRC::Client::Plugin;
+
+#| A Config instance to hold all configuration.
+has Config $.config;
+
+#| Identify with NickServ. This is done on IRC code 376 (end of MOTD),
+#| since this is what most servers accept as the earliest time to start
+#| interacting with the server.
+method irc-n376 (
+	$event,
+) {
+	# Extract the config parameters
+	my $user = $!config.get('irc.plugins.nickserv.account');
+	my $pass = $!config.get('irc.plugins.nickserv.password');
+
+	# Nothing to do if we don't have a username and a password
+	if (!$user || !$pass) {
+		.critical('Missing username or password for NickServ auth') with $*LOG;
+		return;
 	}
 
-	multi method irc-notice($e where m:i/"you are now identified"/)
-	{
-		return if $e.server.current-nick eq $e.server.nick.first;
+	# Send the identify command
+	$event.irc.send-cmd: "NS identify $user $pass";
+}
 
-		# Ghost our nick
-		$e.irc.send-cmd: "NS GHOST {$e.server.nick.first}";
-	}
+multi method irc-notice (
+	$event where *.text.contains('you are now identified', :i),
+) {
+	# Nothing to do if we already have our preferred nickname
+	return if $event.server.current-nick eq $event.server.nick.first;
 
-	multi method irc-notice($e where m:i/"has been ghosted"/)
-	{
-		# Use our nick
-		$e.irc.nick: $e.server.nick.first;
-	}
+	# Ghost our nick
+	$event.irc.send-cmd: "NS GHOST {$event.server.nick.first}";
+}
+
+multi method irc-notice (
+	$event where *.text.contains('has been ghosted', :i),
+) {
+	# Use our nick
+	$event.irc.nick: $event.server.nick.first;
 }
 
 # vim: ft=perl6 noet