From 8cef5981b808bc1713170627c88dc26ca81063c1 Mon Sep 17 00:00:00 2001
From: Shin'ya Ueoka <ueokande@i-beam.org>
Date: Sat, 11 May 2019 17:45:58 +0900
Subject: Clipbaord as a clean architecture

---
 src/shared/urls.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/shared')

diff --git a/src/shared/urls.ts b/src/shared/urls.ts
index 18349c8..bbdb1ea 100644
--- a/src/shared/urls.ts
+++ b/src/shared/urls.ts
@@ -1,3 +1,5 @@
+import { Search } from './Settings';
+
 const trimStart = (str: string): string => {
   // NOTE String.trimStart is available on Firefox 61
   return str.replace(/^\s+/, '');
@@ -5,7 +7,7 @@ const trimStart = (str: string): string => {
 
 const SUPPORTED_PROTOCOLS = ['http:', 'https:', 'ftp:', 'mailto:', 'about:'];
 
-const searchUrl = (keywords: string, searchSettings: any): string => {
+const searchUrl = (keywords: string, search: Search): string => {
   try {
     let u = new URL(keywords);
     if (SUPPORTED_PROTOCOLS.includes(u.protocol.toLowerCase())) {
@@ -17,12 +19,12 @@ const searchUrl = (keywords: string, searchSettings: any): string => {
   if (keywords.includes('.') && !keywords.includes(' ')) {
     return 'http://' + keywords;
   }
-  let template = searchSettings.engines[searchSettings.default];
+  let template = search.engines[search.default];
   let query = keywords;
 
   let first = trimStart(keywords).split(' ')[0];
-  if (Object.keys(searchSettings.engines).includes(first)) {
-    template = searchSettings.engines[first];
+  if (Object.keys(search.engines).includes(first)) {
+    template = search.engines[first];
     query = trimStart(trimStart(keywords).slice(first.length));
   }
   return template.replace('{}', encodeURIComponent(query));
-- 
cgit v1.2.3