From 5ca3401eb992dd52fa2a784de03d64b886246640 Mon Sep 17 00:00:00 2001
From: shortcutme <tamas@zeronet.io>
Date: Wed, 16 Oct 2019 15:42:49 +0200
Subject: [PATCH] Remove UiRequestPlugin from Zeroname plugin

---
 plugins/Zeroname/SiteManagerPlugin.py | 12 ++++++++++++
 plugins/Zeroname/UiRequestPlugin.py   | 20 --------------------
 plugins/Zeroname/__init__.py          |  3 +--
 3 files changed, 13 insertions(+), 22 deletions(-)
 delete mode 100644 plugins/Zeroname/UiRequestPlugin.py

diff --git a/plugins/Zeroname/SiteManagerPlugin.py b/plugins/Zeroname/SiteManagerPlugin.py
index 9c1d1445..2553a50c 100644
--- a/plugins/Zeroname/SiteManagerPlugin.py
+++ b/plugins/Zeroname/SiteManagerPlugin.py
@@ -55,3 +55,15 @@ class SiteManagerPlugin(object):
     # Return: True if the address is domain
     def isDomain(self, address):
         return self.isBitDomain(address) or super(SiteManagerPlugin, self).isDomain(address)
+
+
+@PluginManager.registerTo("ConfigPlugin")
+class ConfigPlugin(object):
+    def createArguments(self):
+        group = self.parser.add_argument_group("Zeroname plugin")
+        group.add_argument(
+            "--bit_resolver", help="ZeroNet site to resolve .bit domains",
+            default="1Name2NXVi1RDPDgf5617UoW7xA6YrhM9F", metavar="address"
+        )
+
+        return super(ConfigPlugin, self).createArguments()
diff --git a/plugins/Zeroname/UiRequestPlugin.py b/plugins/Zeroname/UiRequestPlugin.py
deleted file mode 100644
index eacb0aa0..00000000
--- a/plugins/Zeroname/UiRequestPlugin.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import re
-
-from Plugin import PluginManager
-
-
-@PluginManager.registerTo("UiRequest")
-class UiRequestPlugin(object):
-
-    def __init__(self, *args, **kwargs):
-        from Site import SiteManager
-        self.site_manager = SiteManager.site_manager
-        super(UiRequestPlugin, self).__init__(*args, **kwargs)
-
-@PluginManager.registerTo("ConfigPlugin")
-class ConfigPlugin(object):
-    def createArguments(self):
-        group = self.parser.add_argument_group("Zeroname plugin")
-        group.add_argument('--bit_resolver', help='ZeroNet site to resolve .bit domains', default="1Name2NXVi1RDPDgf5617UoW7xA6YrhM9F", metavar="address")
-
-        return super(ConfigPlugin, self).createArguments()
diff --git a/plugins/Zeroname/__init__.py b/plugins/Zeroname/__init__.py
index cf724069..76826d9a 100644
--- a/plugins/Zeroname/__init__.py
+++ b/plugins/Zeroname/__init__.py
@@ -1,2 +1 @@
-from . import UiRequestPlugin
-from . import SiteManagerPlugin
\ No newline at end of file
+from . import SiteManagerPlugin