Autorefresh en home

8 files changed, 65 insertions, 58 deletions

diff --git a/cgi/api.py b/cgi/api.py
index 871e88f..e6968f8 100644
--- a/cgi/api.py
+++ b/cgi/api.py
@@ -93,18 +93,19 @@ def api_process(self, path_split):
         data_limit = formdata.get('limit')
         data_time = formdata.get('time', 0)
 
-        limit = 30
-
         if data_limit:
             try:
                 limit = int(data_limit)
             except ValueError:
                 raise APIError("Limit must be numeric")
 
-        if limit > 50:
-            raise APIError("Maximum limit is 50")
+        if limit > 30:
+            raise APIError("Maximum limit is 30")
+
+        threads = getLastAge(0, limit)
+        threads += getLastAge(1, limit)
+        threads = sorted(threads, key=lambda b:b['bumped'], reverse=True)
 
-        threads = getLastAge(limit)
         if threads[0]['bumped'] > int(data_time):
             values['threads'] = threads
         else:
diff --git a/cgi/post.py b/cgi/post.py
index c53e8a1..96b7cab 100644
--- a/cgi/post.py
+++ b/cgi/post.py
@@ -1080,11 +1080,13 @@ def cut_msg(message, limit):
 def getLastAge(board_type, limit):
   threads = []
   
+  sql = "SELECT posts.id, boards.name AS board_name, boards.subname AS board_abr, board_type, boards.dir, timestamp, bumped, length, CASE WHEN posts.subject = boards.subject THEN posts.message ELSE posts.subject END AS content FROM posts INNER JOIN boards ON boardid = boards.id WHERE parentid = 0 AND IS_DELETED = 0 AND boards.secret = 0 AND posts.locked < 3"
+
   if board_type in [0, 1]:
-    sql = "SELECT posts.id, boards.name AS board_fulln, boards.subname AS board_name, board_type, boards.dir, timestamp, length, CASE WHEN posts.subject = boards.subject THEN posts.message ELSE posts.subject END AS content FROM posts INNER JOIN boards ON boardid = boards.id WHERE parentid = 0 AND IS_DELETED = 0 AND boards.secret = 0 AND posts.locked < 3 AND boards.board_type = %s ORDER BY bumped DESC LIMIT %s"
+    sql += " AND boards.board_type = %s ORDER BY bumped DESC LIMIT %s"
     threads = FetchAll(sql, (board_type, limit) )
   else:
-    sql = "SELECT posts.id, boards.name AS board_fulln, boards.subname AS board_name, board_type, boards.dir, timestamp, length, CASE WHEN posts.subject = boards.subject THEN posts.message ELSE posts.subject END AS content FROM posts INNER JOIN boards ON boardid = boards.id WHERE parentid = 0 AND IS_DELETED = 0 AND boards.secret = 0 AND posts.locked < 3 ORDER BY bumped DESC LIMIT %s"
+    sql += " ORDER BY bumped DESC LIMIT %s"
     threads = FetchAll(sql, (limit,) )
  
   for post in threads:
@@ -1098,7 +1100,7 @@ def getLastAge(board_type, limit):
   return threads
 
 def getNewPosts(limit, rss=False):
-  sql = "SELECT posts.id, parentid, boardid, boards.name AS board_fulln, board_type, boards.dir, timestamp, posts.message FROM posts INNER JOIN boards ON posts.boardid = boards.id WHERE IS_DELETED = 0 AND boards.secret = 0 ORDER BY timestamp DESC LIMIT %s"
+  sql = "SELECT posts.id, parentid, boardid, boards.name AS board_name, board_type, boards.dir, timestamp, posts.message FROM posts INNER JOIN boards ON posts.boardid = boards.id WHERE IS_DELETED = 0 AND boards.secret = 0 ORDER BY timestamp DESC LIMIT %s"
   posts = FetchAll(sql, (limit,))
 
   for post in posts:
@@ -1106,6 +1108,7 @@ def getNewPosts(limit, rss=False):
     
     if rss:
       post['timestamp_formatted'] = datetime.datetime.fromtimestamp(post['timestamp']).strftime('%Y-%m-%dT%H:%M:%S%Z')
+      post['content'] = cut_msg(post['message'], 100)
         
     if post['board_type'] == 1:
       post['url'] = '/%s/read/%d/l10' % (post['dir'], getParentTimestamp(post) or post['timestamp'])
@@ -1116,7 +1119,7 @@ def getNewPosts(limit, rss=False):
   
 def getNewThreads(limit):
   threads = []
-  sql = "SELECT posts.id, boards.name AS board_fulln, boards.subname AS board_name, board_type, boards.dir, timestamp, CASE WHEN posts.subject = boards.subject THEN posts.message ELSE posts.subject END AS content FROM posts INNER JOIN boards ON boardid = boards.id WHERE parentid = 0 AND IS_DELETED = 0 AND boards.secret = 0 AND boards.id <> 13 AND posts.locked = 0 ORDER BY timestamp DESC LIMIT %s"
+  sql = "SELECT posts.id, boards.name AS board_name, boards.subname AS board_abr, board_type, boards.dir, timestamp, CASE WHEN posts.subject = boards.subject THEN posts.message ELSE posts.subject END AS content FROM posts INNER JOIN boards ON boardid = boards.id WHERE parentid = 0 AND IS_DELETED = 0 AND boards.secret = 0 AND boards.id <> 13 AND posts.locked = 0 ORDER BY timestamp DESC LIMIT %s"
   threads = FetchAll(sql, (limit,) )
   
   for post in threads:
