Merge pull request #29 from cloudoptlab/fix/2.x/bug-fixes

#27 bug fixes

Author: T-baby

src/content/bookmark.ts

@@ -7,42 +7,38 @@ import {sanitize} from 'dompurify'
 class BookmarkSearch {
     private readonly host: string
     private readonly innerClass: string
-    private keyword: string
+    private getKeyword: () => string
     constructor() {
         this.host = getHost(window.location.href)
-        if (this.host === 'www.baidu.com') {
-            this.keyword = $('#kw').val() as string
+
+        if (this.host.endsWith('.baidu.com')) {
+            this.getKeyword = () => ($('#kw')[0]['value'] as string)
             this.innerClass = '#content_left'
             $('#kw').bind('input propertychange', () => {
-                this.keyword = $('#kw').val() as string
-                this.sendSearch(this.keyword)
+                this.sendSearch(this.getKeyword())
             })
-            this.sendSearch(this.keyword)
         } else if (this.host.startsWith('www.google.')) {
-            this.keyword = $('#lst-ib').val() as string
+            this.getKeyword = () => ($('input.gsfi')[0]['value'] as string)
             this.innerClass = '#res'
-            $('#lst-ib').bind('input propertychange', () => {
-                this.keyword = $('#lst-ib').val() as string
-                this.sendSearch(this.keyword)
+            $('input.gsfi').bind('input propertychange', () => {
+                this.sendSearch(this.getKeyword())
             })
-            this.sendSearch(this.keyword)
-        } else if (this.host.endsWith('.bind.com')) {
-            this.keyword = $('#sb_form_q').val() as string
-            this.innerClass = '#b_results'
+        } else if (this.host.endsWith('.bing.com')) {
+            $('li.b_algo:last').after('<div id="bookmarkCard"></div>')
+            this.getKeyword = () => ($('#sb_form_q')[0]['value'] as string)
+            this.innerClass = '#bookmarkCard'
             $('#sb_form_q').bind('input propertychange', () => {
-                this.keyword = $('#sb_form_q').val() as string
-                this.sendSearch(this.keyword)
+                this.sendSearch(this.getKeyword())
             })
-            this.sendSearch(this.keyword)
         } else if (this.host.endsWith('search.naver.com')) {
-            this.keyword = $('#nx_query').val() as string
+            this.getKeyword = () => ($('#nx_query').val() as string)
             this.innerClass = '#sub_pack'
             $('#nx_query').bind('input propertychange', () => {
-                this.keyword = $('#nx_query').val() as string
-                this.sendSearch(this.keyword)
+                this.sendSearch(this.getKeyword())
             })
-            this.sendSearch(this.keyword)
         }
+
+        this.sendSearch(this.getKeyword())
     }
 
     public sendSearch(keyword: string) {

src/core/notification.ts

@@ -28,28 +28,54 @@ export function error(message: string) {
     notyFactory('/image/icon/red/icon512.png')(message)
 }
 
-let isCreateNoty = false
+let suppressBankNoty = false
+let suppressShopNoty = false
+let suppressGameNoty = false
+let suppressHospitalNoty = false
+
 const noRepeatNotyTime = 1000 * 60 * 5
 export async function labSafeTipsNoty(type: string) {
     const config = await coreConfig.get()
-    if (config.labSafeTips && isCreateNoty === false) {
-        switch (type) {
-            case 'BANK':
+    if (!config.labSafeTips) {
+        return
+    }
+
+    switch (type) {
+        case 'BANK':
+            if (!suppressBankNoty) {
                 info(i18n.get('bankSafeTips'))
-                break
-            case 'SHOP':
+                suppressBankNoty = true
+                setTimeout(() => {
+                    suppressBankNoty = false
+                }, noRepeatNotyTime);
+            }
+            break
+        case 'SHOP':
+            if (!suppressShopNoty) {
                 info(i18n.get('shopSafeTips'))
-                break
-            case 'GAME':
+                suppressShopNoty = true
+                setTimeout(() => {
+                    suppressShopNoty = false
+                }, noRepeatNotyTime);
+            }
+            break
+        case 'GAME':
+            if (!suppressGameNoty) {
                 info(i18n.get('gameSafeTips'))
-                break
-            case 'HOSPITAL':
+                suppressGameNoty = true
+                setTimeout(() => {
+                    suppressGameNoty = false
+                }, noRepeatNotyTime);
+            }
+            break
+        case 'HOSPITAL':
+            if (!suppressHospitalNoty) {
                 info(i18n.get('hospitalSafeTips'))
-                break
-            default:
-                break
-        }
-        setTimeout(() => { isCreateNoty = false }, noRepeatNotyTime)
+                suppressHospitalNoty = true
+                setTimeout(() => {
+                    suppressHospitalNoty = false
+                }, noRepeatNotyTime);
+            }
+            break
     }
-    isCreateNoty = true
 }