Restrict blocked site addition when using mergerSiteAdd

2019-09-28 17:02:27 +02:00 · 2019-09-28 17:02:27 +02:00 · 43c366d2fb
commit 43c366d2fb
parent b21b885aa9
3 changed files with 18 additions and 2 deletions
--- a/plugins/MergerSite/MergerSitePlugin.py
+++ b/plugins/MergerSite/MergerSitePlugin.py
@ -79,8 +79,11 @@ class UiWebsocketPlugin(object):
    def cbMergerSiteAdd(self, to, addresses):
        added = 0
        for address in addresses:
-            added += 1
-            site_manager.need(address)
+            try:
+                site_manager.need(address)
+                added += 1
+            except Exception as err:
+                self.cmd("notification", ["error", _["Adding <b>%s</b> failed: %s"] % (address, err)])
        if added:
            self.cmd("notification", ["done", _["Added <b>%s</b> new site"] % added, 5000])
        RateLimit.called(self.site.address + "-MergerSiteAdd")