@@ -1158,7 +1161,7 @@ def regenerateHome():
     f.close()
   
   if Settings.ENABLE_RSS:
-    rss_rendered = renderTemplate('home.rss', {'posts': getNewPosts(10, True)} )
+    rss_rendered = renderTemplate('feed.rss', {'posts': getNewPosts(10, True)} )
     f = open(Settings.HOME_DIR + "bai.rss", "w")
     try:
       f.write(rss_rendered)
diff --git a/cgi/templates/feed.rss b/cgi/templates/feed.rss
new file mode 100644
index 0000000..dfce578
--- /dev/null
+++ b/cgi/templates/feed.rss
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>

+<rss version="2.0">

+  <channel>

+   <title>Bienvenido a Internet BBS/IB</title>

+   <link>https://bienvenidoainternet.org/</link>

+   <description>El BBS/IB más activo de la esfera hispana.</description>

+   <language>es</language>

+   <webMaster>burocracia@bienvenidoainternet.org (Staff ★)</webMaster>

+   <image>

+     <url>https://bienvenidoainternet.org/rss_logo.png</url>

+     <title>Bienvenido a Internet BBS/IB</title>

+     <link>https://bienvenidoainternet.org/</link>

+     <width>144</width>

+     <height>144</height>

+   </image>

+   <?py for post in posts: ?>

+      <item>

+        <title>${post['board_name']}: #{post['content']}</title>

+        <pubDate>${post['timestamp_formatted']}</pubDate>

+        <link>https://bienvenidoainternet.org#{post['url']}</link>

+        <description>${post['content']}</description>

+      </item>

+   <?py #endfor ?>

+  </channel>

+</rss>

diff --git a/cgi/templates/home.html b/cgi/templates/home.html
index d60b719..b5d932b 100644
--- a/cgi/templates/home.html
+++ b/cgi/templates/home.html
@@ -73,25 +73,29 @@
 </tr>
 <tr>
   <td rowspan="2" class="tab">
-    <h2 id="newposts">Hilos activos <div id="counter"></div></h2>
-    <h4>BBS</h4>
-    <div id="postlist" class="threads">
+    <h2 id="newposts">Hilos activos <a href="bai.rss" target="_blank"><img src="/feed.png" style="width:12px;height:12px;"></a></h2>
+      <h4>BBS</h4>
+      <div id="postlistbbs" class="threads">
       <?py for thread in latest_age_bbs: ?>
-        <a href="${thread['url']}" class="thread"><span class="brd">[${thread['board_name']}:${'%03d' % thread['length']}]</span> #{thread['content']}</a>
+        <a href="${thread['url']}" class="thread"><span class="brd">[${thread['board_abr']}:${'%03d' % thread['length']}]</span> #{thread['content']}</a>
       <?py #endfor ?>
-    </div>
-    <hr />
-    <h4>IB</h4>
-    <div id="postlist" class="threads">
+      </div>
+      <hr />
+      <h4>IB</h4>
+      <div id="postlistib" class="threads">
       <?py for thread in latest_age_ib: ?>
-        <a href="${thread['url']}" class="thread"><span class="brd">[${thread['board_name']}:${'%03d' % thread['length']}]</span> #{thread['content']}</a>
+        <a href="${thread['url']}" class="thread"><span class="brd">[${thread['board_abr']}:${'%03d' % thread['length']}]</span> #{thread['content']}</a>
       <?py #endfor ?>
+      </div>
+      <hr />
+      <div id="ctrl"><a id="refresh" href="/home.html">Actualizar</a>
+      <span>
+        <input id="autorefresh" type="checkbox" /><label for="autorefresh">Automático</label>
+        <span id="counter"></span>
+      </span>
+      <span><input id="autosound" type="checkbox" checked="checked" disabled="disabled" /><label for="autosound">Sonido</label><audio id="machina"><source src="msn.ogg" type="audio/ogg" /></audio></span>
+      <input type="hidden" name="limit" id="limit" value="#{latest_age_num}" />
     </div>
-    <hr />
-    <div id="ctrl"><a id="refresh" href="/home.html">Actualizar</a>
-    <span><input id="autorefresh" type="checkbox" /><label for="autorefresh">Automático</label><audio id="machina"><source src="msn.ogg" type="audio/ogg" /></audio></span>
-    <span><input id="autosound" type="checkbox" checked="checked" disabled="disabled" /><label for="autosound">Sonido</label><input type="hidden" name="limit" id="limit" value="#{latest_age_num}" /></span>
-    <a href="bai.rss"><img src="/rss.png" style="width:12px;height:12px;margin-right:4px;">RSS</a></div>
   </td>
   <td id="newstab" class="tab">
     <h2>Blotter</h2>
