added the possibility to individualize greetings

FaustBot/FaustBot.py

@@ -53,7 +53,7 @@ class FaustBot(object):
         self.add_module(WordRunObserver.WordRunObserver())
         self.add_module(GiveIceObserver.GiveIceObserver())
         self.add_module(GiveDrinkToObserver.GiveDrinkToObserver())
-        self.add_module(Greeter.Greeter())
+        self.add_module(Greeter.Greeter(self.config.greeting))
         self.add_module(MathRunObserver.MathRunObserver())
         self.add_module(PartyObserver.PartyObserver())
         self.add_module(PrideObserver.PrideObserver())

FaustBot/Model/Config.py

@@ -44,7 +44,8 @@ class Config(object):
             self._config_dict['blacklist'] =  []
             for module in blacklist:
                 self._config_dict['blacklist'].append(module.strip())
-
+        if 'greeting' not in self._config_dict:
+            self._config_dict['greeting'] = "Hallo "
     @property
     def lang(self):
         return self._config_dict["lang"]
@@ -76,3 +77,7 @@ class Config(object):
     @property
     def pwd(self):
         return self._config_dict['pwd']
+
+    @property
+    def greeting(self):
+        return self._config_dict['greeting']

FaustBot/Modules/DuckObserver.py

@@ -175,7 +175,7 @@ class DuckObserver(PrivMsgObserverPrototype, PingObserverPrototype):
         if nick == self.streakname:
             self.streak+=1
         else:
-            self.streak = 0
+            self.streak = 1
             self.streakname = nick
 
         if self.streak == 3:

FaustBot/Modules/Greeter.py

@@ -16,9 +16,10 @@ class Greeter(JoinObserverPrototype):
     def help():
         return None
 
-    def __init__(self):
+    def __init__(self, greeting):
         super().__init__()
         self.names = defaultdict(int)
+        self.greeting = greeting
 
     def update_on_join(self, data, connection: Connection):
         if data['channel'] == connection.details.get_channel():
@@ -27,5 +28,5 @@ class Greeter(JoinObserverPrototype):
                     connection.send_back("Herzlich Willkommen bei uns "+data['nick'],data)
                     self.names[data['nick']] = int(time.time())
                     return
-                connection.send_back("Hallo " + data['nick'], data)
+                connection.send_back(self.greeting+" " + data['nick'], data)
                 self.names[data['nick']] = int(time.time())