From 0c48ea15d4fbaa687ec068c610547d1c317da63c Mon Sep 17 00:00:00 2001
From: David Phillips <david@sighup.nz>
Date: Fri, 17 Mar 2017 15:52:59 +1300
Subject: Keep output in same order as trigger input

---
 saxrobot | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'saxrobot')

diff --git a/saxrobot b/saxrobot
index 5f2dc79..da97e47 100755
--- a/saxrobot
+++ b/saxrobot
@@ -84,17 +84,12 @@ sub irc_public {
 	my $me = $irc->nick_name;
 
 	my $collected_response = "";
-	for (@{$config{triggers}}) {
-		my ($match, $response) = split /=>/;
-		# strip quotes
-		$match =~ s/^[^']*'|'[^']*$//g;
-		$response =~ s/^[^']*'|'[^']*$//g;
-
-		# do the count
-		my $repcount = () = $what =~ /$match/gi;
-		if ($repcount > 0) {
-			$collected_response .= $response x $repcount;
-		}
+	print $config{triggers};
+	my @k = (keys %{$config{triggers}});
+	my $expression = join '|', @k;
+	print "expression: $expression\n";
+	while ($what =~ /($expression)/g) {
+		$collected_response .= $config{triggers}->{$1};
 	}
 	$irc->yield(privmsg => $channel => $collected_response) if $collected_response;
 
-- 
cgit v1.1