major re-organisation of the different SQL files; cleanup and fixing of the postgres...

[infobot.git] / src / Modules / Topic.pl

diff --git a/src/Modules/Topic.pl b/src/Modules/Topic.pl
index 96b0b3ff61932991a25c53e6afa89cac50a47f8b..10f0f7720843dd44545af327540724f7a09530d6 100644 (file)
--- a/src/Modules/Topic.pl
+++ b/src/Modules/Topic.pl
@@ -60,10 +60,7 @@ sub topicCipher {
     foreach (@_) {
        my ($subtopic, $setby) = split /\|\|/;
 
-       if ($setby =~ /^(unknown|)$/i) {
-           push(@topic, $subtopic);
-       # If topicAuthor is on then show it in topic, otherwise just topic -- troubled
-       } elsif ($param{'topicAuthor'} eq "1") {
+       if ($param{'topicAuthor'} eq "1" and (!$setby =~ /^(unknown|)$/i)) {
            push(@topic, "$subtopic ($setby)");
        } else {
            push(@topic, "$subtopic");
@@ -170,7 +167,13 @@ sub do_add {
     return if ($channels{$chan}{t} and !&hasFlag("T"));
 
     my @prev = &topicDecipher($chan);
-    my $new  = "$args ($orig{who})";
+    my $new;
+    # If bot new to chan and topic is blank, it still got a (owner). This is fix
+    if ($param{'topicAuthor'} eq "1") {
+       $new  = "$args ($orig{who})";
+    } else {
+       $new  = "$args";
+    }
     $topic{$chan}{'What'} = "Added '$args'.";
 
     if (scalar @prev) {