浏览代码

Changing hangguy to use the improved as_plugin decorator

Kirk Trombley 6 年之前
父节点
当前提交
5c2ef81c22
共有 2 个文件被更改,包括 3 次插入11 次删除
  1. 1 1
      src/command_system.py
  2. 2 10
      src/plugins/hangguy.py

+ 1 - 1
src/command_system.py

@@ -178,7 +178,7 @@ def as_plugin(command):
             (RollbotPlugin,),
             dict(
                 __init__=init_standin,
-                on_command=(lambda *a: fn(*[c(*a) for c in converters]))
+                on_command=(lambda self, db, msg: fn(*[c(self, db, msg) for c in converters]))
             )
         )
 

+ 2 - 10
src/plugins/hangguy.py

@@ -1,11 +1,10 @@
 import datetime
 import re
 import base64
-import logging
 
 from sqlalchemy import Column, Integer, String, DateTime
 
-from command_system import RollbotPlugin, RollbotResponse, RollbotFailure, ModelBase, pop_arg
+from command_system import as_plugin, RollbotResponse, RollbotFailure, ModelBase, pop_arg
 from config import get_secret
 
 
@@ -341,6 +340,7 @@ def subc_alert(bot, msg):
     return RollbotResponse(msg, respond=False)
 
 
+@as_plugin
 def hangguy(bot, db, msg):
     game_state = get_game(db, msg.group_id)
     guy_state = get_guy(db, msg.group_id)
@@ -385,11 +385,3 @@ def hangguy(bot, db, msg):
         )
 
     return RollbotResponse(msg, txt="My first plugin!")
-
-
-class HangGuy(RollbotPlugin):
-    def __init__(self, bot, logger=logging.getLogger(__name__)):
-        RollbotPlugin.__init__(self, "hangguy", bot, logger=logger)
-
-    def on_command(self, db, msg):
-        return hangguy(self.bot, db, msg)