From a2554f3c2fdc6645c0916c57938a99a782996123 Mon Sep 17 00:00:00 2001 From: iou1name Date: Thu, 24 Jan 2019 15:16:40 -0500 Subject: [PATCH] added --slur and --race arguments to slur module --- modules/slur.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/slur.py b/modules/slur.py index 1b0ad42..b2e3ce4 100644 --- a/modules/slur.py +++ b/modules/slur.py @@ -5,6 +5,7 @@ All data comes from http://www.rsdb.org/. """ import random import sqlite3 +import argparse from module import commands @@ -28,12 +29,22 @@ def slur(bot, trigger): """ Prints a random racial slur from the Racial Slurs Database. - [RACE] - specifies a particular race to pick on. + -r, --race - specifies a particular race to pick on. + -s, --slur - specifies a particular slur to pick. """ - if trigger.group(2): + parser = argparse.ArgumentParser() + parser.add_argument("-r", "--race", type=str) + parser.add_argument("-s", "--slur", type=str) + args = parser.parse_args(trigger.group[3:]) + + if args.race: slur = bot.db.execute( "SELECT * FROM `slur` WHERE `race` = ? COLLATE NOCASE " \ - + "ORDER BY RANDOM() LIMIT 1", (trigger.group(2),)).fetchone() + + "ORDER BY RANDOM() LIMIT 1", (args.race,)).fetchone() + elif args.slur: + slur = bot.db.execute( + "SELECT * FROM `slur` WHERE `slur` LIKE ? COLLATE NOCASE " \ + + "LIMIT 1", (f"%{args.slur}%",)).fetchone() else: slur = bot.db.execute( "SELECT * FROM `slur` ORDER BY RANDOM() LIMIT 1").fetchone()