From 29f360067a867a161f0ba367afc2e38032305f46 Mon Sep 17 00:00:00 2001 From: iou1name Date: Sun, 25 Mar 2018 14:27:40 -0400 Subject: [PATCH] idk what these are, probably just branding --- loader.py | 11 +++---- modules/admin.py | 2 +- modules/adminchannel.py | 2 +- modules/dice.py | 4 +-- modules/hangman.py | 2 +- modules/ipython.py | 2 +- modules/pingall.py | 8 +++-- modules/scramble.py | 4 +-- modules/seen.py | 66 ++++++++++++++++++++++++++++------------- modules/uptime.py | 9 +++++- run.py | 1 - trigger.py | 2 +- 12 files changed, 73 insertions(+), 40 deletions(-) diff --git a/loader.py b/loader.py index 656fb0f..aac45ec 100755 --- a/loader.py +++ b/loader.py @@ -85,11 +85,12 @@ def process_callable(func, config): func._docs = {} func.example = getattr(func, "example", [(None, None)]) - func.thread = getattr(func, 'thread', True) - func.hook = getattr(func, 'hook', False) - func.rate = getattr(func, 'rate', 0) - func.channel_rate = getattr(func, 'channel_rate', 0) - func.global_rate = getattr(func, 'global_rate', 0) + func.thread = getattr(func, "thread", True) + func.hook = getattr(func, "hook", False) + func.rate = getattr(func, "rate", 0) + func.channel_rate = getattr(func, "channel_rate", 0) + func.global_rate = getattr(func, "global_rate", 0) + func.priv = getattr(func, "priv", 0) if hasattr(func, 'commands'): if hasattr(func, 'example'): diff --git a/modules/admin.py b/modules/admin.py index 6bcc3bf..4df833b 100755 --- a/modules/admin.py +++ b/modules/admin.py @@ -86,7 +86,7 @@ def me(bot, trigger): @module.commands('selfmode') @module.example(".mode +B") def self_mode(bot, trigger): - """Set a user mode on Sopel. Can only be done in privmsg by an admin.""" + """Set a user mode on Fulvia. Can only be done in privmsg by an admin.""" mode = trigger.group(3) add_mode = mode.startswith("+") bot.mode(bot.nickname, add_mode, mode) diff --git a/modules/adminchannel.py b/modules/adminchannel.py index 804f204..39ec0cf 100755 --- a/modules/adminchannel.py +++ b/modules/adminchannel.py @@ -73,7 +73,7 @@ def unban(bot, trigger): @module.require_chanmsg @module.require_privilege(OP, 'You are not a channel operator.') -@module.commands('kickban', 'kb') +@module.commands('kickban') def kickban(bot, trigger): """ This gives admins the ability to kickban a user. diff --git a/modules/dice.py b/modules/dice.py index 176d15d..8827651 100755 --- a/modules/dice.py +++ b/modules/dice.py @@ -218,9 +218,7 @@ def roll(bot, trigger): trigger.group(2), pretty_str, result)) -@module.commands("choice") -@module.commands("ch") -@module.commands("choose") +@module.commands("choice", "choose") @module.example(".choose opt1,opt2,opt3") def choose(bot, trigger): """ diff --git a/modules/hangman.py b/modules/hangman.py index e615ad5..1deacb8 100755 --- a/modules/hangman.py +++ b/modules/hangman.py @@ -21,7 +21,7 @@ class Hangman(): self.blanks[n] = ' ' def _PickWord(self): - with open("/home/iou1name/.sopel/wordlist.txt",'r') as file: + with open("/home/iou1name/fulvia/static/wordlist.txt",'r') as file: lines = file.readlines() wrd = list(lines[ random.randint(0, len(lines))-1 ].strip()) return wrd diff --git a/modules/ipython.py b/modules/ipython.py index d2ed7ee..55d4076 100755 --- a/modules/ipython.py +++ b/modules/ipython.py @@ -18,7 +18,7 @@ def interactive_shell(bot, trigger): if bot.memory['iconsole_running']: return bot.say('Console already running') - banner1 = 'Sopel interactive shell (embedded IPython)' + banner1 = 'Fulvia interactive shell (embedded IPython)' banner2 = '`bot` and `trigger` are available. To exit, type exit' exitmsg = 'Interactive shell closed' diff --git a/modules/pingall.py b/modules/pingall.py index 617abe0..5a9fd6a 100755 --- a/modules/pingall.py +++ b/modules/pingall.py @@ -10,5 +10,9 @@ def pingAll(bot, trigger): Says the nick of everyone in the channel. Great way to get thier attention, or just annoy them. """ - msg = " ".join(bot.channels[trigger.channel].users) - bot.say(msg) + names = list(bot.channels[trigger.channel].users.keys()) + if "Ishd" in names: + names.remove("Ishd") + if "Ishd2" in names: + names.remove("Ishd2") + bot.say(" ".join(names)) diff --git a/modules/scramble.py b/modules/scramble.py index 64f04e2..bc7a014 100755 --- a/modules/scramble.py +++ b/modules/scramble.py @@ -16,7 +16,7 @@ class Scramble(): random.shuffle(self.shuffled) def _PickWord(self): - with open("/home/iou1name/.sopel/words6.txt",'r') as file: + with open("/home/iou1name/fulvia/static/words6.txt",'r') as file: lines = file.readlines() wrd = list(lines[ random.randint(0, len(lines))-1 ].strip()) return wrd @@ -29,7 +29,7 @@ class Scramble(): def isAnagram(givenWord, givenGuess): word = [x for x in givenWord] guess = [x for x in givenGuess] - with open('/home/iou1name/.sopel/words6.txt', 'r') as file: + with open('/home/iou1name/fulvia/static/words6.txt', 'r') as file: words = file.readlines() if not ''.join(guess)+'\n' in words: return "notaword" diff --git a/modules/seen.py b/modules/seen.py index 3297860..6f34259 100755 --- a/modules/seen.py +++ b/modules/seen.py @@ -3,6 +3,7 @@ When was this user last seen. """ import time +import argparse import threading from datetime import datetime from sqlite3 import OperationalError @@ -20,8 +21,7 @@ def load_database(bot): seens = bot.db.execute("SELECT * FROM seen").fetchall() for seen in seens: - nick, timestamp, channel, message = seen - seen = (timestamp, channel, message) + nick, seen = seen[0], seen[1:] data[nick] = seen return data @@ -34,9 +34,12 @@ def setup(bot): except OperationalError: cur.execute("CREATE TABLE seen(" "nick TEXT PRIMARY KEY," - "timestamp INTEGER," - "channel TEXT," - "message TEXT)") + "first_timestamp INTEGER," + "first_channel TEXT," + "first_message TEXT," + "last_timestamp INTEGER," + "last_channel TEXT," + "last_message TEXT)") con.commit() con.close() @@ -50,33 +53,47 @@ def setup(bot): +"with \"Just going to the store for some smokes babe I'll be right back\"") @example(".seen Soma_QM", "I haven't seen Soma_QM") def seen(bot, trigger): - """Reports when and where the user was last seen.""" - nick = trigger.group(3) - last = False - if nick == "-l" or nick == "--last": - last = True - nick = trigger.group(4) + """ + Reports when and where the user was last/first seen. + --last [-l] reports when the user was last seen. This is the default. + --first [-f] reports when the user was first seen. + --message [-m] includes the first/last message the user sent. + """ + if not trigger.group(2): + return bot.reply("Seen who?") - if not nick: - return bot.say("Seen who?") + parser = argparse.ArgumentParser() + parser.add_argument("nick") + parser.add_argument("-l", "--last", action="store_true", default=True) + parser.add_argument("-f", "--first", action="store_true") + parser.add_argument("-m", "--message", action="store_true") + args = parser.parse_args(trigger.group[3:]) - if nick == bot.nick: + if args.nick == bot.nick: return bot.reply("I'm right here!") - if nick in bot.memory["seen"]: - timestamp, channel, message = bot.memory["seen"][nick] + if args.nick in bot.memory["seen"]: + if args.first: + timestamp, channel, message = bot.memory["seen"][args.nick][:3] + else: + timestamp, channel, message = bot.memory["seen"][args.nick][3:] else: - return bot.msg(f"I haven't seen \x0308{nick}") + return bot.msg(f"I haven't seen \x0308{args.nick}") timestamp = datetime.fromtimestamp(timestamp) t_format = bot.config.core.default_time_format timestamp = datetime.strftime(timestamp, t_format) reltime = relativeTime(bot.config, datetime.now(), timestamp) - msg = f"Last heard from \x0308{nick}\x03 at {timestamp} " \ + if args.first: + msg = "First" + else: + msg = "Last" + + msg += f" heard from \x0308{args.nick}\x03 at {timestamp} " \ + f"(\x0312{reltime} ago\x03) in \x0312{channel}" - if last: + if args.message: msg += f'\x03 with "\x0308{message}\x03"' bot.say(msg) @@ -89,7 +106,9 @@ def dump_seen_db(bot): bot.memory["seen_lock"].acquire() for nick, seen in bot.memory["seen"].items(): bot.db.execute("INSERT OR REPLACE INTO seen " - "(nick, timestamp, channel, message) VALUES (?, ?, ?, ?)", + "(nick, first_timestamp, first_channel, first_message," + "last_timestamp, last_channel, last_message)" + "VALUES (?, ?, ?, ?, ?, ?, ?)", (nick,) + seen) bot.memory["seen_lock"].release() @@ -97,7 +116,12 @@ def dump_seen_db(bot): @hook(True) @require_chanmsg def seen_hook(bot, trigger): - seen = (time.time(), trigger.channel, trigger.group(0)) + last = (time.time(), trigger.channel, trigger.group(0)) + if not trigger.nick in bot.memory["seen"]: + first = (time.time(), trigger.channel, trigger.group(0)) + else: + first = bot.memory["seen"][trigger.nick][:3] + seen = first + last bot.memory["seen"][trigger.nick] = seen if time.time() - bot.memory["seen_last_dump"] > 60: diff --git a/modules/uptime.py b/modules/uptime.py index 6fbe42c..2062b6d 100755 --- a/modules/uptime.py +++ b/modules/uptime.py @@ -14,7 +14,14 @@ def setup(bot): @commands('uptime') def uptime(bot, trigger): - """.uptime - Returns the uptime of Sopel.""" + """.uptime - Returns the uptime of Fulvia.""" delta = datetime.timedelta(seconds=round((datetime.datetime.now() - bot.memory["uptime"]).total_seconds())) bot.say(f"I've been sitting here for {delta} and I keep going!") + + +@commands('updick') +def updick(bot, trigger): + """.updick - Returns the uptime of Fulvia, measured in dicks.""" + delta = datetime.datetime.now() - bot.memory["uptime"] + bot.say("8" + "="*delta.days + "D") diff --git a/run.py b/run.py index 55ec9d8..da845ee 100755 --- a/run.py +++ b/run.py @@ -3,7 +3,6 @@ Initializes the bot. """ import os -import sys from twisted.internet import reactor diff --git a/trigger.py b/trigger.py index efbe7a8..05e94f3 100755 --- a/trigger.py +++ b/trigger.py @@ -77,7 +77,7 @@ class Trigger(): """ A datetime object at which the message was received by the IRC server. If the server does not support server-time, then `time` will be the time - that the message was received by Sopel. + that the message was received by Fulvia. """ self.raw = ""