Explorar el Código

새 토론 추가 알림 알고리즘 개편

Surplus_Up (2DU) hace 7 años
padre
commit
24e82ba9fe
Se han modificado 5 ficheros con 18 adiciones y 31 borrados
  1. 1 1
      route/api_skin_info.py
  2. 1 1
      route/api_topic_sub.py
  3. 1 1
      route/api_w.py
  4. 2 1
      route/topic.py
  5. 13 27
      views/main_css/js/topic_load.js

+ 1 - 1
route/api_skin_info.py

@@ -12,4 +12,4 @@ def api_skin_info_2(conn):
     if json_data:    
         return flask.jsonify(json_data)
     else:
-        return flask.jsonify({})
+        return flask.jsonify({}), 404

+ 1 - 1
route/api_topic_sub.py

@@ -32,4 +32,4 @@ def api_topic_sub_2(conn, name, sub, time):
 
         return flask.jsonify(json_data)
     else:
-        return flask.jsonify({})
+        return flask.jsonify({}), 404

+ 1 - 1
route/api_w.py

@@ -15,4 +15,4 @@ def api_w_2(conn, name):
         
             return flask.jsonify(json_data)
         else:
-            return flask.jsonify({})
+            return flask.jsonify({}), 404

+ 2 - 1
route/topic.py

@@ -198,12 +198,13 @@ def topic_2(conn, name, sub):
                 </table>
                 <hr class=\"main_hr\">
             '''
+
             number += 1
 
         if ban != 1 or admin == 1:
             data += '''
                 <div id="plus"></div>
-                <script>topic_load("''' + name + '''", "''' + sub + '''");</script>
+                <script>topic_load("''' + name + '''", "''' + sub + '''", "''' + str(number) + '''");</script>
                 <a id="reload" href="javascript:void(0);" onclick="location.href.endsWith(\'#reload\')? location.reload(true):location.href=\'#reload\'">(''' + load_lang('reload') + ''')</a>
                 <hr class=\"main_hr\">
                 <form style="''' + display + '''" method="post">

+ 13 - 27
views/main_css/js/topic_load.js

@@ -1,34 +1,20 @@
-function topic_load(name, sub) {
-    function addZero(i) {
-        if(i < 10) {
-            i = "0" + i;
-        }
-        
-        return i;
-    }
-
-    setTimeout(function() {
-        var test = setInterval(function() {
-            var d = new Date();
-            d.setSeconds(d.getSeconds() - 3);
-            
-            var date = d.getFullYear() + '-' + addZero(d.getMonth() + 1) + '-' + addZero(d.getDate());
-            date += ' ' + addZero(d.getHours()) + ':' + addZero(d.getMinutes()) + ':' + addZero(d.getSeconds());
+function topic_load(name, sub, num) {
+    var test = setInterval(function() {
+        var url = "/api/topic/" + name + "/sub/" + sub + "?num=" + num;
+        var doc_data = document.getElementById("plus");
 
-            var url = "/api/topic/" + name + "/sub/" + sub + "?time=" + date;
-            var xhr = new XMLHttpRequest();
-            var doc_data = document.getElementById("plus");
+        var xhr = new XMLHttpRequest();
+        xhr.open("GET", url, true);
+        xhr.send(null);
 
-            xhr.open("GET", url, true);
-            xhr.send(null);
-
-            xhr.onreadystatechange = function() {
-                if(this.readyState === 4 && this.status === 200 && this.responseText !== "{}\n") {
-                    doc_data.innerText += '(New)\n\n';
+        xhr.onreadystatechange = function() {
+            if(this.readyState === 4 && this.status === 200) {
+                if(this.responseText) {
+                    doc_data.innerHTML += '<hr class="main_hr">(New)<hr class="main_hr">';
 
                     clearInterval(test);
                 }
             }
-        }, 1000)
-    }, 4000);
+        }
+    }, 2000);
 }