Sfoglia il codice sorgente

일부 롤백, 일부 코드 수정

Surplus_Up (2DU) 6 anni fa
parent
commit
d757b03dde
3 ha cambiato i file con 7 aggiunte e 15 eliminazioni
  1. 3 13
      route/api_recent_change.py
  2. 3 1
      route/recent_changes.py
  3. 1 1
      version.json

+ 3 - 13
route/api_recent_change.py

@@ -4,24 +4,14 @@ def api_recent_change_2(conn):
     curs = conn.cursor()
     curs = conn.cursor()
 
 
     num = int(number_check(flask.request.args.get('num', '10')))
     num = int(number_check(flask.request.args.get('num', '10')))
-    if not num > 0:
-        num = 1
-
-    if num > 1000:
-        num = 1
-
-    page = int(number_check(flask.request.args.get('page', '1')))
-    if page * num > 0:
-        page = page * num - num
-    else:
-        page = 0
+    num = 50 if (1 if not num > 0 else num) > 50 else num
 
 
     curs.execute(db_change('' + \
     curs.execute(db_change('' + \
         'select id, title, date, ip, send, leng from history ' + \
         'select id, title, date, ip, send, leng from history ' + \
         "where not title like 'user:%' " + \
         "where not title like 'user:%' " + \
         'order by date desc ' + \
         'order by date desc ' + \
-        'limit ?, ?' + \
-    ''), [page, num])
+        'limit ?' + \
+    ''), [num])
     all_list = curs.fetchall()
     all_list = curs.fetchall()
     if all_list:
     if all_list:
         return flask.jsonify(all_list)
         return flask.jsonify(all_list)

+ 3 - 1
route/recent_changes.py

@@ -103,7 +103,9 @@ def recent_changes_2(conn, name, tool):
 
 
             curs.execute(db_change('' + \
             curs.execute(db_change('' + \
                 'select id, title, date, ip, send, leng, hide from history ' + \
                 'select id, title, date, ip, send, leng, hide from history ' + \
-                plus_sql + 'and date in (select date from history order by date desc limit ?, 50) order by date desc' + \
+                plus_sql + \
+                'order by date desc ' + \
+                'limit ?, 50' + \
             ''), [sql_num])
             ''), [sql_num])
 
 
         div += '</tr>'
         div += '</tr>'

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
 {
     "master" : {
     "master" : {
-        "r_ver" : "v3.1.9-master-11",
+        "r_ver" : "v3.1.9-master-12",
         "c_ver" : "3190201",
         "c_ver" : "3190201",
         "s_ver" : "8"
         "s_ver" : "8"
     }, "stable" : {
     }, "stable" : {