Selaa lähdekoodia

Send 방식 개편

Surplus_Up (2DU) 7 vuotta sitten
vanhempi
sitoutus
d97f07b2af
5 muutettua tiedostoa jossa 17 lisäystä ja 19 poistoa
  1. 3 2
      route/delete.py
  2. 1 1
      route/edit.py
  3. 6 4
      route/move.py
  4. 3 2
      route/revert.py
  5. 4 10
      route/tool/func.py

+ 3 - 2
route/delete.py

@@ -24,8 +24,9 @@ def delete_2(conn, name, app_var):
                 '', 
                 today, 
                 ip, 
-                flask.request.form.get('send', '') + ' (delete)', 
-                leng
+                flask.request.form.get('send', ''), 
+                leng,
+                'delete'
             )
             
             curs.execute("select title, link from back where title = ? and not type = 'cat' and not type = 'no'", [name])

+ 1 - 1
route/edit.py

@@ -45,7 +45,7 @@ def edit_2(conn, name):
             content,
             today,
             ip,
-            flask.request.form.get('send', None),
+            flask.request.form.get('send', ''),
             leng
         )
         

+ 6 - 4
route/move.py

@@ -36,8 +36,9 @@ def move_2(conn, name):
                     data_in, 
                     get_time(), 
                     ip_check(), 
-                    flask.request.form.get('send', None) + ' (marge <a>' + name + '</a> - <a>' + flask.request.form.get('title', None) + '</a> move)', 
-                    '0'
+                    flask.request.form.get('send', ''), 
+                    '0',
+                    'marge <a>' + name + '</a> - <a>' + flask.request.form.get('title', 'test') + '</a> move'
                 )
 
                 curs.execute("update back set type = 'no' where title = ? and not type = 'cat' and not type = 'no'", [name])
@@ -74,8 +75,9 @@ def move_2(conn, name):
                 data_in, 
                 get_time(), 
                 ip_check(), 
-                flask.request.form.get('send', None) + ' (<a>' + name + '</a> - <a>' + flask.request.form.get('title', None) + '</a> move)', 
-                '0'
+                flask.request.form.get('send', ''), 
+                '0',
+                '<a>' + name + '</a> - <a>' + flask.request.form.get('title', 'test') + '</a> move'
             )
             
             curs.execute("update back set type = 'no' where title = ? and not type = 'cat' and not type = 'no'", [name])

+ 3 - 2
route/revert.py

@@ -42,8 +42,9 @@ def revert_2(conn, name):
                 data[0][0], 
                 get_time(), 
                 ip_check(), 
-                flask.request.form.get('send', None) + ' (r' + str(num) + ')', 
-                leng
+                flask.request.form.get('send', ''), 
+                leng,
+                'r' + str(num) + ''
             )
 
             render_set(

+ 4 - 10
route/tool/func.py

@@ -829,24 +829,18 @@ def rd_plus(title, sub, date):
     else:
         curs.execute("insert into rd (title, sub, date) values (?, ?, ?)", [title, sub, date])
 
-def history_plus(title, data, date, ip, send, leng):
+def history_plus(title, data, date, ip, send, leng, t_check = ''):
     curs.execute("select id from history where title = ? order by id + 0 desc limit 1", [title])
     id_data = curs.fetchall()
 
-    get_type = re.search('(\((?:(?:(?!\)).)+)\))$', send)
-    send = re.sub('(\((?:(?:(?!\)).)+)\))$', '', send)
-
     send = re.sub('\(|\)|<|>', '', send)
 
     if len(send) > 128:
         send = send[:128]
 
-    if get_type:
-        if send == '':
-            send = get_type.groups()[0]
-        else:
-            send += ' ' + get_type.groups()[0]
-    
+    if t_check != '':
+        send += ' (' + t_check + ')'
+
     curs.execute("insert into history (id, title, data, date, ip, send, leng, hide) values (?, ?, ?, ?, ?, ?, ?, '')", [
         str(int(id_data[0][0]) + 1) if id_data else '1',
         title,