From 46cc91f62fe36cbe8bdaa54cb3703247610ea89f Mon Sep 17 00:00:00 2001
From: yeyang <746659424@qq.com>
Date: Tue, 1 Nov 2022 00:55:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=9A=E4=B9=85=E5=8F=91?=
 =?UTF-8?q?=E8=A8=80=E8=BF=87=E7=9A=84=E4=BA=BA=E5=88=97=E8=A1=A8=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 model/Group_admin.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/model/Group_admin.js b/model/Group_admin.js
index e64cba7..77b15ed 100644
--- a/model/Group_admin.js
+++ b/model/Group_admin.js
@@ -123,6 +123,9 @@ class Group_admin {
     async getnoactive(e, times, unit, num = 1) {
         let list = await this.noactivelist(e, times, unit)
         if (!list) return false
+        list.sort((a, b) => {
+            return a.last_sent_time - b.last_sent_time
+        })
         let msg = list.map(item => {
             return [segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${item.user_id}`),
             `\nQQ：${item.user_id}\n`,
@@ -138,7 +141,7 @@ class Group_admin {
         let msgs = Page[num - 1]
         let res = msgs.list
         if (num < Page.length) {
-            res.unshift(`可用 "#查看${times}${unit}没发言过的人第${msgs.pageNum + 1}页" 翻页`)
+            res.splice(2, 0, `可用 "#查看${times}${unit}没发言过的人第${msgs.pageNum + 1}页" 翻页`)
         }
         res.unshift(`当前为第${msgs.pageNum}页，共${Page.length}页，本页共${res.length}人，总共${msg.length}人`)
         res.unshift(`以下为${times}${unit}没发言过的坏淫`)
@@ -214,6 +217,9 @@ class Group_admin {
     async getneverspeakinfo(e, num) {
         let list = await this.getneverspeak(e)
         if (!list) return false
+        list.sort((a, b) => {
+            return a.join_time - b.join_time
+        })
         let msg = list.map(item => {
             return [segment.image(`https://q1.qlogo.cn/g?b=qq&s=100&nk=${item.user_id}`),
             `\nQQ：${item.user_id}\n`,
@@ -228,11 +234,11 @@ class Group_admin {
         }
         let msgs = Page[num - 1]
         let res = msgs.list
-        if (num < Page.length) {
-            res.unshift(`可用 "#查看从未发言过的人第${msgs.pageNum + 1}页" 翻页`)
-        }
         res.unshift(`当前为第${msgs.pageNum}页，共${Page.length}页，本页共${res.length}人，总共${msg.length}人`)
         res.unshift(`以下为进群后从未发言过的坏淫`)
+        if (num < Page.length) {
+            res.splice(2, 0, `可用 "#查看从未发言过的人第${msgs.pageNum + 1}页" 翻页`)
+        }
         return res
     }
 }