From 52490201b59dcf0eb7516a0f79f46ae99f4fdb6d Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 15:51:03 -0400 Subject: [PATCH 01/55] test db --- sopel_modules/SpiceBot/Database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 078d3b1..7472619 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -571,7 +571,7 @@ class BotDatabase(): db_name = botconfig.core.db_name # Optional, depending on DB SopelDB.url = URL(drivername=drivername, username=db_user, password=db_pass, - host=db_host, port=db_port, database=db_name, query={'charset': 'utf8'}) + host=db_host, port=db_port, database=db_name, use_unicode=1, query={'charset': 'utf8'}) SopelDB.engine = create_engine(SopelDB.url, encoding='utf-8') From a6be63de3566d891f808ee30b702197f8b0d3b50 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 15:52:51 -0400 Subject: [PATCH 02/55] revert --- sopel_modules/SpiceBot/Database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 7472619..078d3b1 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -571,7 +571,7 @@ class BotDatabase(): db_name = botconfig.core.db_name # Optional, depending on DB SopelDB.url = URL(drivername=drivername, username=db_user, password=db_pass, - host=db_host, port=db_port, database=db_name, use_unicode=1, query={'charset': 'utf8'}) + host=db_host, port=db_port, database=db_name, query={'charset': 'utf8'}) SopelDB.engine = create_engine(SopelDB.url, encoding='utf-8') From 815673613d6e3a070bb0113ce77810675a825eae Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:01:55 -0400 Subject: [PATCH 03/55] test --- sopel_modules/SpiceBot/Database.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 078d3b1..353c5e3 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -39,7 +39,7 @@ class Nicknames(BASE): __tablename__ = 'spice_nicknames' nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) slug = Column(String(255), primary_key=True) - canonical = Column(String(255)) + canonical = Column(String(255), unicode=True) class NickValues(BASE): @@ -50,7 +50,7 @@ class NickValues(BASE): nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Text(), unicode=True) class ChannelValues(BASE): @@ -61,7 +61,7 @@ class ChannelValues(BASE): channel = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Text(), unicode=True) class PluginValues(BASE): @@ -72,7 +72,7 @@ class PluginValues(BASE): plugin = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Text(), unicode=True) class SpiceDB(object): From 907212505912f56a16351d230927a96554b9ab5b Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:03:01 -0400 Subject: [PATCH 04/55] hmmmm --- sopel_modules/SpiceBot/Database.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 353c5e3..078d3b1 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -39,7 +39,7 @@ class Nicknames(BASE): __tablename__ = 'spice_nicknames' nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) slug = Column(String(255), primary_key=True) - canonical = Column(String(255), unicode=True) + canonical = Column(String(255)) class NickValues(BASE): @@ -50,7 +50,7 @@ class NickValues(BASE): nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text(), unicode=True) + value = Column(Text()) class ChannelValues(BASE): @@ -61,7 +61,7 @@ class ChannelValues(BASE): channel = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text(), unicode=True) + value = Column(Text()) class PluginValues(BASE): @@ -72,7 +72,7 @@ class PluginValues(BASE): plugin = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text(), unicode=True) + value = Column(Text()) class SpiceDB(object): From 80876886179a287a99501c361f49c6b16179e5b8 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:05:17 -0400 Subject: [PATCH 05/55] test --- sopel_modules/SpiceBot/Database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 078d3b1..d0906fb 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -573,7 +573,7 @@ class BotDatabase(): SopelDB.url = URL(drivername=drivername, username=db_user, password=db_pass, host=db_host, port=db_port, database=db_name, query={'charset': 'utf8'}) - SopelDB.engine = create_engine(SopelDB.url, encoding='utf-8') + SopelDB.engine = create_engine(SopelDB.url, encoding='utf-8', convert_unicode=True) SopelDB.nick_id_lock = threading.Lock() From 320dde825567a897a8cca34b3ff4fcbb6cc019d4 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:07:19 -0400 Subject: [PATCH 06/55] test text --- sopel_modules/SpiceBot/Database.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index d0906fb..8447428 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -50,7 +50,7 @@ class NickValues(BASE): nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Text(convert_unicode=True)) class ChannelValues(BASE): @@ -61,7 +61,7 @@ class ChannelValues(BASE): channel = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Text(convert_unicode=True)) class PluginValues(BASE): @@ -72,7 +72,7 @@ class PluginValues(BASE): plugin = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Text(convert_unicode=True)) class SpiceDB(object): From 2921e5e9c04020bef286e6237c705c3d8f61d0ef Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:08:41 -0400 Subject: [PATCH 07/55] test --- .../sayings/advertisments.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/advertisments.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/advertisments.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/advertisments.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/advertisments.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/advertisments.json From 635e8f86405f26795aae9ca9d663a016be62bd40 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:09:41 -0400 Subject: [PATCH 08/55] test --- .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/ass.json | 0 .../sayings/bacon.json | 0 .../sayings/bitch.json | 0 .../sayings/bull.json | 0 .../sayings/comcast.json | 0 .../sayings/confucius.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/dj.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/fix.json | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/ass.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/bacon.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/bitch.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/bull.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/comcast.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/confucius.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/dj.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/fix.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/ass.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/ass.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/ass.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/ass.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bacon.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bacon.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bacon.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bacon.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bitch.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bitch.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bitch.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bitch.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bull.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bull.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bull.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bull.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/comcast.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/comcast.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/comcast.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/comcast.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/confucius.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/confucius.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/confucius.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/confucius.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/dj.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/dj.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/dj.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/dj.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fix.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fix.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fix.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fix.json From c739a9511e8748c9855c6e4b83b51edacc7ea6f6 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:10:28 -0400 Subject: [PATCH 09/55] test --- .../sayings/fortune_cookie.json | 0 .../sayings/guess.json | 0 .../sayings/hacks.json | 0 .../sayings/helpbot.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json | 0 .../sayings/husband.json | 0 .../sayings/lifehacks.json | 0 .../sayings/lofl.json | 0 .../sayings/maybe.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/me.json | 0 .../sayings/moviequotes.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/no.json | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/fortune_cookie.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/guess.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/helpbot.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/husband.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/lifehacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/lofl.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/maybe.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/me.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/moviequotes.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/no.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json From 5c3f48887bbc09682f23c40789c57c46bcb06a5d Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:13:32 -0400 Subject: [PATCH 10/55] test --- .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/oaf.json | 0 .../sayings/paygrade.json | 0 .../sayings/phish.json | 0 .../sayings/relationship.json | 0 .../sayings/solution.json | 0 .../sayings/techsupport.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/til.json | 0 .../sayings/webmd.json | 0 .../sayings/world.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/yes.json | 0 .../{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/hg.json | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/oaf.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/paygrade.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/phish.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/relationship.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/solution.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/techsupport.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/til.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/webmd.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/world.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/yes.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/hg.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json From c3235caf7f4dc7a3f60067aa33ec476b21d1d4aa Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:14:28 -0400 Subject: [PATCH 11/55] test --- .../sayings/fortune_cookie.json | 0 .../sayings/guess.json | 0 .../sayings/hacks.json | 0 .../sayings/helpbot.json | 0 .../sayings/husband.json | 0 .../sayings/lifehacks.json | 0 .../sayings/lofl.json | 0 .../sayings/maybe.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/me.json | 0 .../sayings/moviequotes.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/no.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/oaf.json | 0 .../sayings/paygrade.json | 0 .../sayings/phish.json | 0 .../sayings/relationship.json | 0 .../sayings/solution.json | 0 .../sayings/techsupport.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/til.json | 0 .../sayings/webmd.json | 0 .../sayings/world.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/yes.json | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/fortune_cookie.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/guess.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/helpbot.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/husband.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/lifehacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/lofl.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/maybe.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/me.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/moviequotes.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/no.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/oaf.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/paygrade.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/phish.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/relationship.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/solution.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/techsupport.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/til.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/webmd.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/world.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/yes.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json From 494510e7dd0bfc11ab59572d1698981dcf5f789c Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:15:08 -0400 Subject: [PATCH 12/55] test --- sopel_modules/SpiceBot/Database.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 8447428..d0906fb 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -50,7 +50,7 @@ class NickValues(BASE): nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text(convert_unicode=True)) + value = Column(Text()) class ChannelValues(BASE): @@ -61,7 +61,7 @@ class ChannelValues(BASE): channel = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text(convert_unicode=True)) + value = Column(Text()) class PluginValues(BASE): @@ -72,7 +72,7 @@ class PluginValues(BASE): plugin = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text(convert_unicode=True)) + value = Column(Text()) class SpiceDB(object): From 095e0f2ba28cb080b824851bf7d0918bf995b29b Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:16:06 -0400 Subject: [PATCH 13/55] test --- .../sayings/fortune_cookie.json | 0 .../sayings/guess.json | 0 .../sayings/hacks.json | 0 .../sayings/helpbot.json | 0 .../sayings/husband.json | 0 .../sayings/lifehacks.json | 0 .../sayings/lofl.json | 0 .../sayings/maybe.json | 0 .../{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/me.json | 0 .../sayings/moviequotes.json | 0 .../{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/no.json | 0 .../{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/oaf.json | 0 .../sayings/paygrade.json | 0 .../sayings/phish.json | 0 .../sayings/relationship.json | 0 .../sayings/solution.json | 0 .../sayings/techsupport.json | 0 .../{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/til.json | 0 .../sayings/webmd.json | 0 .../sayings/world.json | 0 .../{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/yes.json | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/fortune_cookie.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/guess.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/hacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/helpbot.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/husband.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/lifehacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/lofl.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/maybe.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/me.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/moviequotes.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/no.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/oaf.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/paygrade.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/phish.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/relationship.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/solution.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/techsupport.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/til.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/webmd.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/world.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/yes.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json From f2f0bd325c079c5e4d3d6aff356823722a86f740 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:16:48 -0400 Subject: [PATCH 14/55] test --- .../sayings/fortune_cookie.json | 0 .../sayings/guess.json | 0 .../sayings/hacks.json | 0 .../sayings/helpbot.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json | 0 .../sayings/husband.json | 0 .../sayings/lifehacks.json | 0 .../sayings/lofl.json | 0 .../sayings/maybe.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/me.json | 0 .../sayings/moviequotes.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/no.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/oaf.json | 0 .../sayings/paygrade.json | 0 .../sayings/phish.json | 0 .../sayings/relationship.json | 0 .../sayings/solution.json | 0 .../sayings/techsupport.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/til.json | 0 .../sayings/uselessfacts.json | 0 .../sayings/webmd.json | 0 .../sayings/wife.json | 0 .../sayings/world.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/yes.json | 0 24 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/fortune_cookie.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/guess.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/helpbot.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/husband.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/lifehacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/lofl.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/maybe.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/me.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/moviequotes.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/no.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/oaf.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/paygrade.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/phish.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/relationship.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/solution.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/techsupport.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/til.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/uselessfacts.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/webmd.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/wife.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/world.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/yes.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json From 0c758a921806c76e2b131c5dc9b1810a8d0e3178 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:18:11 -0400 Subject: [PATCH 15/55] test --- .../sayings/fortune_cookie.json | 0 .../sayings/guess.json | 0 .../sayings/hacks.json | 0 .../sayings/helpbot.json | 0 .../{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/hg.json | 0 .../sayings/husband.json | 0 .../sayings/lifehacks.json | 0 .../sayings/lofl.json | 0 .../sayings/maybe.json | 0 .../{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/me.json | 0 .../sayings/moviequotes.json | 0 .../{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/oaf.json | 0 .../sayings/paygrade.json | 0 .../sayings/phish.json | 0 .../sayings/relationship.json | 0 .../sayings/solution.json | 0 .../sayings/techsupport.json | 0 .../{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/til.json | 0 .../sayings/uselessfacts.json | 0 .../sayings/webmd.json | 0 .../sayings/wife.json | 0 .../sayings/world.json | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/fortune_cookie.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/guess.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/hacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/helpbot.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/hg.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/husband.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/lifehacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/lofl.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/maybe.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/me.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/moviequotes.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/oaf.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/paygrade.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/phish.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/relationship.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/solution.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/techsupport.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/til.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/uselessfacts.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/webmd.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/wife.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/world.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json From c341147054a18b38d84036ba5bca96a0c5362bbf Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:20:24 -0400 Subject: [PATCH 16/55] test --- .../sayings/fortune_cookie.json | 0 .../sayings/guess.json | 0 .../sayings/hacks.json | 0 .../sayings/helpbot.json | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/fortune_cookie.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/guess.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/helpbot.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json From 78ea281534c19b3d089d1dc71d22a5fcd1ca6ceb Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:21:11 -0400 Subject: [PATCH 17/55] test --- .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json | 0 .../sayings/husband.json | 0 .../sayings/lifehacks.json | 0 .../sayings/lofl.json | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/husband.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/lifehacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/lofl.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json From 3c79d8897c874e7cdbbb21015b738b1a10aaf9b7 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:22:32 -0400 Subject: [PATCH 18/55] test --- .../sayings/maybe.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/me.json | 0 .../sayings/moviequotes.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/oaf.json | 0 .../sayings/paygrade.json | 0 .../sayings/phish.json | 0 .../sayings/relationship.json | 0 .../sayings/solution.json | 0 .../sayings/techsupport.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/til.json | 0 .../sayings/uselessfacts.json | 0 .../sayings/webmd.json | 0 .../sayings/wife.json | 0 .../sayings/world.json | 0 .../sayings/hacks.json | 0 .../sayings/helpbot.json | 0 .../sayings/husband.json | 0 .../sayings/lifehacks.json | 0 .../sayings/lofl.json | 0 19 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/maybe.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/me.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/moviequotes.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/oaf.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/paygrade.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/phish.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/relationship.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/solution.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/techsupport.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/til.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/uselessfacts.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/webmd.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/wife.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/world.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/hacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/helpbot.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/husband.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/lifehacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/lofl.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json From 226780828f5c30793e2a61ad36438ccef1c479dd Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:23:51 -0400 Subject: [PATCH 19/55] test --- sopel_modules/SpiceBot/Database.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index d0906fb..0754286 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -12,7 +12,7 @@ from sopel.db import SopelDB, _deserialize from .Config import config as botconfig from sqlalchemy.engine.url import URL -from sqlalchemy import create_engine, Column, String, ForeignKey, Integer, Text +from sqlalchemy import create_engine, Column, String, ForeignKey, Integer, Unicode from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.exc import SQLAlchemyError @@ -50,7 +50,7 @@ class NickValues(BASE): nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Unicode()) class ChannelValues(BASE): @@ -61,7 +61,7 @@ class ChannelValues(BASE): channel = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Unicode()) class PluginValues(BASE): @@ -72,7 +72,7 @@ class PluginValues(BASE): plugin = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Unicode()) class SpiceDB(object): From 4ea9399a46d506702cb0ce28dd0c56de8b28fa0d Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:24:59 -0400 Subject: [PATCH 20/55] test --- sopel_modules/SpiceBot/Database.py | 8 ++++---- .../sayings/moviequotes.json | 0 .../sayings/oaf.json | 0 .../sayings/paygrade.json | 0 .../sayings/phish.json | 0 .../sayings/relationship.json | 0 .../sayings/solution.json | 0 .../sayings/techsupport.json | 0 .../sayings/til.json | 0 .../sayings/uselessfacts.json | 0 .../sayings/webmd.json | 0 .../sayings/wife.json | 0 .../sayings/world.json | 0 13 files changed, 4 insertions(+), 4 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/moviequotes.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/oaf.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/paygrade.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/phish.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/relationship.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/solution.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/techsupport.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/til.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/uselessfacts.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/webmd.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/wife.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/world.json (100%) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 0754286..d0906fb 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -12,7 +12,7 @@ from sopel.db import SopelDB, _deserialize from .Config import config as botconfig from sqlalchemy.engine.url import URL -from sqlalchemy import create_engine, Column, String, ForeignKey, Integer, Unicode +from sqlalchemy import create_engine, Column, String, ForeignKey, Integer, Text from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.exc import SQLAlchemyError @@ -50,7 +50,7 @@ class NickValues(BASE): nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Unicode()) + value = Column(Text()) class ChannelValues(BASE): @@ -61,7 +61,7 @@ class ChannelValues(BASE): channel = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Unicode()) + value = Column(Text()) class PluginValues(BASE): @@ -72,7 +72,7 @@ class PluginValues(BASE): plugin = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Unicode()) + value = Column(Text()) class SpiceDB(object): diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json From f0ab7e43ec05e8b2b3742c654270122ba6c722ea Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Mon, 1 Jul 2019 16:26:30 -0400 Subject: [PATCH 21/55] test --- sopel_modules/SpiceBot/Database.py | 8 ++++---- .../sayings/advertisments.json | 0 .../sayings/ass.json | 0 .../sayings/bacon.json | 0 .../sayings/bitch.json | 0 .../sayings/bull.json | 0 .../sayings/comcast.json | 0 .../sayings/confucius.json | 0 .../sayings/dj.json | 0 .../sayings/fix.json | 0 .../sayings/fortune_cookie.json | 0 .../sayings/guess.json | 0 .../sayings/hg.json | 0 .../sayings/maybe.json | 0 .../sayings/me.json | 0 .../sayings/no.json | 0 .../sayings/yes.json | 0 17 files changed, 4 insertions(+), 4 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/advertisments.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/ass.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/bacon.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/bitch.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/bull.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/comcast.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/confucius.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/dj.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/fix.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/fortune_cookie.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/guess.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/hg.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/maybe.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/me.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/no.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/yes.json (100%) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index d0906fb..0754286 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -12,7 +12,7 @@ from sopel.db import SopelDB, _deserialize from .Config import config as botconfig from sqlalchemy.engine.url import URL -from sqlalchemy import create_engine, Column, String, ForeignKey, Integer, Text +from sqlalchemy import create_engine, Column, String, ForeignKey, Integer, Unicode from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.exc import SQLAlchemyError @@ -50,7 +50,7 @@ class NickValues(BASE): nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Unicode()) class ChannelValues(BASE): @@ -61,7 +61,7 @@ class ChannelValues(BASE): channel = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Unicode()) class PluginValues(BASE): @@ -72,7 +72,7 @@ class PluginValues(BASE): plugin = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Unicode()) class SpiceDB(object): diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/advertisments.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/advertisments.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/advertisments.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/advertisments.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/ass.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/ass.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/ass.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/ass.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bacon.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bacon.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bacon.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bacon.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bitch.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bitch.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bitch.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bitch.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bull.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bull.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bull.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bull.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/comcast.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/comcast.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/comcast.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/comcast.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/confucius.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/confucius.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/confucius.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/confucius.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/dj.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/dj.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/dj.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/dj.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fix.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fix.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fix.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fix.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json From 7e67fc6301e2552b3e49baa4fb8caca8cc8d3c1e Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:01:31 -0400 Subject: [PATCH 22/55] test --- .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/no.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/yes.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/no.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/yes.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/no.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/no.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/yes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/yes.json From 18f663467698560ce76582e8e68757ffd4593fa5 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:02:33 -0400 Subject: [PATCH 23/55] test --- .../sayings/advertisments.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/ass.json | 0 .../sayings/bacon.json | 0 .../sayings/bitch.json | 0 .../sayings/bull.json | 0 .../sayings/comcast.json | 0 .../sayings/confucius.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/dj.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/fix.json | 0 .../sayings/fortune_cookie.json | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/advertisments.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/ass.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/bacon.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/bitch.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/bull.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/comcast.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/confucius.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/dj.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/fix.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/fortune_cookie.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/advertisments.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/advertisments.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/advertisments.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/advertisments.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/ass.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/ass.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/ass.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/ass.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bacon.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bacon.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bacon.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bacon.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bitch.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bitch.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bitch.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bitch.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bull.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bull.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/bull.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/bull.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/comcast.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/comcast.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/comcast.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/comcast.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/confucius.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/confucius.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/confucius.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/confucius.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/dj.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/dj.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/dj.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/dj.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fix.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fix.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fix.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fix.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/fortune_cookie.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/fortune_cookie.json From cb0f0e1664c22ffbcb62556f84f29ed2b1186165 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:03:29 -0400 Subject: [PATCH 24/55] rest --- .../sayings/guess.json | 0 .../sayings/hacks.json | 0 .../sayings/helpbot.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json | 0 .../sayings/husband.json | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/guess.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/helpbot.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/husband.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/guess.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/guess.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/helpbot.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/helpbot.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json From ce42523b6b1d93f14945ac1e15072d4170f6aa84 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:04:18 -0400 Subject: [PATCH 25/55] test --- .../sayings/husband.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/husband.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json From cbc2dc54379c667e4f7e2c84179403fd32225d2a Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:05:13 -0400 Subject: [PATCH 26/55] test --- .../{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/hg.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/hg.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json From 04d2adb6d03d43cd07b3a95c62e879fb7087497b Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:05:57 -0400 Subject: [PATCH 27/55] test --- .../sayings/husband.json | 0 .../sayings/lifehacks.json | 0 .../sayings/lofl.json | 0 .../sayings/maybe.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/me.json | 0 .../sayings/moviequotes.json | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/husband.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/lifehacks.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/lofl.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/maybe.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/me.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/moviequotes.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/husband.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/husband.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lifehacks.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lifehacks.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/lofl.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/lofl.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/maybe.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/maybe.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/me.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/me.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/moviequotes.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/moviequotes.json From bd73f507aab1871df687f0f949f5f3806bb20bd4 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:06:49 -0400 Subject: [PATCH 28/55] etst --- .../sayings/paygrade.json | 0 .../sayings/phish.json | 0 .../sayings/relationship.json | 0 .../sayings/solution.json | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/paygrade.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/phish.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/relationship.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/solution.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/paygrade.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/paygrade.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/phish.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/phish.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/relationship.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/relationship.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/solution.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/solution.json From 3287341bf8de3f528450277a0ea03024efa570e5 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:17:26 -0400 Subject: [PATCH 29/55] test --- .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/oaf.json | 0 .../sayings/techsupport.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/til.json | 0 .../sayings/uselessfacts.json | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/oaf.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/techsupport.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/til.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/uselessfacts.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/oaf.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/oaf.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json From de43cb306da5b845c0411bf5b9360d2cee5a2306 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:18:26 -0400 Subject: [PATCH 30/55] test --- .../sayings/uselessfacts.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/uselessfacts.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json From 6d8ff2750db7e6cfd4a17e9071ec8d9a24c9e25f Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:19:10 -0400 Subject: [PATCH 31/55] test --- .../sayings/webmd.json | 0 .../sayings/wife.json | 0 .../sayings/world.json | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/webmd.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/wife.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/world.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json From 7cd26a46cbffc1061b5d519e173e547351e30f84 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:20:04 -0400 Subject: [PATCH 32/55] test --- .../sayings/wife.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/wife.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json From 0410a541dd9659ccc81647ffc49b1b7824368053 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:20:56 -0400 Subject: [PATCH 33/55] test --- .../sayings/techsupport.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/techsupport.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json From 08fda566f11d6674877bb66f9729c8ac5ef2b2bd Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:21:54 -0400 Subject: [PATCH 34/55] test --- .../{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/til.json | 0 .../sayings/webmd.json | 0 .../sayings/world.json | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/til.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/webmd.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/world.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json From 7d129092ff68c640b2d78746499c2c6be7c7ad8e Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:23:49 -0400 Subject: [PATCH 35/55] test --- .../sayings/uselessfacts.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/uselessfacts.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json From b5ef62254b93fcb2ccac249f5dc46f249fc5b1cf Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:24:32 -0400 Subject: [PATCH 36/55] revert --- .../sayings/uselessfacts.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/uselessfacts.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json From 99b7e547e3ad04883600af2535e319ee90ea336c Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:37:19 -0400 Subject: [PATCH 37/55] columns --- sopel_modules/SpiceBot/Database.py | 46 +----------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 0754286..88a05b7 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -11,14 +11,12 @@ from sopel.db import SopelDB, _deserialize from .Config import config as botconfig -from sqlalchemy.engine.url import URL -from sqlalchemy import create_engine, Column, String, ForeignKey, Integer, Unicode +from sqlalchemy import Column, String, ForeignKey, Integer, Unicode from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.exc import SQLAlchemyError import json import threading -import os BASE = declarative_base() @@ -533,48 +531,6 @@ class BotDatabase(): def __init__(self): - db_type = botconfig.core.db_type - - if db_type == 'sqlite': - path = botconfig.core.db_filename - config_dir, config_file = os.path.split(botconfig.filename) - config_name, _ = os.path.splitext(config_file) - if path is None: - path = os.path.join(config_dir, config_name + '.db') - path = os.path.expanduser(path) - if not os.path.isabs(path): - path = os.path.normpath(os.path.join(config_dir, path)) - SopelDB.filename = path - SopelDB.url = 'sqlite:///%s' % path - # Otherwise, handle all other database engines - else: - - if db_type == 'mysql': - drivername = botconfig.core.db_driver or 'mysql' - elif db_type == 'postgres': - drivername = botconfig.core.db_driver or 'postgresql' - elif db_type == 'oracle': - drivername = botconfig.core.db_driver or 'oracle' - elif db_type == 'mssql': - drivername = botconfig.core.db_driver or 'mssql+pymssql' - elif db_type == 'firebird': - drivername = botconfig.core.db_driver or 'firebird+fdb' - elif db_type == 'sybase': - drivername = botconfig.core.db_driver or 'sybase+pysybase' - else: - raise Exception('Unknown db_type') - - db_user = botconfig.core.db_user - db_pass = botconfig.core.db_pass - db_host = botconfig.core.db_host - db_port = botconfig.core.db_port # Optional - db_name = botconfig.core.db_name # Optional, depending on DB - - SopelDB.url = URL(drivername=drivername, username=db_user, password=db_pass, - host=db_host, port=db_port, database=db_name, query={'charset': 'utf8'}) - - SopelDB.engine = create_engine(SopelDB.url, encoding='utf-8', convert_unicode=True) - SopelDB.nick_id_lock = threading.Lock() sopel.db.NickIDs = NickIDs From f786146e19da58cc76ad234f154841765a125fd5 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:44:28 -0400 Subject: [PATCH 38/55] Text --- sopel_modules/SpiceBot/Database.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 88a05b7..1ccbb63 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -11,7 +11,7 @@ from sopel.db import SopelDB, _deserialize from .Config import config as botconfig -from sqlalchemy import Column, String, ForeignKey, Integer, Unicode +from sqlalchemy import Column, String, ForeignKey, Integer, Text from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.exc import SQLAlchemyError @@ -48,7 +48,7 @@ class NickValues(BASE): nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Unicode()) + value = Column(Text(convert_unicode=True)) class ChannelValues(BASE): @@ -59,7 +59,7 @@ class ChannelValues(BASE): channel = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Unicode()) + value = Column(Text(convert_unicode=True)) class PluginValues(BASE): @@ -70,7 +70,7 @@ class PluginValues(BASE): plugin = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Unicode()) + value = Column(Text(convert_unicode=True)) class SpiceDB(object): From e1b3b03483a426d14b9b835ee3e3a50aa5fbfe44 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:45:46 -0400 Subject: [PATCH 39/55] test --- .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json From 6f3fdb3850f122dbfc69c709cb59102aadd8e850 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:47:59 -0400 Subject: [PATCH 40/55] hmmm --- sopel_modules/SpiceBot/Database.py | 6 +++--- .../sayings/hg.json | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/hg.json (100%) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index 1ccbb63..ece7cd0 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -48,7 +48,7 @@ class NickValues(BASE): nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text(convert_unicode=True)) + value = Column(Text()) class ChannelValues(BASE): @@ -59,7 +59,7 @@ class ChannelValues(BASE): channel = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text(convert_unicode=True)) + value = Column(Text()) class PluginValues(BASE): @@ -70,7 +70,7 @@ class PluginValues(BASE): plugin = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text(convert_unicode=True)) + value = Column(Text()) class SpiceDB(object): diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json From 349f50ca284633f41518e20b9b28add243b6a94e Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:49:13 -0400 Subject: [PATCH 41/55] change type --- sopel_modules/SpiceBot/Database.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index ece7cd0..b5259fe 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -36,8 +36,8 @@ class Nicknames(BASE): """ __tablename__ = 'spice_nicknames' nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) - slug = Column(String(255), primary_key=True) - canonical = Column(String(255)) + slug = Column(Text(), primary_key=True) + canonical = Column(Text()) class NickValues(BASE): @@ -46,8 +46,8 @@ class NickValues(BASE): """ __tablename__ = 'spice_nick_values' nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) - namespace = Column(String(255), primary_key=True) - key = Column(String(255), primary_key=True) + namespace = Column(Text(), primary_key=True) + key = Column(Text(), primary_key=True) value = Column(Text()) @@ -56,9 +56,9 @@ class ChannelValues(BASE): ChannelValues SQLAlchemy Class """ __tablename__ = 'spice_channel_values' - channel = Column(String(255), primary_key=True) - namespace = Column(String(255), primary_key=True) - key = Column(String(255), primary_key=True) + channel = Column(Text(), primary_key=True) + namespace = Column(Text(), primary_key=True) + key = Column(Text(), primary_key=True) value = Column(Text()) @@ -67,9 +67,9 @@ class PluginValues(BASE): PluginValues SQLAlchemy Class """ __tablename__ = 'spice_plugin_values' - plugin = Column(String(255), primary_key=True) - namespace = Column(String(255), primary_key=True) - key = Column(String(255), primary_key=True) + plugin = Column(Text(), primary_key=True) + namespace = Column(Text(), primary_key=True) + key = Column(Text(), primary_key=True) value = Column(Text()) From d41d3e9e7a5bb97983fc2d78d4cad3d5d0a25937 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:50:13 -0400 Subject: [PATCH 42/55] test --- sopel_modules/SpiceBot/Database.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index b5259fe..ece7cd0 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -36,8 +36,8 @@ class Nicknames(BASE): """ __tablename__ = 'spice_nicknames' nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) - slug = Column(Text(), primary_key=True) - canonical = Column(Text()) + slug = Column(String(255), primary_key=True) + canonical = Column(String(255)) class NickValues(BASE): @@ -46,8 +46,8 @@ class NickValues(BASE): """ __tablename__ = 'spice_nick_values' nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) - namespace = Column(Text(), primary_key=True) - key = Column(Text(), primary_key=True) + namespace = Column(String(255), primary_key=True) + key = Column(String(255), primary_key=True) value = Column(Text()) @@ -56,9 +56,9 @@ class ChannelValues(BASE): ChannelValues SQLAlchemy Class """ __tablename__ = 'spice_channel_values' - channel = Column(Text(), primary_key=True) - namespace = Column(Text(), primary_key=True) - key = Column(Text(), primary_key=True) + channel = Column(String(255), primary_key=True) + namespace = Column(String(255), primary_key=True) + key = Column(String(255), primary_key=True) value = Column(Text()) @@ -67,9 +67,9 @@ class PluginValues(BASE): PluginValues SQLAlchemy Class """ __tablename__ = 'spice_plugin_values' - plugin = Column(Text(), primary_key=True) - namespace = Column(Text(), primary_key=True) - key = Column(Text(), primary_key=True) + plugin = Column(String(255), primary_key=True) + namespace = Column(String(255), primary_key=True) + key = Column(String(255), primary_key=True) value = Column(Text()) From 943808cbf184be3c9bdadc69c3906c8e1f0d3c15 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:55:08 -0400 Subject: [PATCH 43/55] test --- .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json From b735a668a1a18d66bb5c3d78fa5145a2aad58253 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 11:55:48 -0400 Subject: [PATCH 44/55] crap --- .../{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/hg.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs => SpiceBot_DictComs_old}/sayings/hg.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json From ac78965c9315e7fa4d811a941acaff0dc761d481 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 13:51:20 -0400 Subject: [PATCH 45/55] revert for testing Rustb code --- sopel_modules/SpiceBot/Database.py | 46 +++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index ece7cd0..a91b4fc 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -11,12 +11,14 @@ from sopel.db import SopelDB, _deserialize from .Config import config as botconfig -from sqlalchemy import Column, String, ForeignKey, Integer, Text +from sqlalchemy.engine.url import URL +from sqlalchemy import create_engine, Column, String, ForeignKey, Integer, Text from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.exc import SQLAlchemyError import json import threading +import os BASE = declarative_base() @@ -531,6 +533,48 @@ class BotDatabase(): def __init__(self): + db_type = botconfig.core.db_type + + if db_type == 'sqlite': + path = botconfig.core.db_filename + config_dir, config_file = os.path.split(botconfig.filename) + config_name, _ = os.path.splitext(config_file) + if path is None: + path = os.path.join(config_dir, config_name + '.db') + path = os.path.expanduser(path) + if not os.path.isabs(path): + path = os.path.normpath(os.path.join(config_dir, path)) + SopelDB.filename = path + SopelDB.url = 'sqlite:///%s' % path + # Otherwise, handle all other database engines + else: + + if db_type == 'mysql': + drivername = botconfig.core.db_driver or 'mysql' + elif db_type == 'postgres': + drivername = botconfig.core.db_driver or 'postgresql' + elif db_type == 'oracle': + drivername = botconfig.core.db_driver or 'oracle' + elif db_type == 'mssql': + drivername = botconfig.core.db_driver or 'mssql+pymssql' + elif db_type == 'firebird': + drivername = botconfig.core.db_driver or 'firebird+fdb' + elif db_type == 'sybase': + drivername = botconfig.core.db_driver or 'sybase+pysybase' + else: + raise Exception('Unknown db_type') + + db_user = botconfig.core.db_user + db_pass = botconfig.core.db_pass + db_host = botconfig.core.db_host + db_port = botconfig.core.db_port # Optional + db_name = botconfig.core.db_name # Optional, depending on DB + + SopelDB.url = URL(drivername=drivername, username=db_user, password=db_pass, + host=db_host, port=db_port, database=db_name) + + SopelDB.engine = create_engine(SopelDB.url) + SopelDB.nick_id_lock = threading.Lock() sopel.db.NickIDs = NickIDs From c858a3445fc2d2aad994b859f9b31a2f3ed475e4 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 14:31:59 -0400 Subject: [PATCH 46/55] colation test --- sopel_modules/SpiceBot/Database.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index a91b4fc..ed994dd 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -50,7 +50,7 @@ class NickValues(BASE): nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Text(collation='utf8mb4_bin')) class ChannelValues(BASE): @@ -61,7 +61,7 @@ class ChannelValues(BASE): channel = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Text(collation='utf8mb4_bin')) class PluginValues(BASE): @@ -72,7 +72,7 @@ class PluginValues(BASE): plugin = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text()) + value = Column(Text(collation='utf8mb4_bin')) class SpiceDB(object): @@ -571,7 +571,7 @@ class BotDatabase(): db_name = botconfig.core.db_name # Optional, depending on DB SopelDB.url = URL(drivername=drivername, username=db_user, password=db_pass, - host=db_host, port=db_port, database=db_name) + host=db_host, port=db_port, database=db_name, query={'charset': 'utf8mb4'}) SopelDB.engine = create_engine(SopelDB.url) From 35539897084c773e5071bc7e9396d3d6c79b9a5a Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 14:43:34 -0400 Subject: [PATCH 47/55] test --- .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/hg.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/hg.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/hg.json From acb092e962919540d45d006daf4ab49c55141c7b Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 14:46:16 -0400 Subject: [PATCH 48/55] hmmmm --- sopel_modules/SpiceBot/Database.py | 46 +----------------------------- 1 file changed, 1 insertion(+), 45 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index ed994dd..a2af25f 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -11,14 +11,12 @@ from sopel.db import SopelDB, _deserialize from .Config import config as botconfig -from sqlalchemy.engine.url import URL -from sqlalchemy import create_engine, Column, String, ForeignKey, Integer, Text +from sqlalchemy import Column, String, ForeignKey, Integer, Text from sqlalchemy.ext.declarative import declarative_base from sqlalchemy.exc import SQLAlchemyError import json import threading -import os BASE = declarative_base() @@ -533,48 +531,6 @@ class BotDatabase(): def __init__(self): - db_type = botconfig.core.db_type - - if db_type == 'sqlite': - path = botconfig.core.db_filename - config_dir, config_file = os.path.split(botconfig.filename) - config_name, _ = os.path.splitext(config_file) - if path is None: - path = os.path.join(config_dir, config_name + '.db') - path = os.path.expanduser(path) - if not os.path.isabs(path): - path = os.path.normpath(os.path.join(config_dir, path)) - SopelDB.filename = path - SopelDB.url = 'sqlite:///%s' % path - # Otherwise, handle all other database engines - else: - - if db_type == 'mysql': - drivername = botconfig.core.db_driver or 'mysql' - elif db_type == 'postgres': - drivername = botconfig.core.db_driver or 'postgresql' - elif db_type == 'oracle': - drivername = botconfig.core.db_driver or 'oracle' - elif db_type == 'mssql': - drivername = botconfig.core.db_driver or 'mssql+pymssql' - elif db_type == 'firebird': - drivername = botconfig.core.db_driver or 'firebird+fdb' - elif db_type == 'sybase': - drivername = botconfig.core.db_driver or 'sybase+pysybase' - else: - raise Exception('Unknown db_type') - - db_user = botconfig.core.db_user - db_pass = botconfig.core.db_pass - db_host = botconfig.core.db_host - db_port = botconfig.core.db_port # Optional - db_name = botconfig.core.db_name # Optional, depending on DB - - SopelDB.url = URL(drivername=drivername, username=db_user, password=db_pass, - host=db_host, port=db_port, database=db_name, query={'charset': 'utf8mb4'}) - - SopelDB.engine = create_engine(SopelDB.url) - SopelDB.nick_id_lock = threading.Lock() sopel.db.NickIDs = NickIDs From 0f8313cc484634d1bea823404f4bec36ce37ac29 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Tue, 2 Jul 2019 14:52:12 -0400 Subject: [PATCH 49/55] test --- .../sayings/techsupport.json | 0 .../{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/til.json | 0 .../sayings/uselessfacts.json | 0 .../sayings/webmd.json | 0 .../sayings/wife.json | 0 .../sayings/world.json | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/techsupport.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/til.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/uselessfacts.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/webmd.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/wife.json (100%) rename sopel_modules/SpiceBot_Configs/{SpiceBot_DictComs_old => SpiceBot_DictComs}/sayings/world.json (100%) diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/techsupport.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/techsupport.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/til.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/til.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/uselessfacts.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/uselessfacts.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/webmd.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/webmd.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/wife.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/wife.json diff --git a/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json b/sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json similarity index 100% rename from sopel_modules/SpiceBot_Configs/SpiceBot_DictComs_old/sayings/world.json rename to sopel_modules/SpiceBot_Configs/SpiceBot_DictComs/sayings/world.json From c685a8ae8e5a65381b27318d212e73faf7db947a Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 3 Jul 2019 08:12:10 -0400 Subject: [PATCH 50/55] table args test --- sopel_modules/SpiceBot/Database.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index a2af25f..8d667f6 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -35,6 +35,7 @@ class Nicknames(BASE): Nicknames SQLAlchemy Class """ __tablename__ = 'spice_nicknames' + __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8mb4', 'mysql_collate': 'utf8mb4_unicode_ci'} nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) slug = Column(String(255), primary_key=True) canonical = Column(String(255)) @@ -45,10 +46,11 @@ class NickValues(BASE): NickValues SQLAlchemy Class """ __tablename__ = 'spice_nick_values' + __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8mb4', 'mysql_collate': 'utf8mb4_unicode_ci'} nick_id = Column(Integer, ForeignKey('spice_nick_ids.nick_id'), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text(collation='utf8mb4_bin')) + value = Column(Text()) class ChannelValues(BASE): @@ -56,10 +58,11 @@ class ChannelValues(BASE): ChannelValues SQLAlchemy Class """ __tablename__ = 'spice_channel_values' + __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8mb4', 'mysql_collate': 'utf8mb4_unicode_ci'} channel = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text(collation='utf8mb4_bin')) + value = Column(Text()) class PluginValues(BASE): @@ -67,10 +70,11 @@ class PluginValues(BASE): PluginValues SQLAlchemy Class """ __tablename__ = 'spice_plugin_values' + __table_args__ = {'mysql_engine': 'InnoDB', 'mysql_charset': 'utf8mb4', 'mysql_collate': 'utf8mb4_unicode_ci'} plugin = Column(String(255), primary_key=True) namespace = Column(String(255), primary_key=True) key = Column(String(255), primary_key=True) - value = Column(Text(collation='utf8mb4_bin')) + value = Column(Text()) class SpiceDB(object): From 4b5215a35eb9e29a6babd1c3a5ae90aaaa4fa383 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 3 Jul 2019 08:42:10 -0400 Subject: [PATCH 51/55] init lint ignores --- sopel_modules/SpiceBot/__init__.py | 1 + sopel_modules/SpiceBot_Core_Commands/__init__.py | 1 + sopel_modules/SpiceBot_Core_Processing/__init__.py | 1 + sopel_modules/SpiceBot_SopelPatches/__init__.py | 1 + 4 files changed, 4 insertions(+) diff --git a/sopel_modules/SpiceBot/__init__.py b/sopel_modules/SpiceBot/__init__.py index 4b94555..7826238 100644 --- a/sopel_modules/SpiceBot/__init__.py +++ b/sopel_modules/SpiceBot/__init__.py @@ -5,6 +5,7 @@ These are the core SpiceBot Classes This module contains references only for other modules to utilize. """ +# pylama:ignore=W0401,W0611 from .Config import * from .Logs import * diff --git a/sopel_modules/SpiceBot_Core_Commands/__init__.py b/sopel_modules/SpiceBot_Core_Commands/__init__.py index 468cf8b..128d453 100644 --- a/sopel_modules/SpiceBot_Core_Commands/__init__.py +++ b/sopel_modules/SpiceBot_Core_Commands/__init__.py @@ -5,6 +5,7 @@ These are the core SpiceBot Classes This module contains references only for other modules to utilize. """ +# pylama:ignore=W0401,W0611 from .CommandsQuery import * from .Commands import * diff --git a/sopel_modules/SpiceBot_Core_Processing/__init__.py b/sopel_modules/SpiceBot_Core_Processing/__init__.py index 95788bd..ed8f775 100644 --- a/sopel_modules/SpiceBot_Core_Processing/__init__.py +++ b/sopel_modules/SpiceBot_Core_Processing/__init__.py @@ -5,6 +5,7 @@ These are the core SpiceBot Classes This module contains references only for other modules to utilize. """ +# pylama:ignore=W0401,W0611 from .Channels import * from .Users import * diff --git a/sopel_modules/SpiceBot_SopelPatches/__init__.py b/sopel_modules/SpiceBot_SopelPatches/__init__.py index 0232bc1..076aae5 100644 --- a/sopel_modules/SpiceBot_SopelPatches/__init__.py +++ b/sopel_modules/SpiceBot_SopelPatches/__init__.py @@ -1,5 +1,6 @@ # coding=utf8 from __future__ import unicode_literals, absolute_import, division, print_function +# pylama:ignore=W0401,W0611 from .Patches import * From 4b0343e5defcd517c003da41b5a0fc6f649ea347 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 3 Jul 2019 09:12:37 -0400 Subject: [PATCH 52/55] wait til the bot is loaded --- sopel_modules/SpiceBot_Core_Commands/AI.py | 2 ++ sopel_modules/SpiceBot_Core_Commands/BotPrivs.py | 2 ++ .../SpiceBot_Core_Commands/CommandsQuery.py | 2 ++ sopel_modules/SpiceBot_Core_Commands/Database.py | 1 + sopel_modules/SpiceBot_Core_Commands/DictComs.py | 1 + sopel_modules/SpiceBot_Core_Commands/Docs.py | 13 ++++++++----- sopel_modules/SpiceBot_Core_Commands/Gif.py | 1 + sopel_modules/SpiceBot_Core_Commands/Messaging.py | 3 +++ sopel_modules/SpiceBot_Core_Commands/Reddit.py | 9 ++++++++- .../SpiceBot_Core_Commands/Runtime_Controls.py | 2 ++ sopel_modules/SpiceBot_Core_Commands/Search.py | 3 +++ sopel_modules/SpiceBot_Core_Commands/Sherlock.py | 1 + sopel_modules/SpiceBot_Core_Commands/Uptime.py | 1 + sopel_modules/SpiceBot_Core_Commands/Users.py | 1 + 14 files changed, 36 insertions(+), 6 deletions(-) diff --git a/sopel_modules/SpiceBot_Core_Commands/AI.py b/sopel_modules/SpiceBot_Core_Commands/AI.py index 98b6fce..3ccbe20 100644 --- a/sopel_modules/SpiceBot_Core_Commands/AI.py +++ b/sopel_modules/SpiceBot_Core_Commands/AI.py @@ -9,6 +9,7 @@ import sopel_modules.SpiceBot as SpiceBot import spicemanip +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('ai') def ai_trigger(bot, trigger, botcom): @@ -18,6 +19,7 @@ def ai_trigger(bot, trigger, botcom): bot.osd(displayval) +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @sopel.module.rule('(.*)') def bot_command_rule_ai(bot, trigger): diff --git a/sopel_modules/SpiceBot_Core_Commands/BotPrivs.py b/sopel_modules/SpiceBot_Core_Commands/BotPrivs.py index be1b25f..7633451 100644 --- a/sopel_modules/SpiceBot_Core_Commands/BotPrivs.py +++ b/sopel_modules/SpiceBot_Core_Commands/BotPrivs.py @@ -9,12 +9,14 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('owners', 'owner') def bot_command_owners(bot, trigger, botcom): bot_command_process(bot, trigger) +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('admins', 'admin') def bot_command_admins(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/CommandsQuery.py b/sopel_modules/SpiceBot_Core_Commands/CommandsQuery.py index 2732765..150d5e6 100644 --- a/sopel_modules/SpiceBot_Core_Commands/CommandsQuery.py +++ b/sopel_modules/SpiceBot_Core_Commands/CommandsQuery.py @@ -12,12 +12,14 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('query') def query_trigger(bot, trigger, botcom): bot.osd("I have been programmed to help find new commands by using `?`.") +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.events.check_ready([SpiceBot.events.BOT_COMMANDS]) @SpiceBot.prerun_query('nickname', 'nickname') @sopel.module.nickname_commands('(.*)') diff --git a/sopel_modules/SpiceBot_Core_Commands/Database.py b/sopel_modules/SpiceBot_Core_Commands/Database.py index c4773a5..7b3f019 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Database.py +++ b/sopel_modules/SpiceBot_Core_Commands/Database.py @@ -10,6 +10,7 @@ import sopel.module import sopel_modules.SpiceBot as SpiceBot +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @sopel.module.nickname_commands('database') def bot_command_database(bot, trigger): bot.osd("Database is " + SpiceBot.config.db_type) diff --git a/sopel_modules/SpiceBot_Core_Commands/DictComs.py b/sopel_modules/SpiceBot_Core_Commands/DictComs.py index 61a06b0..98e3932 100644 --- a/sopel_modules/SpiceBot_Core_Commands/DictComs.py +++ b/sopel_modules/SpiceBot_Core_Commands/DictComs.py @@ -15,6 +15,7 @@ from word2number import w2n from random import randint +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('module', 'dictcom') @sopel.module.commands('(.*)') def command_dictcom(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Docs.py b/sopel_modules/SpiceBot_Core_Commands/Docs.py index 8895123..f1d74b4 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Docs.py +++ b/sopel_modules/SpiceBot_Core_Commands/Docs.py @@ -7,10 +7,13 @@ import sopel.module import sopel_modules.SpiceBot as SpiceBot +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @sopel.module.nickname_commands('help', 'docs', 'wiki') def bot_command_docs(bot, trigger): - bot.osd(["IRC Modules Repository", - str(SpiceBot.github_dict["url_main"] + - SpiceBot.github_dict["repo_owner"] + "/" + - SpiceBot.github_dict["repo_name"] + - SpiceBot.github_dict["url_path_wiki"])]) + sb_git_url = str( + SpiceBot.github_dict["url_main"] + + SpiceBot.github_dict["repo_owner"] + "/" + + SpiceBot.github_dict["repo_name"] + + SpiceBot.github_dict["url_path_wiki"] + ) + bot.osd(["IRC Modules Repository", sb_git_url]) diff --git a/sopel_modules/SpiceBot_Core_Commands/Gif.py b/sopel_modules/SpiceBot_Core_Commands/Gif.py index c2406c5..9abecb2 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Gif.py +++ b/sopel_modules/SpiceBot_Core_Commands/Gif.py @@ -11,6 +11,7 @@ import spicemanip # TODO custom gif shortcut commands +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('module') @sopel.module.commands('gif') def gif_trigger(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Messaging.py b/sopel_modules/SpiceBot_Core_Commands/Messaging.py index ce1b295..f9b962f 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Messaging.py +++ b/sopel_modules/SpiceBot_Core_Commands/Messaging.py @@ -9,18 +9,21 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('action') def bot_command_action(bot, trigger, botcom): bot_command_process(bot, trigger) +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('notice') def bot_command_notice(bot, trigger, botcom): bot_command_process(bot, trigger) +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('privmsg', 'say', 'msg') def bot_command_privmsg(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Reddit.py b/sopel_modules/SpiceBot_Core_Commands/Reddit.py index 785e2b5..9e91aec 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Reddit.py +++ b/sopel_modules/SpiceBot_Core_Commands/Reddit.py @@ -7,16 +7,23 @@ import sopel.module import sopel_modules.SpiceBot as SpiceBot +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @sopel.module.rule(r"""(?:)u/ ( (?:\\/ | [^/])+ ) """) +def bot_command_reddit_user(bot, trigger): + message = SpiceBot.reddit.prerun(trigger) + bot.osd(message) + + +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @sopel.module.rule(r"""(?:)r/ ( (?:\\/ | [^/])+ ) """) -def bot_command_reddit_syntax(bot, trigger): +def bot_command_reddit_subreddit(bot, trigger): message = SpiceBot.reddit.prerun(trigger) bot.osd(message) diff --git a/sopel_modules/SpiceBot_Core_Commands/Runtime_Controls.py b/sopel_modules/SpiceBot_Core_Commands/Runtime_Controls.py index 84b96fe..f7883e4 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Runtime_Controls.py +++ b/sopel_modules/SpiceBot_Core_Commands/Runtime_Controls.py @@ -9,6 +9,7 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('update') def nickname_comand_update(bot, trigger, botcom): @@ -41,6 +42,7 @@ def nickname_comand_update(bot, trigger, botcom): SpiceBot.spicebot_reload(bot, 'SpiceBot_Update', quitmessage) +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('restart') def nickname_comand_restart(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Search.py b/sopel_modules/SpiceBot_Core_Commands/Search.py index d0375f6..efed214 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Search.py +++ b/sopel_modules/SpiceBot_Core_Commands/Search.py @@ -10,6 +10,7 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('module') @sopel.module.commands('search', 'find', 'google', 'lookup') def search_main(bot, trigger, botcom): @@ -26,6 +27,7 @@ def search_main(bot, trigger, botcom): bot.osd(["[Information search for '" + str(searchterm) + "']", str(searchreturn)]) +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('module') @sopel.module.commands("where", "whereis") def search_where(bot, trigger, botcom): @@ -42,6 +44,7 @@ def search_where(bot, trigger, botcom): bot.osd(["[Location search for " + str(searchterm) + "]", str(searchreturn)]) +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('module') @sopel.module.commands("what", "whatis") def search_what(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Sherlock.py b/sopel_modules/SpiceBot_Core_Commands/Sherlock.py index 49b22de..9ce4305 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Sherlock.py +++ b/sopel_modules/SpiceBot_Core_Commands/Sherlock.py @@ -9,6 +9,7 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('module') @sopel.module.commands('sherlock', 'username') def bot_command_sherlock(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Uptime.py b/sopel_modules/SpiceBot_Core_Commands/Uptime.py index a644e37..968866f 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Uptime.py +++ b/sopel_modules/SpiceBot_Core_Commands/Uptime.py @@ -9,6 +9,7 @@ import time import sopel_modules.SpiceBot as SpiceBot +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('uptime') def bot_command_uptime(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Users.py b/sopel_modules/SpiceBot_Core_Commands/Users.py index bb36e6c..73ad410 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Users.py +++ b/sopel_modules/SpiceBot_Core_Commands/Users.py @@ -8,6 +8,7 @@ import sopel import sopel_modules.SpiceBot as SpiceBot +@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('users', 'user') def nickname_comand_users(bot, trigger, botcom): From 66a03df2100da00c6bbbac75c6b0511600bd7ba9 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 3 Jul 2019 09:21:15 -0400 Subject: [PATCH 53/55] add prerun step to check user/channel --- sopel_modules/SpiceBot/Prerun.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/sopel_modules/SpiceBot/Prerun.py b/sopel_modules/SpiceBot/Prerun.py index 29f96a4..73f6704 100644 --- a/sopel_modules/SpiceBot/Prerun.py +++ b/sopel_modules/SpiceBot/Prerun.py @@ -28,6 +28,10 @@ def prerun(t_command_type='module', t_command_subtype=None): @functools.wraps(function) def internal_prerun(bot, trigger, *args, **kwargs): + # Verify channel and user exist + verify_channel(trigger) + verify_user(trigger) + botcom = class_create('botcom') if t_command_type == "nickname": @@ -167,6 +171,29 @@ def prerun_query(t_command_type='module', t_command_subtype=None): return actual_decorator +def verify_user(trigger): + # Identify + nick_id = botusers.whois_ident(trigger.nick) + # Verify nick is in the all list + botusers.add_to_all(trigger.nick, nick_id) + # Verify nick is in the all list + botusers.add_to_current(trigger.nick, nick_id) + # set current nick + botusers.mark_current_nick(trigger.nick, nick_id) + # add joined channel to nick list + botusers.add_channel(trigger.sender, nick_id) + # mark user as online + botusers.mark_user_online(nick_id) + + +def verify_channel(trigger): + botchannels.add_channel(trigger.sender) + # Identify + nick_id = botchannels.whois_ident(trigger.nick) + # Verify nick is in the channel list + botchannels.add_to_channel(trigger.sender, trigger.nick, nick_id) + + def make_trigger_args(triggerargs_one, trigger_command_type='module'): trigger_args = spicemanip.main(triggerargs_one, 'create') if trigger_command_type in ['nickname']: From 1c4e07d39caf090dd5156825b3aa904b88943f55 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 3 Jul 2019 09:32:53 -0400 Subject: [PATCH 54/55] insert bot loaded check into prerun --- sopel_modules/SpiceBot/Prerun.py | 5 +++++ sopel_modules/SpiceBot/setup.py | 22 +++++++++---------- sopel_modules/SpiceBot_Core_Commands/AI.py | 1 - .../SpiceBot_Core_Commands/BotPrivs.py | 2 -- .../SpiceBot_Core_Commands/Channels.py | 1 - .../SpiceBot_Core_Commands/Commands.py | 1 - .../SpiceBot_Core_Commands/CommandsQuery.py | 4 ---- .../SpiceBot_Core_Commands/Database.py | 2 +- .../SpiceBot_Core_Commands/DictComs.py | 1 - sopel_modules/SpiceBot_Core_Commands/Docs.py | 2 +- sopel_modules/SpiceBot_Core_Commands/Gif.py | 1 - sopel_modules/SpiceBot_Core_Commands/Logs.py | 1 - .../SpiceBot_Core_Commands/Messaging.py | 3 --- .../Runtime_Controls.py | 2 -- .../SpiceBot_Core_Commands/Search.py | 3 --- .../SpiceBot_Core_Commands/Sherlock.py | 1 - .../SpiceBot_Core_Commands/Uptime.py | 1 - sopel_modules/SpiceBot_Core_Commands/Users.py | 1 - 18 files changed, 18 insertions(+), 36 deletions(-) diff --git a/sopel_modules/SpiceBot/Prerun.py b/sopel_modules/SpiceBot/Prerun.py index 73f6704..59d9d82 100644 --- a/sopel_modules/SpiceBot/Prerun.py +++ b/sopel_modules/SpiceBot/Prerun.py @@ -19,6 +19,7 @@ from .Channels import channels as botchannels from .MessageLog import messagelog as botmessagelog from .Config import config as botconfig from .Users import users as botusers +from .Events import events as botevents def prerun(t_command_type='module', t_command_subtype=None): @@ -28,6 +29,10 @@ def prerun(t_command_type='module', t_command_subtype=None): @functools.wraps(function) def internal_prerun(bot, trigger, *args, **kwargs): + # verify the bot is at a loaded state + while not botevents.check(botevents.BOT_LOADED): + pass + # Verify channel and user exist verify_channel(trigger) verify_user(trigger) diff --git a/sopel_modules/SpiceBot/setup.py b/sopel_modules/SpiceBot/setup.py index 36a4c39..71c61ad 100644 --- a/sopel_modules/SpiceBot/setup.py +++ b/sopel_modules/SpiceBot/setup.py @@ -9,7 +9,7 @@ import os from .Config import config as botconfig from .Logs import logs -from .Events import events +from .Events import events as botevents from .Channels import SpiceBot_Channels_MainSection from .Commands import SpiceBot_Commands_MainSection @@ -73,19 +73,19 @@ def setup_config(bot): def setup_logs(bot): logs.log('SpiceBot_Logs', "Starting Setup Procedure") - events.startup_add([events.BOT_LOGS]) + botevents.startup_add([botevents.BOT_LOGS]) bot.config.core.logs_stdio = os.path.join(bot.config.core.logdir, 'stdio.log') # bot.config.core.logs_stdio = os.path.os.path.join(bot.config.core.logdir, bot.config.core.basename + '.stdio.log') bot.config.core.logs_exceptions = os.path.join(bot.config.core.logdir, 'exceptions.log') # bot.config.core.logs_exceptions = os.path.os.path.join(bot.config.core.logdir, bot.config.core.basename + '.exceptions.log') bot.config.core.logs_raw = os.path.join(bot.config.core.logdir, 'raw.log') # bot.config.core.logs_raw = os.path.os.path.join(bot.config.core.logdir, bot.config.core.basename + '.raw.log') - events.trigger(bot, events.BOT_LOGS, "SpiceBot_Logs") + botevents.trigger(bot, botevents.BOT_LOGS, "SpiceBot_Logs") def setup_commands(bot): logs.log('SpiceBot_Commands', "Setting Up Configuration") - events.startup_add([events.BOT_COMMANDS]) + botevents.startup_add([botevents.BOT_COMMANDS]) bot.config.define_section("SpiceBot_Commands", SpiceBot_Commands_MainSection, validate=False) bot.config.core.query_list = str(bot.config.SpiceBot_Commands.query_prefix).replace("\\", '').split("|") bot.config.core.prefix_list.extend(bot.config.SpiceBot_Commands.query_prefix) @@ -98,17 +98,17 @@ def setup_google(bot): def setup_startupmonologue(bot): logs.log('SpiceBot_StartupMonologue', "Initial Setup processing") - events.startup_add([ - events.BOT_STARTUPMONOLOGUE_CONNECTED, - events.BOT_STARTUPMONOLOGUE_CHANNELS, - events.BOT_STARTUPMONOLOGUE_COMMANDS, - events.BOT_STARTUPMONOLOGUE_AI, + botevents.startup_add([ + botevents.BOT_STARTUPMONOLOGUE_CONNECTED, + botevents.BOT_STARTUPMONOLOGUE_CHANNELS, + botevents.BOT_STARTUPMONOLOGUE_COMMANDS, + botevents.BOT_STARTUPMONOLOGUE_AI, ]) def setup_channels(bot): logs.log('SpiceBot_Channels', "Setting Up Configuration") - events.startup_add([events.BOT_CHANNELS]) + botevents.startup_add([botevents.BOT_CHANNELS]) bot.config.define_section("SpiceBot_Channels", SpiceBot_Channels_MainSection, validate=False) @@ -122,7 +122,7 @@ def setup_ai(bot): logs.log('SpiceBot_AI', "Setting Up Configuration") bot.config.define_section("SpiceBot_AI", SpiceBot_AI_MainSection, validate=False) bot.config.aibrain = os.path.join(bot.config.homedir, bot.config.core.basename + '.aibrain.brn') - events.startup_add([events.BOT_AI]) + botevents.startup_add([botevents.BOT_AI]) def setup_osd(bot): diff --git a/sopel_modules/SpiceBot_Core_Commands/AI.py b/sopel_modules/SpiceBot_Core_Commands/AI.py index 3ccbe20..a04f7b8 100644 --- a/sopel_modules/SpiceBot_Core_Commands/AI.py +++ b/sopel_modules/SpiceBot_Core_Commands/AI.py @@ -9,7 +9,6 @@ import sopel_modules.SpiceBot as SpiceBot import spicemanip -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('ai') def ai_trigger(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/BotPrivs.py b/sopel_modules/SpiceBot_Core_Commands/BotPrivs.py index 7633451..be1b25f 100644 --- a/sopel_modules/SpiceBot_Core_Commands/BotPrivs.py +++ b/sopel_modules/SpiceBot_Core_Commands/BotPrivs.py @@ -9,14 +9,12 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('owners', 'owner') def bot_command_owners(bot, trigger, botcom): bot_command_process(bot, trigger) -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('admins', 'admin') def bot_command_admins(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Channels.py b/sopel_modules/SpiceBot_Core_Commands/Channels.py index 585155b..e7c0814 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Channels.py +++ b/sopel_modules/SpiceBot_Core_Commands/Channels.py @@ -10,7 +10,6 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('channels', 'channel') def nickname_comand_channels(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Commands.py b/sopel_modules/SpiceBot_Core_Commands/Commands.py index ce7c5f9..195706c 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Commands.py +++ b/sopel_modules/SpiceBot_Core_Commands/Commands.py @@ -14,7 +14,6 @@ import sopel_modules.SpiceBot as SpiceBot # TODO commands sent in privmsg don't need bot.nick -@SpiceBot.events.check_ready([SpiceBot.events.BOT_COMMANDS]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('commands', 'command') def nickname_comand_commands(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/CommandsQuery.py b/sopel_modules/SpiceBot_Core_Commands/CommandsQuery.py index 150d5e6..3091f31 100644 --- a/sopel_modules/SpiceBot_Core_Commands/CommandsQuery.py +++ b/sopel_modules/SpiceBot_Core_Commands/CommandsQuery.py @@ -12,15 +12,12 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('query') def query_trigger(bot, trigger, botcom): bot.osd("I have been programmed to help find new commands by using `?`.") -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) -@SpiceBot.events.check_ready([SpiceBot.events.BOT_COMMANDS]) @SpiceBot.prerun_query('nickname', 'nickname') @sopel.module.nickname_commands('(.*)') def query_detection_nick(bot, trigger, botcom): @@ -86,7 +83,6 @@ def query_detection_nick(bot, trigger, botcom): bot.osd("The following " + bot.nick + " commands start with " + str(trigger.sb['com']) + ": " + spicemanip.main(commandlist, 'andlist') + ".", trigger.nick, 'notice') -@SpiceBot.events.check_ready([SpiceBot.events.BOT_COMMANDS]) @SpiceBot.prerun_query('module', 'module') @sopel.module.rule('^\?(.*)') def query_detection(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Database.py b/sopel_modules/SpiceBot_Core_Commands/Database.py index 7b3f019..8a811e8 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Database.py +++ b/sopel_modules/SpiceBot_Core_Commands/Database.py @@ -10,7 +10,7 @@ import sopel.module import sopel_modules.SpiceBot as SpiceBot -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) +@SpiceBot.prerun('nickname') @sopel.module.nickname_commands('database') def bot_command_database(bot, trigger): bot.osd("Database is " + SpiceBot.config.db_type) diff --git a/sopel_modules/SpiceBot_Core_Commands/DictComs.py b/sopel_modules/SpiceBot_Core_Commands/DictComs.py index 98e3932..61a06b0 100644 --- a/sopel_modules/SpiceBot_Core_Commands/DictComs.py +++ b/sopel_modules/SpiceBot_Core_Commands/DictComs.py @@ -15,7 +15,6 @@ from word2number import w2n from random import randint -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('module', 'dictcom') @sopel.module.commands('(.*)') def command_dictcom(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Docs.py b/sopel_modules/SpiceBot_Core_Commands/Docs.py index f1d74b4..9e9090f 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Docs.py +++ b/sopel_modules/SpiceBot_Core_Commands/Docs.py @@ -7,7 +7,7 @@ import sopel.module import sopel_modules.SpiceBot as SpiceBot -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) +@SpiceBot.prerun('nickname') @sopel.module.nickname_commands('help', 'docs', 'wiki') def bot_command_docs(bot, trigger): sb_git_url = str( diff --git a/sopel_modules/SpiceBot_Core_Commands/Gif.py b/sopel_modules/SpiceBot_Core_Commands/Gif.py index 9abecb2..c2406c5 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Gif.py +++ b/sopel_modules/SpiceBot_Core_Commands/Gif.py @@ -11,7 +11,6 @@ import spicemanip # TODO custom gif shortcut commands -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('module') @sopel.module.commands('gif') def gif_trigger(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Logs.py b/sopel_modules/SpiceBot_Core_Commands/Logs.py index 8a36396..2046ffb 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Logs.py +++ b/sopel_modules/SpiceBot_Core_Commands/Logs.py @@ -12,7 +12,6 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOGS]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('logs', 'debug') def bot_command_logs(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Messaging.py b/sopel_modules/SpiceBot_Core_Commands/Messaging.py index f9b962f..ce1b295 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Messaging.py +++ b/sopel_modules/SpiceBot_Core_Commands/Messaging.py @@ -9,21 +9,18 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('action') def bot_command_action(bot, trigger, botcom): bot_command_process(bot, trigger) -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('notice') def bot_command_notice(bot, trigger, botcom): bot_command_process(bot, trigger) -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('privmsg', 'say', 'msg') def bot_command_privmsg(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Runtime_Controls.py b/sopel_modules/SpiceBot_Core_Commands/Runtime_Controls.py index f7883e4..84b96fe 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Runtime_Controls.py +++ b/sopel_modules/SpiceBot_Core_Commands/Runtime_Controls.py @@ -9,7 +9,6 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('update') def nickname_comand_update(bot, trigger, botcom): @@ -42,7 +41,6 @@ def nickname_comand_update(bot, trigger, botcom): SpiceBot.spicebot_reload(bot, 'SpiceBot_Update', quitmessage) -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('restart') def nickname_comand_restart(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Search.py b/sopel_modules/SpiceBot_Core_Commands/Search.py index efed214..d0375f6 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Search.py +++ b/sopel_modules/SpiceBot_Core_Commands/Search.py @@ -10,7 +10,6 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('module') @sopel.module.commands('search', 'find', 'google', 'lookup') def search_main(bot, trigger, botcom): @@ -27,7 +26,6 @@ def search_main(bot, trigger, botcom): bot.osd(["[Information search for '" + str(searchterm) + "']", str(searchreturn)]) -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('module') @sopel.module.commands("where", "whereis") def search_where(bot, trigger, botcom): @@ -44,7 +42,6 @@ def search_where(bot, trigger, botcom): bot.osd(["[Location search for " + str(searchterm) + "]", str(searchreturn)]) -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('module') @sopel.module.commands("what", "whatis") def search_what(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Sherlock.py b/sopel_modules/SpiceBot_Core_Commands/Sherlock.py index 9ce4305..49b22de 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Sherlock.py +++ b/sopel_modules/SpiceBot_Core_Commands/Sherlock.py @@ -9,7 +9,6 @@ import spicemanip import sopel_modules.SpiceBot as SpiceBot -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('module') @sopel.module.commands('sherlock', 'username') def bot_command_sherlock(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Uptime.py b/sopel_modules/SpiceBot_Core_Commands/Uptime.py index 968866f..a644e37 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Uptime.py +++ b/sopel_modules/SpiceBot_Core_Commands/Uptime.py @@ -9,7 +9,6 @@ import time import sopel_modules.SpiceBot as SpiceBot -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('uptime') def bot_command_uptime(bot, trigger, botcom): diff --git a/sopel_modules/SpiceBot_Core_Commands/Users.py b/sopel_modules/SpiceBot_Core_Commands/Users.py index 73ad410..bb36e6c 100644 --- a/sopel_modules/SpiceBot_Core_Commands/Users.py +++ b/sopel_modules/SpiceBot_Core_Commands/Users.py @@ -8,7 +8,6 @@ import sopel import sopel_modules.SpiceBot as SpiceBot -@SpiceBot.events.check_ready([SpiceBot.events.BOT_LOADED]) @SpiceBot.prerun('nickname') @sopel.module.nickname_commands('users', 'user') def nickname_comand_users(bot, trigger, botcom): From 7169fe30a9f73e5db9386526957b42d9ad509c5f Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 3 Jul 2019 09:36:37 -0400 Subject: [PATCH 55/55] extra patch --- sopel_modules/SpiceBot/Users.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sopel_modules/SpiceBot/Users.py b/sopel_modules/SpiceBot/Users.py index ba393f9..c55c1e8 100644 --- a/sopel_modules/SpiceBot/Users.py +++ b/sopel_modules/SpiceBot/Users.py @@ -19,6 +19,7 @@ import re class BotUsers(): def __init__(self): + self.who_reqs = {} self.lock = threading.Lock() # TODO AWAY self.dict = {