aboutsummaryrefslogtreecommitdiff
path: root/modules/shakespeare.py
diff options
context:
space:
mode:
authorGravatar jesopo2018-10-03 13:22:37 +0100
committerGravatar jesopo2018-10-03 13:22:37 +0100
commit69d58eede2e9bf83aa1ed1d8fcf956efde494726 (patch)
tree11aa30f2a357f3be23ad97315dae3df051455cbe /modules/shakespeare.py
parentAdd a way to not add a user automatically in IRCServer.get_user (diff)
signature
Move src/Utils.py in to src/utils/, splitting functionality out in to modules of
related functionality
Diffstat (limited to 'modules/shakespeare.py')
-rw-r--r--modules/shakespeare.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/shakespeare.py b/modules/shakespeare.py
index 99d4ba2d..93d20d64 100644
--- a/modules/shakespeare.py
+++ b/modules/shakespeare.py
@@ -1,5 +1,5 @@
import random
-from src import ModuleManager, Utils
+from src import ModuleManager, utils
INSULT_INTRO = ["Thou art a", "Ye", "Thou", "Thy", "Thee"]
@@ -52,7 +52,7 @@ INSULT_PART_3 = ["apple-john", "baggage", "barnacle", "bladder", "boar-pig",
class Module(ModuleManager.BaseModule):
- @Utils.hook("received.command.insult")
+ @utils.hook("received.command.insult")
def dispense_insult(self, event):
insult = [random.choice(INSULT_INTRO), random.choice(INSULT_PART_1),
random.choice(INSULT_PART_2), random.choice(INSULT_PART_3)]
@@ -61,7 +61,9 @@ class Module(ModuleManager.BaseModule):
target = ""
if event["args_split"]:
- target = Utils.bold(event["server"].get_user(
- event["args_split"][0]).nickname) + ", "
+ target = event["args_split"][0]
+ if event["server"].has_user(target):
+ target= event["server"].get_user(target).nickname
+ target = "%s, " % target
event["stdout"].write(target + insult + "!")