From 83437dee37a4b3a13f0c9383c5007c5d51c8756d Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 May 2017 03:37:16 +0000 Subject: [PATCH 1/2] Update before ferret merge --- network.pyc | Bin 2855 -> 2855 bytes price.pyc | Bin 22509 -> 22509 bytes trifling.py | 8 ++++++++ trifling.pyc | Bin 19100 -> 19550 bytes 4 files changed, 8 insertions(+) diff --git a/network.pyc b/network.pyc index 2648551cbf41c2be211f6e8ce5f039daa117e49d..698f40e0d819005ac1e206d0d381e4cdbe77ef42 100644 GIT binary patch delta 16 XcmZ23wp@&z`7RYeG7 diff --git a/trifling.py b/trifling.py index ce0416d..0307904 100644 --- a/trifling.py +++ b/trifling.py @@ -104,6 +104,10 @@ def fib(bot, trigger): def flip(bot, trigger): bot.say(u'(╯°□°）╯︵ ┻━┻'.encode('utf8')) +@sopel.module.commands('fuck') +def fuck(bot, trigger): + bot.say("Fuck your {} if you want fuck!".format(trigger.group(2))) + fuckyouoptions = [ "http://imgur.com/Kt8os8v", "https://pbs.twimg.com/profile_images/502111486915788801/DtB5ruDz_400x400.jpeg", @@ -157,6 +161,10 @@ def joshua(bot, trigger): def jwinterm(bot, trigger): bot.say(u'j_winter_m') +@sopel.module.commands('kid', 'rehrar') +def kid(bot, trigger): + bot.say(u'What up kid?') + @sopel.module.commands('lenny') def lenny(bot, trigger): bot.say(u'( ͡° ͜ʖ ͡°)'.encode('utf8')) diff --git a/trifling.pyc b/trifling.pyc index 9e703a3ee14addf39d4b5947122f5acb1661c0b6..b09cfa5f9781bcfbfbb7abdeb7817309256c9348 100644 GIT binary patch delta 1998 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 Date: Wed, 3 May 2017 03:42:08 +0000 Subject: [PATCH 2/2] Fix ferret function --- trifling.py | 26 +++++++++++++------------- trifling.pyc | Bin 19550 -> 22102 bytes 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/trifling.py b/trifling.py index c2239a4..e7881b4 100644 --- a/trifling.py +++ b/trifling.py @@ -370,20 +370,20 @@ def asp(bot, trigger): try: r=requests.get(polourl) - j=r.json() - except: - bot.say("Error connecting to Poloniex") + j=r.json() + except: + bot.say("Error connecting to Poloniex") - label_dash="BTC_DASH" - label_decred="BTC_DCR" - label_factom="BTC_FCT" - label_golem="BTC_GNT" - label_maidsafecoin="BTC_MAID" - label_augur="BTC_REP" - label_stellar="BTC_STR" - label_nem="BTC_XEM" - label_ripple="BTC_XRP" - label_zcash="BTC_ZEC" + label_dash="BTC_DASH" + label_decred="BTC_DCR" + label_factom="BTC_FCT" + label_golem="BTC_GNT" + label_maidsafecoin="BTC_MAID" + label_augur="BTC_REP" + label_stellar="BTC_STR" + label_nem="BTC_XEM" + label_ripple="BTC_XRP" + label_zcash="BTC_ZEC" # Bitstamp try: diff --git a/trifling.pyc b/trifling.pyc index b09cfa5f9781bcfbfbb7abdeb7817309256c9348..add8b42e74becbefbd429b4df93640d23635b2f1 100644 GIT binary patch delta 2595 zcma)8TW=Fb6h3PcJ2#V?NeBsK69O@i*j{rhK?sK=rBMi^P7oAPMT=+SIIO+y?wB-< zSKEsIf~F6kKC~}=DZEsus)YL1i_})?V^ygtQh!6$2SlazoEdw)RDGydGjqPP-<->w zGq#^SP=0=_42A!QwV!{z?TtLtKV7(HaX5>g52d1`h60-r*o*@E4DKty9>M!S!mUMM z3alg^KUt10UGjJsx9CnKAHp?*V-UwI4yO~}Akz&23xOMk?GfMrn+nuIWXIhDwLP$j zGJx9xH_CBP6s3lYFt9K&l(GUh*&c8sz*@k?NFw020*iv%2CNm_c3@r`xE;XS!R-Xr z0d5RfC%Aio#lY}*gg@e zp*8}8ZXb{oMJY~_S8GLapHQ};)GwrVlm>*yEgoHlaAt804G%Q^A z`K}KN9QW}df%o|s&$GpYTEDMQ1!2I)qXO^u@tDAaK0Yk)0UwVGJmlje0uTH6sK5t- zbwQlYW&*f}hj9p4w^SqqVFXx@#K#0yf%Qs!T;Ne)eG;D#cnnxv;z@xI1KTI@l)&S_ z`Xx>Zd<58l#3}HoT1SEHmx?shCZLvpf!Z+~$8ns%F^OXeM-oR0M;ZoP4eG5nNNvur z9uvT@771X(fV@{ZFz3I>&3nr}SXpiEzB#|->u=_ooLlp=c-;U@ z-Qk6WvGGs-`X!SsJo9dUf7iN^EsT7$@ox5cFH88A?NPx`xjqq_01HlA1*(LdfIQ}oE&gXL1 za-#`qmD~q3?b7t2N3((x-b3`Fn~ou*b<@&$PDfpWeiU-_>yRURqAjT7tF|ecN;EKn z+yqfZh|-ResoycoHKscoyt4_7ylt?6V%^j8+$!-7pHi?)qr`iCT+)lo(btWx(GG5PD)WemvLxK#p2mR4yUwf$zK1s$Yj~PjgDCyft?4lTb5A_KB%@m)v zA-d(BZdQ$Ex71;?Tcn~MA{ms5X0u5AQjkqrvsomq5hfnZ>AIyxw@5;uTckoBC0!9t z*L+uxrM;(!@LvZw_fUXPM2UpLN|(~Dgq0pb|9--ax9#|*54r9C@pR+<|MMIVMczb5 ci7QV&UU;H}a!+@!EiNeE>^@xlHZ;`w4+&p({{R30 delta 75 zcmcb%hVkAEMrr2Hyj)!MjFHI