Merge branch 'master' into jahoti-update

1 files changed, 12 insertions, 6 deletions

diff --git a/background/page_actions_server.js b/background/page_actions_server.js
index b0db5f5..156a79f 100644
--- a/background/page_actions_server.js
+++ b/background/page_actions_server.js
@@ -1,5 +1,7 @@
 /**
- * Hachette serving of page actions to content scripts
+ * This file is part of Haketilo.
+ *
+ * Function: Serving page actions to content scripts.
  *
  * Copyright (C) 2021 Wojtek Kosior
  * Redistribution terms are gathered in the `copyright' file.
@@ -25,15 +27,19 @@ let policy_observable;
 
 function send_actions(url, port)
 {
-    let [pattern, settings] = query_best(storage, url);
-    if (!settings)
-	settings = {allow: policy_observable && policy_observable.value};
+    const [pattern, queried_settings] = query_best(storage, url);
+
+    const settings = {allow: policy_observable && policy_observable.value};
+    Object.assign(settings, queried_settings);
+    if (settings.components)
+	settings.allow = false;
+
     const repos = storage.get_all(TYPE_PREFIX.REPO);
 
     port.postMessage(["settings", [pattern, settings, repos]]);
 
-    let components = settings.components;
-    let processed_bags = new Set();
+    const components = settings.components;
+    const processed_bags = new Set();
 
     if (components !== undefined)
 	send_scripts([components], port, processed_bags);