From e78cbf91434c26c8d4c50e327f109559df75dc59 Mon Sep 17 00:00:00 2001
From: Eric Ahn <wchill1337@gmail.com>
Date: Tue, 26 Jul 2016 10:59:23 -0700
Subject: [PATCH] Remove bot_on since it's actually unnecessary

---
 plugins/logger/__init__.py     |  8 ++++----
 pokemongo_bot/event_manager.py |  9 ---------
 pokemongo_bot/plugins.py       | 37 ----------------------------------
 3 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/plugins/logger/__init__.py b/plugins/logger/__init__.py
index 9d3a204d..ec547d27 100644
--- a/plugins/logger/__init__.py
+++ b/plugins/logger/__init__.py
@@ -1,18 +1,18 @@
 from pokemongo_bot import logger, event_manager
 from pokemongo_bot.event_manager import manager
 
-@manager.bot_on("before_catch_pokemon")
+@manager.on("before_catch_pokemon")
 def action_before_catch_pokemon(event, bot, name=None, cp=None, pokemon_potential=None, **kwargs):
     logger.log("[#] A Wild {} appeared! [CP {}] [Potential {}]".format(name, cp, pokemon_potential, "yellow"))
 
-@manager.bot_on("catch_pokemon")
+@manager.on("catch_pokemon")
 def action_catch_pokemon(hook_params):
     pass
 
-@manager.bot_on("after_catch_pokemon")
+@manager.on("after_catch_pokemon")
 def action_after_catch_pokemon(event, bot, name=None, cp=None, **kwargs):
     logger.log("[x] Captured {} [CP {}]".format(name, cp, "green"))
 
-@manager.bot_on("use_pokeball")
+@manager.on("use_pokeball")
 def action_use_pokeball(event, bot, pokeball_name=None, number_left=None, **kwargs):
     logger.log("[x] Using {}... ({} left!)".format(pokeball_name, number_left))
diff --git a/pokemongo_bot/event_manager.py b/pokemongo_bot/event_manager.py
index 452c02cd..d66c439e 100644
--- a/pokemongo_bot/event_manager.py
+++ b/pokemongo_bot/event_manager.py
@@ -33,15 +33,6 @@ def register_handler(function):
             return function
         return register_handler
 
-    # decorator that injects the bot context into the event handler
-    def bot_on(self, *trigger_list):
-        def register_handler(function):
-            for trigger in trigger_list:
-                # inject the bot context into the function as 2nd parameter and remove from kwargs
-                self.add_listener(trigger, lambda *args, **kwargs: function(args[0], kwargs.get('bot'), *(args[1:]), **{x:kwargs[x] for x in kwargs if x != 'bot'}))
-            return function
-        return register_handler
-
     # fire an event and call all event handlers
     def fire(self, event_name, *args, **kwargs):
         if event_name in self.events:
diff --git a/pokemongo_bot/plugins.py b/pokemongo_bot/plugins.py
index a14354e3..e2e261dc 100644
--- a/pokemongo_bot/plugins.py
+++ b/pokemongo_bot/plugins.py
@@ -68,40 +68,3 @@ def unload_plugin(self, plugin_name):
         '''
         del self.loaded_plugins[plugin_name]
         self.logging.log('plugin "%s" unloaded' % plugin_name)
-
-    """
-    def execute_action_hook(self, hook_name, hook_params=None):
-        '''
-        Executes action hook functions of the form action_hook_name contained in
-        the loaded plugin modules.
-        '''
-        if hook_params is None:
-            hook_params = {}
-        for plugin_info in self.loaded_plugins.values():
-            module = plugin_info['module']
-            hook_func_name = 'action_%s' % hook_name
-            if hasattr(module, hook_func_name):
-                hook_func = getattr(module, hook_func_name)
-                hook_func(hook_params)
-
-    def execute_filter_hook(self, hook_name, hook_params=None):
-        '''
-        Filters the hook_params through filter hook functions of the form
-        filter_hook_name contained in the loaded plugin modules.
-        '''
-        if hook_params is None:
-            hook_params = {}
-        hook_params_keys = hook_params.keys()
-        for plugin_info in self.loaded_plugins.values():
-            module = plugin_info['module']
-            hook_func_name = 'filter_%s' % hook_name
-            if hasattr(module, hook_func_name):
-                hook_func = getattr(module, hook_func_name)
-                hook_params = hook_func(hook_params)
-                for nkey in hook_params_keys:
-                    if nkey not in hook_params.keys():
-                        msg = 'function "%s" in plugin "%s" is missing "%s" in the dict it returns' % (hook_func_name, plugin_info['name'], nkey)
-                        self.logging.log(msg)
-                        raise Exception(msg)
-        return hook_params
-    """