From 244ca7ed24730760c9fdd804a8fad095b51d8f8f Mon Sep 17 00:00:00 2001
From: xiu2 <54703944+XIU2@users.noreply.github.com>
Date: Sat, 8 May 2021 13:36:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3dm-Enhanced.user.js     | 15 +++++----------
 Hostloc-Enhanced.user.js |  6 ++----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/3dm-Enhanced.user.js b/3dm-Enhanced.user.js
index ba5c63b..c1f5ad0 100644
--- a/3dm-Enhanced.user.js
+++ b/3dm-Enhanced.user.js
@@ -131,31 +131,26 @@
 
     // URL 匹配正则表达式
     let patt_thread = /\/thread-\d+-\d+\-\d+.html/,
-        patt_thread_2 = /mod\=viewthread/,
         patt_forum = /\/forum-\d+-\d+\.html/,
-        patt_forum_2 = /mod\=forumdisplay/,
-        patt_guide = /mod\=guide\&view\=(hot|digest)/,
-        patt_reply = /mod\=post&action\=reply/,
-        patt_reply_2 = /extra\=page\%3D1&page\=/
+        patt_guide = /mod\=guide\&view\=(hot|digest)/
 
     // URL 判断
-    if (patt_thread.test(location.pathname) || patt_thread_2.test(location.search)){
+    if (patt_thread.test(location.pathname) || location.search.indexOf('mod=viewthread') > -1){
         // 帖子内
         if(menu_value('menu_thread_pageLoading'))curSite = DBSite.thread;
         if(menu_value('menu_autoReply'))autoReply(); //       如果有隐藏内容，则自动回复
-        pageLoading(); //                       自动翻页
         if(menu_value('menu_scrollToShowhide'))setTimeout(function(){window.scrollTo(0,document.querySelector('.showhide').offsetTop)}, 500); // 滚动至隐藏内容
-    }else if (patt_forum.test(location.pathname) || patt_forum_2.test(location.search)){
+    }else if (patt_forum.test(location.pathname) || location.search.indexOf('mod=forumdisplay') > -1){
         // 各板块帖子列表
         curSite = DBSite.forum;
         if(menu_value('menu_cleanTopPost'))cleanTopPost(); // 清理置顶帖子
-        pageLoading(); //                       自动翻页
     }else if (patt_guide.test(location.search)){
         // 导读帖子列表
         curSite = DBSite.guide;
-        pageLoading(); //                       自动翻页
     }
 
+    pageLoading(); //                       自动翻页
+
 
     // 判断是否登陆
     function checkLogin(){
diff --git a/Hostloc-Enhanced.user.js b/Hostloc-Enhanced.user.js
index 0963e19..f69f9ea 100644
--- a/Hostloc-Enhanced.user.js
+++ b/Hostloc-Enhanced.user.js
@@ -109,18 +109,16 @@
 
     // URL 匹配正则表达式
     let patt_thread = /\/thread-\d+-\d+\-\d+.html/,
-        patt_thread_2 = /mod\=viewthread/,
         patt_forum = /\/forum-\d+-\d+\.html/,
-        patt_forum_2 = /mod\=forumdisplay/,
         patt_guide = /mod\=guide\&view\=(hot|digest)/
 
     // URL 判断
-    if (patt_thread.test(location.pathname) || patt_thread_2.test(location.search)){
+    if (patt_thread.test(location.pathname) || location.search.indexOf('mod=viewthread') > -1){
         // 帖子内
         if(menu_value('menu_thread_pageLoading'))curSite = DBSite.thread;
         // 自动显示帖子内被隐藏的回复
         showPosts();
-    }else if (patt_forum.test(location.pathname) || patt_forum_2.test(location.search)){
+    }else if (patt_forum.test(location.pathname) || location.search.indexOf('mod=forumdisplay') > -1){
         // 各板块帖子列表
         curSite = DBSite.forum;
     }else if (patt_guide.test(location.search)){