From 23755b4f5bb0feb0a720248f8aefc93e67483f75 Mon Sep 17 00:00:00 2001
From: deathbybandaid <sam@deathbybandaid.net>
Date: Wed, 3 Jul 2019 11:07:57 -0400
Subject: [PATCH] query is the same

---
 sopel_modules/SpiceBot/Prerun.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sopel_modules/SpiceBot/Prerun.py b/sopel_modules/SpiceBot/Prerun.py
index 59d9d82..da0dabf 100644
--- a/sopel_modules/SpiceBot/Prerun.py
+++ b/sopel_modules/SpiceBot/Prerun.py
@@ -119,6 +119,14 @@ def prerun_query(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)
+
             botcom = class_create('botcom')
 
             if t_command_type == "nickname":