From a987365ae988c30d3e619e0a4f09e66fb2772915 Mon Sep 17 00:00:00 2001 From: Joseph Cheung Date: Wed, 1 Mar 2023 20:02:09 +0800 Subject: [PATCH] d --- searx/webapp.py | 12 ++++++++---- searx/webapp1.py | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/searx/webapp.py b/searx/webapp.py index 58b9df17e..d850c66ff 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -1287,6 +1287,9 @@ function modal_open(url, num) fulltext = fulltext.replaceAll("\n\n","\n").replaceAll("\n\n","\n"); const delimiter = /[?!;\?\n。;!………]/g fulltext = fulltext.split(delimiter); + fulltext = fulltext.filter(function(item) { + return item && item.trim(); // 去掉空值和空格 + }); optkeytext = { method: "POST", headers: headers, @@ -1845,16 +1848,17 @@ prev_chat = prev_chat+'
'+document.querySelector("#pro function send_chat(elem) { + if(document.querySelector("#modal").style.display == 'block') + { + return send_modalchat(elem); + } let word = document.querySelector("#chat_input").value; if(elem){word = elem.textContent;elem.remove()} if(word.length==0 || word.length > 140) return; if(word_last.length>500)word_last.slice(500) if (word.includes("你能") || word.includes("讲讲") || word.includes("扮演") || word.includes("模仿") || word.includes("请推荐") || word.includes("帮我") || word.includes("写一段") || word.includes("写一个") || word.includes("请问") || word.includes("请给") || word.includes("请你") || word.includes("请推荐") || word.includes("能帮忙") || word.includes("介绍一下") || word.includes("为什么") || word.includes("什么是") || word.includes("有什么") || word.includes("怎样") || word.includes("给我") || word.includes("如何") || word.includes("谁是") || word.includes("查询") || word.includes("告诉我") || word.includes("查一下") || word.includes("找一个") || word.includes("什么样") || word.includes("哪个") || word.includes("哪些") || word.includes("哪一个") || word.includes("哪一些") || word.includes("啥是") || word.includes("为啥") || word.includes("怎么")) return send_webchat(elem); - if(document.querySelector("#modal").style.display == 'block') - { - return send_modalchat(elem); - } + if(lock_chat!=0) return; lock_chat = 1; const knowledge = document.querySelector("#chat").innerHTML.replace(/.*?<\/a.*?>/g, '').replace(/]+>/g,"").replace(/\n\n/g,"\n") +"\n以上是关键词“" + search_queryquery + "”的搜索结果\n" diff --git a/searx/webapp1.py b/searx/webapp1.py index 58b9df17e..d850c66ff 100644 --- a/searx/webapp1.py +++ b/searx/webapp1.py @@ -1287,6 +1287,9 @@ function modal_open(url, num) fulltext = fulltext.replaceAll("\n\n","\n").replaceAll("\n\n","\n"); const delimiter = /[?!;\?\n。;!………]/g fulltext = fulltext.split(delimiter); + fulltext = fulltext.filter(function(item) { + return item && item.trim(); // 去掉空值和空格 + }); optkeytext = { method: "POST", headers: headers, @@ -1845,16 +1848,17 @@ prev_chat = prev_chat+'
'+document.querySelector("#pro function send_chat(elem) { + if(document.querySelector("#modal").style.display == 'block') + { + return send_modalchat(elem); + } let word = document.querySelector("#chat_input").value; if(elem){word = elem.textContent;elem.remove()} if(word.length==0 || word.length > 140) return; if(word_last.length>500)word_last.slice(500) if (word.includes("你能") || word.includes("讲讲") || word.includes("扮演") || word.includes("模仿") || word.includes("请推荐") || word.includes("帮我") || word.includes("写一段") || word.includes("写一个") || word.includes("请问") || word.includes("请给") || word.includes("请你") || word.includes("请推荐") || word.includes("能帮忙") || word.includes("介绍一下") || word.includes("为什么") || word.includes("什么是") || word.includes("有什么") || word.includes("怎样") || word.includes("给我") || word.includes("如何") || word.includes("谁是") || word.includes("查询") || word.includes("告诉我") || word.includes("查一下") || word.includes("找一个") || word.includes("什么样") || word.includes("哪个") || word.includes("哪些") || word.includes("哪一个") || word.includes("哪一些") || word.includes("啥是") || word.includes("为啥") || word.includes("怎么")) return send_webchat(elem); - if(document.querySelector("#modal").style.display == 'block') - { - return send_modalchat(elem); - } + if(lock_chat!=0) return; lock_chat = 1; const knowledge = document.querySelector("#chat").innerHTML.replace(/.*?<\/a.*?>/g, '').replace(/]+>/g,"").replace(/\n\n/g,"\n") +"\n以上是关键词“" + search_queryquery + "”的搜索结果\n"