Removing some unneeded usages of RollbotResponse

src/plugins/finchat.py

@@ -21,6 +21,4 @@ FFFFFFF
 
 @as_plugin("f")
 def finchat(msg):
-    if msg.message_txt[1:].strip().startswith("f"):
-        return RollbotResponse(msg, txt="frick!")
-    return RollbotResponse(msg, txt=Fs)
+    return "frick!" if msg.message_txt[1:].strip().startswith("f") else Fs

src/plugins/hangguy.py

@@ -277,7 +277,7 @@ def handle_in_game(bot, db, msg, game_state, guy_state):
         subc = msg.raw_args[1:].strip().lower()
         if subc == "cancel":
             end_game(game_state)
-            return RollbotResponse(msg, txt="The game has been cancelled. The guy has not been reset.")
+            return "The game has been cancelled. The guy has not been reset."
         elif subc == "alert":
             return subc_alert(bot, msg)
         else:
@@ -325,7 +325,7 @@ def handle_in_game(bot, db, msg, game_state, guy_state):
         end_guy(db, guy_state)
         txt += "\nThe guy has been buried."
 
-    return RollbotResponse(msg, txt=txt)
+    return txt
 
 
 def subc_retire(db, guy_state):
@@ -365,14 +365,13 @@ def hangguy(bot, db, msg):
     subc = subc.lower()
 
     if subc == "view":
-        txt = f"The current guy has {survival_msg(guy_state)}\n"
-        txt += render_guy(guy_state)
-        return RollbotResponse(msg, txt=txt)
+        return f"The current guy has {survival_msg(guy_state)}\n" \
+            + render_guy(guy_state)
     elif subc == "retire":
-        return RollbotResponse(msg, txt=subc_retire(db, guy_state))
+        return subc_retire(db, guy_state)
     elif subc == "start":
         init_game(game_state, rest)
-        return RollbotResponse(msg, txt=render_game(game_state, guy_state))
+        return render_game(game_state, guy_state)
     elif subc == "alert":
         return subc_alert(bot, msg)
     else:
@@ -383,5 +382,3 @@ def hangguy(bot, db, msg):
                 explain="You must use one of the subcommands: !view, !retire, !start, !alert"
             )
         )
-
-    return RollbotResponse(msg, txt="My first plugin!")

src/plugins/meme.py

@@ -1,16 +1,7 @@
 import random
 
-from command_system import as_plugin, RollbotResponse
+from command_system import as_plugin
 
 @as_plugin
-def meme(message):
-
-        diceroll = random.randint(1,20)
-        good = "I love you."
-        bad = "fuck off"
-
-        if diceroll == 20:
-            return RollbotResponse(message, txt=good)
-
-        else:
-            return RollbotResponse(message, txt=bad)
+def meme():
+    return "I love you." if random.randint(1, 20) == 20 else "fuck off"

src/plugins/querying.py

@@ -14,10 +14,7 @@ def inspire(message):
     argstr = message.raw_args
 
     if argstr is not None and "explain" in argstr:
-        return RollbotResponse(
-            message,
-            txt="Using the command !inspire will request an inspiration image from http://inspirobot.me/"
-        )
+        return "Using the command !inspire will request an inspiration image from http://inspirobot.me/"
 
     try:
         url = requests.get("http://inspirobot.me/api?generate=true").text
@@ -133,7 +130,7 @@ def scp(message):
     response += flavortext + "\n"
     response += page_url
 
-    return RollbotResponse(message, txt=response)
+    return response
 
 
 def get_riddle(sesh, logger):
@@ -180,12 +177,10 @@ def riddle(bot, message, log):
         if n > 20:
             return RollbotResponse(message, failure=RollbotFailure.SERVICE_DOWN)
 
-    txt = "\n\n".join((
+    threading.Thread(target=get_answer_cb(bot, message, riddle)).start()
+
+    return "\n\n".join((
         f"Riddle #{rnum}",
         riddle[0],
         f"I'll post the response in about {get_config('riddle.sleep_time')} seconds!",
     ))
-
-    threading.Thread(target=get_answer_cb(bot, message, riddle)).start()
-
-    return RollbotResponse(message, txt=txt)

src/plugins/roll.py

@@ -1,6 +1,6 @@
 import dice
 
-from command_system import RollbotResponse, as_plugin
+from command_system import as_plugin
 
 
 @as_plugin
@@ -13,6 +13,6 @@ def roll(message):
             if not isinstance(roll, int):
                 roll = int(roll)
             rolls.append(str(roll))
-        return RollbotResponse(message, txt="Rolled {}, got: {}".format(argstr, ", ".join(rolls)))
+        return "Rolled {}, got: {}".format(argstr, ", ".join(rolls))
     except Exception as _:
-        return RollbotResponse(message, txt="Sorry - dice expression appears malformed. Add more ()'s")
+        return "Sorry - dice expression appears malformed. Add more ()'s"

src/plugins/simple.py

@@ -19,7 +19,7 @@ def echo(message):
 
 
 @as_plugin
-def greet(message):
+def greet():
     return random.choice(("Hi!", "Hello!", "안녕하세요", "こんにちは", "你好", "👋"))
 
 

src/plugins/teamspeak.py

@@ -1,8 +1,8 @@
 import logging
 
 import requests
-from command_system import RollbotResponse, RollbotFailure, RollbotPlugin
-from config import get_config, get_secret
+from command_system import RollbotResponse, RollbotPlugin
+from config import get_secret
 
 TS3_QUERY = get_secret("teamspeak.query")
 

src/plugins/the_guy.py

@@ -16,4 +16,4 @@ def the_guy(msg):
     for x, y in zip(msg.args(), ("can", "i", "have", "the", "guy")):
         if x.lower() != y:
             return RollbotResponse(msg, failure=RollbotFailure.INVALID_ARGUMENTS)
-    return RollbotResponse(msg, txt=THE_GUY)
+    return THE_GUY

src/plugins/the_house.py

@@ -1,4 +1,4 @@
-from command_system import RollbotResponse, RollbotFailure, as_plugin
+from command_system import as_plugin
 
 housetop = """\
 ┏┓
@@ -25,15 +25,10 @@ housebot = """
 
 @as_plugin("appreciate")
 def the_house(msg):
+    return housetop + ' '.join(list(msg.args(normalize=False))) + housebot
 
-    thehouse = housetop + ' '.join(list(msg.args(normalize=False))) + housebot
-
-    return RollbotResponse(msg, txt=thehouse)
 
 @as_plugin("stfu")
 def shut_up(msg):
-
-    shutup = stfutop + ' '.join(list(msg.args(normalize=False))) + housebot
-
-    return RollbotResponse(msg, txt=shutup)
+    return stfutop + ' '.join(list(msg.args(normalize=False))) + housebot