cleanup, remove duplicate code

notifications.pl

@@ -25,7 +25,7 @@ my $help = 'Usage:
 /notify show                     - shows whitelists and their statuses
 ';
 
-register($script_name, '0.8.3', 'Sends *nix desktop notifications', \&freehooks);
+register($script_name, '0.8.5', 'Sends *nix desktop notifications', \&freehooks);
 
 HexChat::print("$script_name loaded\n");
 my @hooks;
@@ -94,14 +94,7 @@ sub hookfn {
 	}
 
 # settings are loaded
-	if ($flag == 0) {
+	if ($flag == 1) {
-		undef $nick;     undef $text;     undef $modechar;
-		undef $channel;  undef $network;
-		undef $flag;
-		undef $nicklist; undef $chanlist; undef $netlist;
-		return EAT_NONE;
-	}
-
 		$active = 1;
 		my $t = undef;
 
@@ -115,6 +108,7 @@ sub hookfn {
 		if ($active == 1) {
 			hook_timer( 500, \&timeraction);
 		}
+	}
 
 	undef $nick;     undef $text;     undef $modechar;
 	undef $channel;  undef $network;
@@ -146,102 +140,87 @@ sub notify_cmd {
 	my $cmd = shift(@{$_[0]});
 	my $entity = shift(@{$_[0]});
 	my $value = join(' ', @{$_[0]});
+	HexChat::print("\n");
+	my $msg = undef;
 
-	unless (defined($cmd)) {
+	if (defined($cmd)) {
-		HexChat::print($help);
-		return HexChat::EAT_ALL;
-	}
-
 		if ($cmd eq 'info') {
 			my $network = HexChat::get_info('network') // 'unknown';
-		HexChat::printf("Network name for whitelist: %s\n", $network);
+			$msg = sprintf("Network name for whitelist: %s\n", $network);
-		return HexChat::EAT_ALL;
 		} elsif ($cmd eq 'status') {
 			my $nicklist = loadliststatus('nicklist');
 			my $chanlist = loadliststatus('chanlist');
 			my $netlist =  loadliststatus('netlist');
 
 			if (($nicklist == 0) and ($chanlist == 0) and ($netlist == 0)) {
-			HexChat::print("All whitelists are disbled, will not apply any filters, and be show all notifications.\n");
+				$msg = sprint("All whitelists are disbled, will not apply any filters, and be show all notifications.\n");
-			return HexChat::EAT_ALL;
+			} else {
+				$msg = '';
+
+				if ($nicklist == 0) { $msg .= "Nicks whitelist:    disabled\n"; }
+				else { $msg .= "Nicks whitelist:    enabled\n"; }
+
+				if ($chanlist == 0) { $msg .= "Channel whitelist:  disabled\n"; }
+				else { $msg .= "Channel whitelist:  enabled\n"; }
+
+				if ($netlist == 0) { $msg .= "Networks whitelist: disabled\n"; }
+				else { $msg .= "Networks whitelist: enabled\n"; }
 			}
-
-		my $str = '';
-
-		if ($nicklist == 0) { $str .= "Nicks whitelist:    disabled\n"; }
-		else { $str .= "Nicks whitelist:    enabled\n"; }
-
-		if ($chanlist == 0) { $str .= "Channel whitelist:  disabled\n"; }
-		else { $str .= "Channel whitelist:  enabled\n"; }
-
-		if ($netlist == 0) { $str .= "Networks whitelist: disabled\n"; }
-		else { $str .= "Networks whitelist: enabled\n"; }
-
-		HexChat::print($str);
-		return HexChat::EAT_ALL;
 		} elsif ($cmd eq 'enable') {
 			if($entity eq 'nick') {
 				if (defined(savesetting('nicklist', '1'))) {
-				HexChat::print("Nicks whitelist now enabled\n");
+					$msg = "Nicks whitelist now enabled\n";
 				}
 			} elsif ($entity eq 'chan') {
 				if (defined(savesetting('chanlist', '1'))) {
-				HexChat::print("Channel whitelist now enabled\n");
+					$msg = "Channel whitelist now enabled\n";
 				}
 			} elsif ($entity eq 'net') {
 				if (defined(savesetting('netlist', '1'))) {
-				HexChat::print("Networks whitelist now enabled\n");
+					$msg = "Networks whitelist now enabled\n";
 				}
 			}
-
-		return HexChat::EAT_ALL;
 		} elsif ($cmd eq 'disable') {
 			if($entity eq 'nick') {
 				if (defined(savesetting('nicklist', '0'))) {
-				HexChat::print("Nicks whitelist now disabled\n");
+					$msg = "Nicks whitelist now disabled\n";
 				}
 			} elsif ($entity eq 'chan') {
 				if (defined(savesetting('chanlist', '0'))) {
-				HexChat::print("Channel whitelist now disabled\n");
+					$msg = "Channel whitelist now disabled\n";
 				}
 			} elsif ($entity eq 'net') {
 				if (defined(savesetting('netlist', '0'))) {
-				HexChat::print("Networks whitelist now disabled\n");
+					$msg = "Networks whitelist now disabled\n";
 				}
 			}
-
-		return HexChat::EAT_ALL;
 		} elsif ($cmd eq 'show') {
-		my $str = '';
+			$msg = '';
 
 			if (loadliststatus('nicklist') == 0) {
-			$str .= "Nicks whitelist:    disabled\n";
+				$msg .= "Nicks whitelist:    disabled\n";
 			} else {
-			$str .= "Nicks whitelist:    enabled\n";
+				$msg .= "Nicks whitelist:    enabled\n";
 			}
 
-		$str .= "Whitelisted nicks = " . join( ', ', loadlist('nicks')) ."\n";
+			$msg .= "Whitelisted nicks = " . join( ', ', loadlist('nicks')) ."\n";
 
 			if (loadliststatus('chanlist') == 0) {
-			$str .= "Channel whitelist:  disabled\n";
+				$msg .= "Channel whitelist:  disabled\n";
 			} else {
-			$str .= "Channel whitelist:  enabled\n";
+				$msg .= "Channel whitelist:  enabled\n";
 			}
 
-		$str .= "Whitelisted channels = " . join( ', ', loadlist('chans')) . "\n";
+			$msg .= "Whitelisted channels = " . join( ', ', loadlist('chans')) . "\n";
 
 			if (loadliststatus('netlist') == 0) {
-			$str .= "Networks whitelist: disabled\n";
+				$msg .= "Networks whitelist: disabled\n";
 			} else {
-			$str .= "Networks whitelist: enabled\n";
+				$msg .= "Networks whitelist: enabled\n";
 			}
 
-		$str .= "Whitelisted networks = " . join( ', ', loadlist('nets')) . "\n";
+			$msg .= "Whitelisted networks = " . join( ', ', loadlist('nets')) . "\n";
-
-		HexChat::print($str);
-		return HexChat::EAT_ALL;
 		} elsif ($cmd eq 'add') {
-		my $str = '';
 			if ((defined($entity)) and (defined($value))) {
 				if ($entity eq 'nick') {
 					my @nicks = (loadlist('nicks'), $value);
@@ -250,8 +229,7 @@ sub notify_cmd {
 						return HexChat::EAT_ALL;
 					}
 
-				HexChat::printf("Nicks whitelist now: %s\n", join(', ', @nicks));
+					$msg = sprintf("Nicks whitelist now: %s\n", join(', ', @nicks));
-				return HexChat::EAT_ALL;
 				} elsif ($entity eq 'chan') {
 					my @chans = (loadlist('chans'), $value);
 
@@ -259,8 +237,7 @@ sub notify_cmd {
 						return HexChat::EAT_ALL;
 					}
 
-				HexChat::printf("Channels whitelist now: %s\n", join(', ', @chans));
+					$msg = sprintf("Channels whitelist now: %s\n", join(', ', @chans));
-				return HexChat::EAT_ALL;
 				} elsif ($entity eq 'net') {
 					my @nets = (loadlist('nets'), $value);
 
@@ -268,12 +245,9 @@ sub notify_cmd {
 						return HexChat::EAT_ALL;
 					}
 
-				HexChat::printf("Networks whitelist now: %s\n", join(', ', @nets));
+					$msg = sprintf("Networks whitelist now: %s\n", join(', ', @nets));
-				return HexChat::EAT_ALL;
 				}
 			}
-
-		return HexChat::EAT_ALL;
 		} elsif ($cmd eq 'del') {
 			if ((defined($entity)) and (defined($value))) {
 				if ($entity eq 'nick') {
@@ -291,8 +265,7 @@ sub notify_cmd {
 						return HexChat::EAT_ALL;
 					}
 
-				HexChat::printf("Nicks whitelist now: %s\n", join(', ', @nicklist));
+					$msg = sprintf("Nicks whitelist now: %s\n", join(', ', @nicklist));
-				return HexChat::EAT_ALL;
 				}
 
 				if ($entity eq 'chan') {
@@ -310,8 +283,7 @@ sub notify_cmd {
 						return HexChat::EAT_ALL;
 					}
 
-				HexChat::printf("Channels whitelist now: %s\n", join(', ', @chanlist));
+					$msg = sprintf("Channels whitelist now: %s\n", join(', ', @chanlist));
-				return HexChat::EAT_ALL;
 				}
 
 				if ($entity eq 'net') {
@@ -330,16 +302,18 @@ sub notify_cmd {
 						return HexChat::EAT_ALL;
 					}
 
-				HexChat::printf("Networks whitelist now: %s\n", join(', ', @netlist));
+					$msg = sprintf("Networks whitelist now: %s\n", join(', ', @netlist));
-				return HexChat::EAT_ALL;
+				}
-			}
+			}
-
+		}
-		}
-
-		return HexChat::EAT_ALL;
 	}
 
+	unless(defined($msg)){
 		HexChat::print($help);
+	} else {
+		HexChat::print($msg);
+	}
+
 	return HexChat::EAT_ALL;
 }