From b97c03361bfd0efd8a45dea7d740692368adcdbd Mon Sep 17 00:00:00 2001
From: xiu2 <54703944+XIU2@users.noreply.github.com>
Date: Fri, 9 Oct 2020 23:04:31 +0800
Subject: [PATCH] update

---
 52pojie-Beautification.user.js |  4 ++--
 52pojie-Enhanced.user.js       | 44 +++++++++++++++++++++-------------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/52pojie-Beautification.user.js b/52pojie-Beautification.user.js
index 4bd1c95..427ad2d 100644
--- a/52pojie-Beautification.user.js
+++ b/52pojie-Beautification.user.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         吾爱破解论坛美化 - 精简多余内容
-// @version      1.0.0
+// @version      1.0.1
 // @author       X.I.U
 // @description  精简多余内容
 // @match        *://www.52pojie.cn/*
@@ -13,7 +13,7 @@
 (function() {
     var style_Add = document.createElement('style');
     style_Add.innerHTML = `
-a[href="connect.php?mod=config"], #toptb, #navmenu, #nv_ph, #nv, #pt .y, #chart, #online, #ft, .bm.lk, .dnch_eo_pt, .dnch_eo_pr, .dnch_eo_f, .bml, ul.xl.xl2.o.cl, dl.pil.cl, td.plc.plm .sign, .dnch_eo_pb, .dnch_eo_pt, .pls .side-star, .pls .side-group, .res-footer-note, .comiis_nav, .scbar_hot_td, .bm_h.cl, .md_ctrl, .pls.favatar .xg1 {
+a[href="connect.php?mod=config"], #toptb, #navmenu, #nv_ph, #nv, #pt .y, #chart, #online, #ft, .bm.lk, .dnch_eo_pt, .dnch_eo_pr, .dnch_eo_f, .bml, ul.xl.xl2.o.cl, dl.pil.cl, td.plc.plm .sign, .dnch_eo_pb, .dnch_eo_pt, .pls .side-star, .pls .side-group, .res-footer-note, .comiis_nav, .scbar_hot_td, .md_ctrl, .pls.favatar .xg1 {
 	display:none !important;
 }
 /*.wp {
diff --git a/52pojie-Enhanced.user.js b/52pojie-Enhanced.user.js
index cc1519c..00c39ac 100644
--- a/52pojie-Enhanced.user.js
+++ b/52pojie-Enhanced.user.js
@@ -1,17 +1,17 @@
 // ==UserScript==
 // @name         吾爱破解论坛增强 - 自动签到、翻页
-// @version      1.0.0
+// @version      1.0.4
 // @author       X.I.U
 // @description  吾爱破解论坛自动签到、自动翻页
 // @match        *://www.52pojie.cn/*
 // @icon         https://www.52pojie.cn/favicon.ico
-// @require      https://cdn.bootcss.com/jquery/3.4.1/jquery.min.js
 // @license      GPL-3.0 License
 // @run-at       document-end
 // @namespace    https://greasyfork.org/scripts/412680
 // ==/UserScript==
 
 (function() {
+    qianDaoBack();
     qianDao();
     pageLoading();
 
@@ -26,17 +26,27 @@
         }
     }
 
+    // 签到后返回
+    function qianDaoBack() {
+        var qiandaoback = document.querySelector('#messagetext.alert_btnleft');
+        if (qiandaoback != null){
+            qiandaoback.click();
+        }
+    }
+
     // 自动翻页
     function pageLoading() {
-        var patt = /forum-\d+-\d+\.html/
-        if (patt.test(location.pathname)){
+        var patt1 = /\/forum-\d+-\d+\.html/
+        var patt2 = /mod\=forumdisplay/
+        if (patt1.test(location.pathname) || patt2.test(location.search)){
             windowScroll(function (direction, e) {
                 if (direction === "down") { // 下滑才准备翻页
                     var scrollTop = document.documentElement.scrollTop || window.pageYOffset || document.body.scrollTop;
                     let scrollDelta = 666;
                     if (document.documentElement.scrollHeight <= document.documentElement.clientHeight + scrollTop + scrollDelta) {
-                        if (document.querySelector('#autopbn').innerText == "下一页 »"){ // 如果已经在加载中了，就忽略
-                            document.querySelector('#autopbn').click();
+                        var autopbn = document.querySelector('#autopbn');
+                        if (autopbn && autopbn.innerText == "下一页 »"){ // 如果已经在加载中了，就忽略
+                            autopbn.click();
                         }
                     }
                 }
@@ -45,17 +55,17 @@
     }
 
     // 滚动条事件
-    function windowScroll(fn) {
-          var beforeScrollTop = document.documentElement.scrollTop,
-              fn = fn || function () {};
-          setTimeout(function () { // 延时执行，避免刚载入到页面就触发翻页事件
+    function windowScroll(fn1) {
+        var beforeScrollTop = document.documentElement.scrollTop,
+            fn = fn1 || function () {};
+        setTimeout(function () { // 延时执行，避免刚载入到页面就触发翻页事件
             window.addEventListener("scroll", function (e) {
-              var afterScrollTop = document.documentElement.scrollTop,
-                  delta = afterScrollTop - beforeScrollTop;
-              if (delta == 0) return false;
-              fn(delta > 0 ? "down" : "up", e);
-              beforeScrollTop = afterScrollTop;
+                var afterScrollTop = document.documentElement.scrollTop,
+                    delta = afterScrollTop - beforeScrollTop;
+                if (delta == 0) return false;
+                fn(delta > 0 ? "down" : "up", e);
+                beforeScrollTop = afterScrollTop;
             }, false);
-          }, 1000)
-        }
+        }, 1000)
+    }
 })();
\ No newline at end of file