빼먹은 게시판 API 공지 여부 추가

route/bbs_delete.py

@@ -14,14 +14,14 @@ def bbs_delete(bbs_num = ''):
         bbs_num_str = str(bbs_num)
 
         if admin_check(conn) != 1:
-            return redirect(conn, '/bbs/w/' + bbs_num_str)
+            return redirect(conn, '/bbs/in/' + bbs_num_str)
         
         if flask.request.method == 'POST':
             curs.execute(db_change('delete from bbs_data where set_id = ?'), [bbs_num_str])
             curs.execute(db_change('delete from bbs_set where set_id = ?'), [bbs_num_str])
             curs.execute(db_change('delete from bbs_data where set_id like ?'), [bbs_num_str + '-%'])
             
-            return redirect(conn, '/bbs/w/' + bbs_num_str)
+            return redirect(conn, '/bbs/in/' + bbs_num_str)
         else:
             return easy_minify(conn, flask.render_template(skin_check(conn),
                 imp = [get_lang(conn, 'bbs_delete'), wiki_set(conn), wiki_custom(conn), wiki_css(['(' + bbs_name + ')', 0])],

route/bbs_w.py

@@ -61,7 +61,7 @@ def bbs_w(bbs_num = '', tool = 'bbs', page = 1, name = ''):
                     last_date = ('(' + db_data_2[0][0] + ')') if db_data_2 else ''
 
                     data += '<li>'
-                    data += '<a href="/bbs/w/' + for_a[1] + '">' + html.escape(for_a[0]) + '</a> (' + bbs_type + ') ' + last_date
+                    data += '<a href="/bbs/in/' + for_a[1] + '">' + html.escape(for_a[0]) + '</a> (' + bbs_type + ') ' + last_date
                     data += '</li>'
 
                 data += '</ul>'

route/bbs_w_delete.py

@@ -17,7 +17,7 @@ def bbs_w_delete(bbs_num = '', post_num = '', comment_num = ''):
         post_num_str = str(post_num)
 
         if admin_check(conn) != 1:
-            return redirect(conn, '/bbs/w/' + bbs_num_str)
+            return redirect(conn, '/bbs/in/' + bbs_num_str)
         
         temp_dict = json.loads(api_bbs_w_post(bbs_num_str + '-' + post_num_str).data)
         if not 'user_id' in temp_dict:
@@ -29,7 +29,7 @@ def bbs_w_delete(bbs_num = '', post_num = '', comment_num = ''):
                 curs.execute(db_change('delete from bbs_set where set_code = ? and set_id = ?'), [post_num_str, bbs_num_str])
                 curs.execute(db_change('delete from bbs_data where set_id = ? or set_id like ?'), [bbs_num_str + '-' + post_num_str, bbs_num_str + '-' + post_num_str + '-%'])
                 
-                return redirect(conn, '/bbs/w/' + bbs_num_str)
+                return redirect(conn, '/bbs/in/' + bbs_num_str)
             else:
                 comment_num_split = comment_num.split('-')
                 

route/bbs_w_edit.py

@@ -56,7 +56,7 @@ def bbs_w_edit(bbs_num = '', post_num = '', comment_num = ''):
             data = flask.request.form.get('content', '')
             if data == '':
                 # re_error로 대체 예정
-                return redirect(conn, '/bbs/w/' + bbs_num_str)
+                return redirect(conn, '/bbs/in/' + bbs_num_str)
             
             date = get_time()
 

route/bbs_w_hide.py

@@ -15,7 +15,7 @@ def bbs_w_hide(bbs_num = '', post_num = ''):
         post_num_str = str(post_num)
 
         if admin_check(conn) != 1:
-            return redirect(conn, '/bbs/w/' + bbs_num_str)
+            return redirect(conn, '/bbs/in/' + bbs_num_str)
         
         if flask.request.method == 'POST':
             pass

route/bbs_w_pinned.py

@@ -17,7 +17,7 @@ def bbs_w_pinned(bbs_num = '', post_num = ''):
         post_num_str = str(post_num)
 
         if admin_check(conn) != 1:
-            return redirect(conn, '/bbs/w/' + bbs_num_str)
+            return redirect(conn, '/bbs/in/' + bbs_num_str)
         
         temp_dict = json.loads(api_bbs_w_post(bbs_num_str + '-' + post_num_str).data)
         if not 'user_id' in temp_dict:
@@ -30,7 +30,7 @@ def bbs_w_pinned(bbs_num = '', post_num = ''):
             else:
                 curs.execute(db_change('delete from bbs_data where set_code = ? and set_id = ? and set_name = "pinned"'), [post_num_str, bbs_num_str])
             
-            return redirect(conn, '/bbs/w/' + bbs_num_str)
+            return redirect(conn, '/bbs/in/' + bbs_num_str)
         else:
             curs.execute(db_change('select set_data from bbs_data where set_code = ? and set_id = ? and set_name = "pinned"'), [post_num_str, bbs_num_str])
             pinned = get_lang(conn, 'pinned') if not curs.fetchall() else get_lang(conn, 'pinned_release')

route/tool/func.py

@@ -1069,7 +1069,7 @@ def skin_check(conn, set_n = 0):
         return skin
     
 def cache_v():
-    return '.cache_v239'
+    return '.cache_v240'
 
 def wiki_css(data):
     global global_wiki_set

route_go/route/api_bbs.go

@@ -18,14 +18,16 @@ func Api_bbs(call_arg []string) string {
 	db := tool.DB_connect(db_set)
 	defer db.Close()
 
-	var rows *sql.Rows
+	var rows []*sql.Rows
 	if other_set["bbs_num"] == "" {
 		var err error
 
-		rows, err = db.Query(tool.DB_change(db_set, "select set_code, set_id from bbs_data where set_name = 'date' order by set_data desc limit 50"))
+		row, err := db.Query(tool.DB_change(db_set, "select set_code, set_id, '0' from bbs_data where set_name = 'date' order by set_data desc limit 50"))
 		if err != nil {
 			log.Fatal(err)
 		}
+
+		rows = append(rows, row)
 	} else {
 		page, _ := strconv.Atoi(other_set["page"])
 		num := 0
@@ -33,81 +35,101 @@ func Api_bbs(call_arg []string) string {
 			num = page*50 - 50
 		}
 
-		stmt, err := db.Prepare(tool.DB_change(db_set, "select set_code, set_id from bbs_data where set_name = 'title' and set_id like ? order by set_code + 0 desc limit ?, 50"))
+		stmt, err := db.Prepare(tool.DB_change(db_set, "select set_code, set_id, '1' from bbs_data where set_name = 'pinned' and set_id like ? order by set_data desc"))
 		if err != nil {
 			log.Fatal(err)
 		}
 		defer stmt.Close()
 
-		rows, err = stmt.Query(other_set["bbs_num"], num)
+		row, err := stmt.Query(other_set["bbs_num"])
 		if err != nil {
 			log.Fatal(err)
 		}
-	}
-	defer rows.Close()
-
-	var data_list []map[string]string
-	ip_parser_temp := map[string][]string{}
 
-	for rows.Next() {
-		temp_data := make(map[string]string)
+		rows = append(rows, row)
 
-		var set_code string
-		var set_id string
-
-		err := rows.Scan(&set_code, &set_id)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		temp_data["set_code"] = set_code
-		temp_data["set_id"] = set_id
-
-		stmt, err := db.Prepare(tool.DB_change(db_set, "select set_name, set_data, set_code, set_id from bbs_data where set_code = ? and set_id = ?"))
+		stmt, err = db.Prepare(tool.DB_change(db_set, "select set_code, set_id, '0' from bbs_data where set_name = 'title' and set_id like ? order by set_code + 0 desc limit ?, 50"))
 		if err != nil {
 			log.Fatal(err)
 		}
 		defer stmt.Close()
 
-		rows, err := stmt.Query(set_code, set_id)
+		row, err = stmt.Query(other_set["bbs_num"], num)
 		if err != nil {
 			log.Fatal(err)
 		}
-		defer rows.Close()
 
-		for rows.Next() {
-			var set_name string
-			var set_data string
+		rows = append(rows, row)
+	}
+
+	var data_list []map[string]string
+	ip_parser_temp := map[string][]string{}
+
+	for for_a := 0; for_a < len(rows); for_a++ {
+		defer rows[for_a].Close()
+
+		for rows[for_a].Next() {
+			temp_data := make(map[string]string)
 
-			err := rows.Scan(&set_name, &set_data, &set_code, &set_id)
+			var set_code string
+			var set_id string
+			var pinned string
+
+			err := rows[for_a].Scan(&set_code, &set_id, &pinned)
 			if err != nil {
 				log.Fatal(err)
 			}
 
-			if set_name == "user_id" {
-				var ip_pre string
-				var ip_render string
+			temp_data["set_code"] = set_code
+			temp_data["set_id"] = set_id
+			temp_data["pinned"] = pinned
+
+			stmt, err := db.Prepare(tool.DB_change(db_set, "select set_name, set_data, set_code, set_id from bbs_data where set_code = ? and set_id = ?"))
+			if err != nil {
+				log.Fatal(err)
+			}
+			defer stmt.Close()
+
+			rows, err := stmt.Query(set_code, set_id)
+			if err != nil {
+				log.Fatal(err)
+			}
+			defer rows.Close()
 
-				if _, ok := ip_parser_temp[set_data]; ok {
-					ip_pre = ip_parser_temp[set_data][0]
-					ip_render = ip_parser_temp[set_data][1]
-				} else {
-					ip_pre = tool.IP_preprocess(db, db_set, set_data, other_set["ip"])[0]
-					ip_render = tool.IP_parser(db, db_set, set_data, other_set["ip"])
+			for rows.Next() {
+				var set_name string
+				var set_data string
 
-					ip_parser_temp[set_data] = []string{ip_pre, ip_render}
+				err := rows.Scan(&set_name, &set_data, &set_code, &set_id)
+				if err != nil {
+					log.Fatal(err)
 				}
 
-				set_data = ip_pre
-				temp_data["user_id_render"] = ip_render
-			}
+				if set_name == "user_id" {
+					var ip_pre string
+					var ip_render string
+
+					if _, ok := ip_parser_temp[set_data]; ok {
+						ip_pre = ip_parser_temp[set_data][0]
+						ip_render = ip_parser_temp[set_data][1]
+					} else {
+						ip_pre = tool.IP_preprocess(db, db_set, set_data, other_set["ip"])[0]
+						ip_render = tool.IP_parser(db, db_set, set_data, other_set["ip"])
+
+						ip_parser_temp[set_data] = []string{ip_pre, ip_render}
+					}
+
+					set_data = ip_pre
+					temp_data["user_id_render"] = ip_render
+				}
 
-			if set_name != "data" {
-				temp_data[set_name] = set_data
+				if set_name != "data" && set_name != "pinned" {
+					temp_data[set_name] = set_data
+				}
 			}
-		}
 
-		data_list = append(data_list, temp_data)
+			data_list = append(data_list, temp_data)
+		}
 	}
 
 	return_data := make(map[string]interface{})

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-dev88",
+        "r_ver" : "v3.5.0-dev89",
         "c_ver" : "3500379",
         "s_ver" : "3500113"
     }

views/main_css/js/route/bbs_in.js

@@ -27,7 +27,13 @@ function opennamu_bbs_in() {
             data_html += '<div style="float: right;">';
 
             data_html += data[for_a]['user_id_render'] + ' | ';
-            data_html += data[for_a]['date'];
+
+            console.log(data);
+            if(data[for_a]['pinned'] === '1') {
+                data_html += '<span style="color: red;">' + data[for_a]['date'] + '</span>';
+            } else {
+                data_html += data[for_a]['date'];
+            }
 
             data_html += '</div>'
             data_html += '<div style="clear: both;"></div>';