From c7571c0151270e0591311f0d7650100f13f09b50 Mon Sep 17 00:00:00 2001 From: SirOlaf <34164198+SirOlaf@users.noreply.github.com> Date: Fri, 23 Aug 2024 11:14:49 +0200 Subject: [PATCH 1/3] Don't include deleted posts in rss feed --- src/main.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.tmpl b/src/main.tmpl index 3d4f8c21..7ba39855 100644 --- a/src/main.tmpl +++ b/src/main.tmpl @@ -16,7 +16,7 @@ # strftime('%Y-%m-%dT%H:%M:%SZ', (A.modified)), # COUNT(B.id), C.name, B.content, B.id # FROM thread AS A, post AS B, person AS C -# WHERE A.id = b.thread AND B.author = C.id +# WHERE NOT A.isDeleted AND A.id = b.thread AND B.author = C.id # GROUP BY B.thread # ORDER BY modified DESC LIMIT ?""" # const threadId = 0 @@ -63,7 +63,7 @@ ${xmlEncode(rstToHtml(!postContent))} # strftime('%Y-%m-%dT%H:%M:%SZ', A.creation), # A.creation, COUNT(C.id) # FROM post AS A, person AS B, post AS C, thread AS T -# WHERE A.author = B.id AND A.thread = C.thread AND C.id <= A.id +# WHERE NOT T.isDeleted AND A.author = B.id AND A.thread = C.thread AND C.id <= A.id # AND T.id = A.thread # GROUP BY A.id # ORDER BY A.creation DESC LIMIT 10""" From 41b7e37e953c0267679ea89ec1fbb63b2c08d322 Mon Sep 17 00:00:00 2001 From: SirOlaf <34164198+SirOlaf@users.noreply.github.com> Date: Fri, 23 Aug 2024 11:34:35 +0200 Subject: [PATCH 2/3] Check post as well --- src/main.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.tmpl b/src/main.tmpl index 7ba39855..a2f4116f 100644 --- a/src/main.tmpl +++ b/src/main.tmpl @@ -63,7 +63,7 @@ ${xmlEncode(rstToHtml(!postContent))} # strftime('%Y-%m-%dT%H:%M:%SZ', A.creation), # A.creation, COUNT(C.id) # FROM post AS A, person AS B, post AS C, thread AS T -# WHERE NOT T.isDeleted AND A.author = B.id AND A.thread = C.thread AND C.id <= A.id +# WHERE NOT T.isDeleted AND NOT A.isDeleted AND A.author = B.id AND A.thread = C.thread AND C.id <= A.id # AND T.id = A.thread # GROUP BY A.id # ORDER BY A.creation DESC LIMIT 10""" From 947f1a0b7ac13f1cfb161cb61c0007ec20021324 Mon Sep 17 00:00:00 2001 From: SirOlaf <34164198+SirOlaf@users.noreply.github.com> Date: Fri, 23 Aug 2024 12:24:03 +0200 Subject: [PATCH 3/3] Make feeds discoverable --- public/karax.html | 2 ++ src/main.tmpl | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/public/karax.html b/public/karax.html index 3f7f41b3..f1686d5b 100644 --- a/public/karax.html +++ b/public/karax.html @@ -11,6 +11,8 @@ + + diff --git a/src/main.tmpl b/src/main.tmpl index a2f4116f..8cfd6200 100644 --- a/src/main.tmpl +++ b/src/main.tmpl @@ -2,13 +2,6 @@ #template `!`(idx: untyped): untyped = # row[idx] #end template -#proc genRSSHeaders(c: TForumData): string = -# result = "" - - -#end proc # #proc genThreadsRSS(c: TForumData): string = # result = ""