@@ -107,7 +111,7 @@
     <h2>Hilos nuevos</h2>
     <div id="new_ib" class="threads">
     <?py for thread in new_threads: ?>
-      <a href="${thread['url']}" class="thread"><span class="brd">[${thread['board_name']}]</span> #{thread['content']}</a>
+      <a href="${thread['url']}" class="thread"><span class="brd">[${thread['board_abr']}]</span> #{thread['content']}</a>
     <?py #endfor ?>
     </div>
   </td>
diff --git a/cgi/templates/home.rss b/cgi/templates/home.rss
deleted file mode 100644
index 1e5f552..0000000
--- a/cgi/templates/home.rss
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>

-<rss version="2.0">

- <channel>

-  <title>Bienvenido a Internet BBS/IB</title>

-  <link>https://bienvenidoainternet.org/</link>

-  <description>El BBS/IB más activo de la esfera hispana.</description>

-  <language>es</language>

-  <webMaster>burocracia@bienvenidoainternet.org (Staff ★)</webMaster>

-  <image>

-    <url>https://bienvenidoainternet.org/rss_logo.png</url>

-    <title>Bienvenido a Internet BBS/IB</title>

-    <link>https://bienvenidoainternet.org/</link>

-    <width>144</width>

-    <height>144</height>

-  </image>

-<?py for post in posts: ?>

-  <item>

-   <title>${post['board_fulln']}: #{post['content']}</title>

-   <pubDate>${post['timestamp_formatted']}</pubDate>

-   <link>https://bienvenidoainternet.org#{post['url']}</link>

-   <description>${post['message']}</description>

-  </item>

-<?py #endfor ?>

- </channel>

-</rss>

diff --git a/cgi/templates/mobile/latest.html b/cgi/templates/mobile/latest.html
index 50fae25..8156e69 100644
--- a/cgi/templates/mobile/latest.html
+++ b/cgi/templates/mobile/latest.html
@@ -8,13 +8,13 @@
 <div class="list">
   <h3 style="text-align:center">BBS</h3>
   <?py for thread in latest_age_bbs: ?>
-	<a href="/cgi/mobileread${thread['url']}">#{thread['content']}<div>${thread['board_fulln']} <span>R:<span>#{int(thread['length'])-1}</span></span></div></a>
+	<a href="/cgi/mobileread${thread['url']}">#{thread['content']}<div>${thread['board_name']} <span>R:<span>#{int(thread['length'])-1}</span></span></div></a>
   <?py #endfor ?>
 </div>
 <div class="list">
   <h3 style="text-align:center">IB</h3>
   <?py for thread in latest_age_ib: ?>
-	<a href="/cgi/mobileread${thread['url']}">#{thread['content']}<div>${thread['board_fulln']} <span>R:<span>#{int(thread['length'])-1}</span></span></div></a>
+	<a href="/cgi/mobileread${thread['url']}">#{thread['content']}<div>${thread['board_name']} <span>R:<span>#{int(thread['length'])-1}</span></span></div></a>
   <?py #endfor ?>
 </div>
 </body>
diff --git a/cgi/templates/mobile/newest.html b/cgi/templates/mobile/newest.html
index 37fd67f..76da88b 100644
--- a/cgi/templates/mobile/newest.html
+++ b/cgi/templates/mobile/newest.html
@@ -7,8 +7,8 @@
 <div class="bar"><a href="//m.bienvenidoainternet.org">Secciones</a><a href="/cgi/mobilehome">Hilos activos</a><a href="/cgi/mobilenewest" class="sel">Nuevos hilos</a></div>
 <div class="list">
   <?py for thread in newthreads: ?>
-  <a href="/cgi/mobileread${thread['url']}">#{thread['content']}<div>${thread['board_fulln']}</div></a>
+  <a href="/cgi/mobileread${thread['url']}">#{thread['content']}<div>${thread['board_name']}</div></a>
   <?py #endfor ?>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/cgi/weabot.py b/cgi/weabot.py
index 48f19f5..3ecf0f3 100755
--- a/cgi/weabot.py
+++ b/cgi/weabot.py
@@ -235,8 +235,8 @@ class weabot(object):
                 self.output = renderTemplate('txt_newthread.html', {}, True)
             elif path_split[1] == "mobilehome":
                 OpenDb()
-                latest_age_ib = getLastAge(0, Settings.HOME_LASTPOSTS)
-                latest_age_bbs = getLastAge(1, Settings.HOME_LASTPOSTS)
+                latest_age_ib = getLastAge(0, 10)
+                latest_age_bbs = getLastAge(1, 10)
                 for threads in latest_age_ib:
                     content = threads['url']
                     content = content.replace('/read/', '/')
@@ -261,8 +261,7 @@ class weabot(object):
                     content = content.replace('.html', '')
                     threads['url'] = content
                 caught = True
-                self.output = renderTemplate(
-                    'newest.html', {'newthreads': newthreads}, True)
+                self.output = renderTemplate('newest.html', {'newthreads': newthreads}, True)
             elif path_split[1] == "mobileread":
                 OpenDb()
                 board = setBoard(path_split[2])