From 80128d90ea5b7c09d03bc8932c480c3522fd1580 Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Wed, 29 May 2019 13:31:08 -0400 Subject: [PATCH] revert to injection --- sopel_modules/SpiceBot/Database.py | 35 +++++++++++++++++------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/sopel_modules/SpiceBot/Database.py b/sopel_modules/SpiceBot/Database.py index f7648c6..b170428 100644 --- a/sopel_modules/SpiceBot/Database.py +++ b/sopel_modules/SpiceBot/Database.py @@ -6,6 +6,7 @@ This is the SpiceBot Database # sopel imports from sopel.tools import Identifier +import sopel.db from sopel.db import SopelDB, Nicknames, _deserialize import threading @@ -369,23 +370,27 @@ class BotDatabase(): "nicks": {}, "channels": {}, } + + sopel.db.NickValues = NickValues + SopelDB.get_nick_value = SpiceDB.get_nick_value + SopelDB.set_nick_value = SpiceDB.set_nick_value + SopelDB.delete_nick_value = SpiceDB.delete_nick_value + SopelDB.adjust_nick_value = SpiceDB.adjust_nick_value + + sopel.db.ChannelValues = ChannelValues + SopelDB.get_channel_value = SpiceDB.get_channel_value + SopelDB.set_channel_value = SpiceDB.set_channel_value + SopelDB.delete_channel_value = SpiceDB.delete_channel_value + SopelDB.adjust_channel_value = SpiceDB.adjust_channel_value + + sopel.db.PluginValues = PluginValues + SopelDB.get_plugin_value = SpiceDB.get_plugin_value + SopelDB.set_plugin_value = SpiceDB.set_plugin_value + SopelDB.delete_plugin_value = SpiceDB.delete_plugin_value + SopelDB.adjust_plugin_value = SpiceDB.adjust_plugin_value + self.db = SopelDB(botconfig.config) - self.db.get_nick_value = SpiceDB.get_nick_value - self.db.set_nick_value = SpiceDB.set_nick_value - self.db.delete_nick_value = SpiceDB.delete_nick_value - self.db.adjust_nick_value = SpiceDB.adjust_nick_value - - self.db.get_channel_value = SpiceDB.get_channel_value - self.db.set_channel_value = SpiceDB.set_channel_value - self.db.delete_channel_value = SpiceDB.delete_channel_value - self.db.adjust_channel_value = SpiceDB.adjust_channel_value - - self.db.get_plugin_value = SpiceDB.get_plugin_value - self.db.set_plugin_value = SpiceDB.set_plugin_value - self.db.delete_plugin_value = SpiceDB.delete_plugin_value - self.db.adjust_plugin_value = SpiceDB.adjust_plugin_value - """Nick""" def get_nick_value(self, nick, key, sorting_key='unsorted'):