Parcourir la source

버그 수정

Surplus_Up (2DU) il y a 6 ans
Parent
commit
64f9c39ab3
2 fichiers modifiés avec 6 ajouts et 6 suppressions
  1. 5 5
      route/topic.py
  2. 1 1
      version.json

+ 5 - 5
route/topic.py

@@ -68,9 +68,9 @@ def topic_2(conn, topic_num):
                 ])
 
         cate_re = re.compile(r'\[\[((?:분류|category):(?:(?:(?!\]\]).)*))\]\]', re.I)
-        data = cate_re.sub('[br]', flask.request.form.get('content', 'Test'))
+        data = cate_re.sub('[br]', flask.request.form.get('content', 'Test').replace('\r', ''))
 
-        for rd_data in re.findall(r"(?: |^)(#(?:[0-9]+))(?: |$)", data):
+        for rd_data in re.findall(r"(?: |^)(#(?:[0-9]+))(?: |\n|$)", data):
             curs.execute(db_change("select ip from topic where code = ? and id = ?"), [topic_num, rd_data])
             ip_data = curs.fetchall()
             if ip_data and ip_or_user(ip_data[0][0]) == 0:
@@ -80,7 +80,7 @@ def topic_2(conn, topic_num):
                     today
                 ])
 
-        for rd_data in re.findall(r"(?: |^)@((?:[^ ]+))(?: |$)", data):
+        for rd_data in re.findall(r"(?: |^)@((?:[^ ]+))(?: |\n|$)", data):
             curs.execute(db_change("select ip from history where ip = ? limit 1"), [rd_data])
             ip_data = curs.fetchall()
             if not ip_data:
@@ -94,8 +94,8 @@ def topic_2(conn, topic_num):
                     today
                 ])
 
-        data = re.sub(r"( |^)(#(?:[0-9]+))( |$)", '\g<1><topic_a>\g<2></topic_a>\g<3>', data)
-        data = re.sub(r"( |^)(@(?:[^ ]+))( |$)", '\g<1><topic_call>\g<2></topic_call>\g<3>', data)
+        data = re.sub(r"( |^)(#(?:[0-9]+))( |\n|$)", '\g<1><topic_a>\g<2></topic_a>\g<3>', data)
+        data = re.sub(r"( |^)(@(?:[^ ]+))( |\n|$)", '\g<1><topic_call>\g<2></topic_call>\g<3>', data)
 
         rd_plus(topic_num, today, name, sub)
         curs.execute(db_change("insert into topic (id, data, date, ip, code) values (?, ?, ?, ?, ?)"), [

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.8-master-42",
+        "r_ver" : "v3.1.8-master-43",
         "c_ver" : "3183900",
         "s_ver" : "8"
     }, "stable" : {