yagich/porom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sort threads in topic by activity by default (bump) and add setting

Browse Source
This commit is contained in:
Lera Elvoé 2025-06-01 14:04:45 +03:00
parent 24d6d7cebf
commit b56ab2522c
Signed by: yagich
SSH Key Fingerprint: SHA256:6xjGb6uA7lAVcULa7byPEN//rQ0wPoG+UzYVMfZnbvc
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/topics.lua
View File

@ -94,11 +94,15 @@ app:get("topic", "/:slug", function(self)
topic_id = topic.id topic_id = topic.id
})) }))
self.topic = topic self.topic = topic
local sort_by = self.session.sort_by or "activity"
local order_clause = ""
if sort_by == "thread" then
order_clause = "ORDER BY threads.is_stickied DESC, threads.created_at DESC"
else
order_clause = "ORDER BY threads.is_stickied DESC, latest_post_created_at DESC"
end
self.pages = math.max(math.ceil(threads_count / THREADS_PER_PAGE), 1) local query = [[
self.page = math.max(1, math.min(tonumber(self.params.page) or 1, self.pages))
-- self.threads_list = db.query("SELECT * FROM threads WHERE topic_id = ? ORDER BY is_stickied DESC, created_at DESC", topic.id)
self.threads_list = db.query([[
SELECT SELECT
threads.title, threads.slug, threads.created_at, threads.is_locked, threads.is_stickied, threads.title, threads.slug, threads.created_at, threads.is_locked, threads.is_stickied,
users.username AS started_by, users.username AS started_by,
@ -126,11 +130,11 @@ app:get("topic", "/:slug", function(self)
users u ON u.id = posts.user_id users u ON u.id = posts.user_id
WHERE WHERE
threads.topic_id = ? threads.topic_id = ?
ORDER BY ]] .. order_clause .. " LIMIT ? OFFSET ?"
threads.is_stickied DESC,
threads.created_at DESC self.pages = math.max(math.ceil(threads_count / THREADS_PER_PAGE), 1)
LIMIT ? OFFSET ? self.page = math.max(1, math.min(tonumber(self.params.page) or 1, self.pages))
]], topic.id, THREADS_PER_PAGE, (self.page - 1) * THREADS_PER_PAGE) self.threads_list = db.query(query, topic.id, THREADS_PER_PAGE, (self.page - 1) * THREADS_PER_PAGE)
local user = util.get_logged_in_user_or_transient(self) local user = util.get_logged_in_user_or_transient(self)
self.me = user self.me = user

4
apps/users.lua
View File

@ -261,7 +261,9 @@ app:post("user_settings", "/:username/settings", function(self)
if me.id ~= target_user.id then if me.id ~= target_user.id then
return {redirect_to = self:url_for("user", {username = self.params.username})} return {redirect_to = self:url_for("user", {username = self.params.username})}
end end
if self.params.topic_sort_by == "activity" or self.params.topic_sort_by == "thread" then
self.session.sort_by = self.params.topic_sort_by
end
local status = self.params.status:sub(1, 100) local status = self.params.status:sub(1, 100)
local original_sig = self.params.signature or "" local original_sig = self.params.signature or ""
local rendered_sig = babycode.to_html(original_sig, html_escape) local rendered_sig = babycode.to_html(original_sig, html_escape)

5
views/user/settings.etlua
View File

@ -15,6 +15,11 @@
</div> </div>
</form> </form>
<form method="post" action=""> <form method="post" action="">
<label for="topic_sort_by">Sort threads by:</label>
<select id="topic_sort_by" name="topic_sort_by">
<option value="activity" <%= session.sort_by == "activity" and "selected" %>>Latest activity</option>
<option value="thread" <%= session.sort_by == "thread" and "selected" %>>Thread creation date</option>
</select>
<label for="status">Status</label> <label for="status">Status</label>
<input type="text" id="status" name="status" value="<%= me.status %>" maxlength="70" placeholder="Will be shown under your username. Max 70 characters"> <input type="text" id="status" name="status" value="<%= me.status %>" maxlength="70" placeholder="Will be shown under your username. Max 70 characters">
<label for="babycode-content">Signature</label><br> <label for="babycode-content">Signature</label><br>