plugins/tilde.py

@@ -13,30 +13,24 @@ def tildescore_plugin(msg):
 def jackpot_plugin(msg):
     return pinhook.plugin.message(util.tilde.show_jackpot())
 
-#@pinhook.plugin.command('!tilde', help_text='Alias -- &tilde')
+@pinhook.plugin.command('!tilde', help_text='Alias -- &tilde')
 @pinhook.plugin.command('&tilde', help_text='Play the tildegame!')
 def tilde_plugin(msg):
     if util.tilde.ADMIN_ONLY and msg.nick not in msg.ops:
         return
     if msg.channel != util.tilde.GOOD_CHAN and not util.tilde.DEBUG:
         return pinhook.plugin.message("{} is a meanie and gets no tildes. **ju only gives out tildes in the {} channel.**".format(msg.nick, util.tilde.GOOD_CHAN))
-    user_nick = msg.nick
+    if msg.nick not in util.tilde.challenges:
-    if util.tilde.use_ident(msg.nick, msg.user):
+        challenge = util.tilde.challenge(msg.channel, msg.nick, msg.timestamp)
-        user_nick = msg.user
-    if user_nick not in util.tilde.challenges:
-        challenge = util.tilde.challenge(msg.channel, user_nick, msg.timestamp)
         return pinhook.plugin.message(challenge)
 
 @pinhook.plugin.listener('tilde_guess')
 def tilde_guess_plugin(msg):
     if util.tilde.ADMIN_ONLY and msg.nick not in msg.ops:
         return
-    user_nick = msg.nick
+    if msg.nick in util.tilde.challenges and (msg.channel == util.tilde.GOOD_CHAN or util.tilde.DEBUG) and not msg.text.startswith('!'):
-    if util.tilde.use_ident(msg.nick, msg.user):
-        user_nick = msg.user
-    if user_nick in util.tilde.challenges and (msg.channel == util.tilde.GOOD_CHAN or util.tilde.DEBUG) and not msg.text.startswith('!'):
         try:
-            chalres = util.tilde.challenge_response(user_nick, msg.timestamp, msg.text)
+            chalres = util.tilde.challenge_response(msg.nick, msg.timestamp, msg.text)
             print(chalres)
             resp = pinhook.plugin.message(str(chalres[0]))
             return resp
@@ -44,7 +38,3 @@ def tilde_guess_plugin(msg):
             print(traceback.format_exc())
             return pinhook.plugin.message(str(e))
 
-@pinhook.plugin.command('&tildeident', help_text='Use your ident instead of your nickname or the inverse')
-def tilde_plugin(msg):
-    response = util.tilde.modify_ident(msg.nick, msg.user)
-    return pinhook.plugin.message(response)

plugins/tildewait.py

@@ -33,7 +33,6 @@ def tilde_wait(msg):
 @pinhook.plugin.command('!tw',help_text='Alias -- !tildewait')
 @pinhook.plugin.command('!tildewait',help_text='See how much time you have to wait for tildebot, (obsolete)')
 def tildebot_wait(msg):
-    return pinhook.plugin.message("Disabled, as tildebot is no longer running. Please contact the bot operator to re-enable when it comes back up, (probably never)")
     found = False
     if msg.arg: nicktouse = ''.join(msg.arg.split(' '))
     else: nicktouse = msg.nick

requirements.txt

@@ -4,11 +4,11 @@ emoji~=0.4.5
 geopy~=1.11.0
 markovify~=0.7.1
 nltk>~3.4.5
-pinhook~=1.10.1
+pinhook~=1.10
 python-forecastio~=1.3.5
 requests>~2.20.0
 tvdb-api~=1.10
 zalgotext~=0.2.0
 python-dateutil
-#traceback
+traceback
-#importlib
+importlib