From 3c8cbd229146e72845f7ea71dcfb4a3edd7ba5f7 Mon Sep 17 00:00:00 2001
From: Arinerron <arinesau@gmail.com>
Date: Tue, 15 May 2018 19:16:33 -0700
Subject: [PATCH] Refactor onionrpluginapi

---
 onionr/onionrpluginapi.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/onionr/onionrpluginapi.py b/onionr/onionrpluginapi.py
index 95f06e46..8691e2cc 100644
--- a/onionr/onionrpluginapi.py
+++ b/onionr/onionrpluginapi.py
@@ -18,7 +18,7 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
 
-import onionrplugins, logger
+import onionrplugins, core as onionrcore, logger
 
 class DaemonAPI:
     def __init__(self, pluginapi):
@@ -136,6 +136,10 @@ class pluginapi:
     def __init__(self, onionr, data):
         self.onionr = onionr
         self.data = data
+        if self.onionr is None:
+            self.core = onionrcore.Core()
+        else:
+            self.core = self.onionr.onionrCore
 
         self.daemon = DaemonAPI(self)
         self.plugins = PluginAPI(self)
@@ -148,10 +152,10 @@ class pluginapi:
         return self.data
 
     def get_core(self):
-        return self.get_onionr().onionrCore
+        return self.core
 
     def get_utils(self):
-        return self.get_onionr().onionrUtils
+        return self.get_core()._utils
 
     def get_crypto(self):
         return self.get_core()._crypto