Add or_streamer and or_broadcaster explicit substitutions, closes #411

pajbot/bot.py

@@ -934,8 +934,7 @@ def quit_bot(self, **options):
 
         sys.exit(0)
 
-    @staticmethod
-    def apply_filter(resp, f):
+    def apply_filter(self, resp, f):
         available_filters = {
             "strftime": _filter_strftime,
             "lower": lambda var, args: var.lower(),
@@ -950,11 +949,16 @@ def apply_filter(resp, f):
             "number_format": _filter_number_format,
             "add": _filter_add,
             "or_else": _filter_or_else,
+            "or_broadcaster": self._filter_or_broadcaster,
+            "or_streamer": self._filter_or_broadcaster,
         }
         if f.name in available_filters:
             return available_filters[f.name](resp, f.arguments)
         return resp
 
+    def _filter_or_broadcaster(self, var, args):
+        return _filter_or_else(var, self.streamer)
+
     def find_unique_urls(self, message):
         from pajbot.modules.linkchecker import find_unique_urls