From dd64c07d53a844d8e25b04ccee934be82106a2b0 Mon Sep 17 00:00:00 2001 From: Brandon T Date: Thu, 4 Feb 2016 15:27:30 -0800 Subject: [PATCH] Purge Position Changed Page Count into Purge Position for /f/, since /f/ is always only 1 page. ccd0: minor changes to port to 4chan X, license update --- LICENSE | 2 +- src/Monitoring/ThreadStats.coffee | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/LICENSE b/LICENSE index 7017ab4cf..9aa97ee54 100644 --- a/LICENSE +++ b/LICENSE @@ -4,7 +4,7 @@ * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE * -* Appchan X Copyright © 2013-2015 Zixaphir +* Appchan X Copyright © 2013-2016 Zixaphir * http://zixaphir.github.io/appchan-x/ * 4chan x Copyright © 2009-2011 James Campos * https://github.com/aeosynth/4chan-x diff --git a/src/Monitoring/ThreadStats.coffee b/src/Monitoring/ThreadStats.coffee index fedb7ad88..d27625e75 100644 --- a/src/Monitoring/ThreadStats.coffee +++ b/src/Monitoring/ThreadStats.coffee @@ -5,11 +5,11 @@ ThreadStats = statsHTML = <%= html( '? / ?' + '?{Conf["IP Count in Stats"]}{ / ?}' + - '?{Conf["Page Count in Stats"] && g.BOARD.ID !== "f"}{ / ?}' + '?{Conf["Page Count in Stats"]}{ / ?}' ) %> statsTitle = 'Posts / Files' statsTitle += ' / IPs' if Conf['IP Count in Stats'] - statsTitle += ' / Page' if Conf['Page Count in Stats'] and g.BOARD.ID isnt 'f' + statsTitle += (if g.BOARD.ID is 'f' then ' / Purge Position' else ' / Page') if Conf['Page Count in Stats'] if Conf['Updater and Stats in Header'] @dialog = sc = $.el 'span', @@ -56,7 +56,7 @@ ThreadStats = return unless ThreadStats.pageCountEl if newPosts.length ThreadStats.lastPost = g.posts[newPosts[newPosts.length - 1]].info.date - if ThreadStats.pageCountEl?.textContent isnt '1' + if g.BOARD.ID isnt 'f' and ThreadStats.pageCountEl?.textContent isnt '1' ThreadStats.fetchPage() update: (postCount, fileCount, ipCount) -> @@ -82,17 +82,24 @@ ThreadStats = onThreadsLoad: -> if @status is 200 for page in @response - for thread in page.threads when thread.no is ThreadStats.thread.ID - ThreadStats.pageCountEl.textContent = page.page - (if page.page is @response.length then $.addClass else $.rmClass) ThreadStats.pageCountEl, 'warning' - ThreadStats.lastPageUpdate = new Date thread.last_modified * $.SECOND - ThreadStats.retry() - return + if g.BOARD.ID is 'f' + purgePos = 1 + for thread in page.threads + if thread.no < ThreadStats.thread.ID + purgePos++ + ThreadStats.pageCountEl.textContent = purgePos + else + for thread in page.threads when thread.no is ThreadStats.thread.ID + ThreadStats.pageCountEl.textContent = page.page + (if page.page is @response.length then $.addClass else $.rmClass) ThreadStats.pageCountEl, 'warning' + ThreadStats.lastPageUpdate = new Date thread.last_modified * $.SECOND + ThreadStats.retry() + return else if @status is 304 ThreadStats.retry() retry: -> # If thread data is stale (modification date given < time of last post), try again. - if ThreadStats.lastPost > ThreadStats.lastPageUpdate and ThreadStats.pageCountEl?.textContent isnt '1' + if g.BOARD.ID isnt 'f' and ThreadStats.lastPost > ThreadStats.lastPageUpdate and ThreadStats.pageCountEl?.textContent isnt '1' clearTimeout ThreadStats.timeout ThreadStats.timeout = setTimeout ThreadStats.fetchPage, 5 * $.SECOND