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

Compare commits

base: yagich:0c820183a6fe9abc54c6a059561892400170f221
Branches Tags
yagich:main
yagich:with-docker
..
compare: yagich:2bf5f4faa34d229f44c5ed6beab12a0e9c57aaa2
Branches Tags
yagich:main
yagich:with-docker

No commits in common. "0c820183a6fe9abc54c6a059561892400170f221" and "2bf5f4faa34d229f44c5ed6beab12a0e9c57aaa2" have entirely different histories.
0c820183a6 ... 2bf5f4faa3

5 changed files with 88 additions and 168 deletions
Show Stats Expand all files Collapse all files

26
apps/users.lua
View File

@ -81,23 +81,6 @@ app:get("user", "/:username", function(self)
end end
end end
self.stats = db.query([[
SELECT
COUNT(posts.id) AS post_count,
COUNT(DISTINCT threads.id) AS thread_count,
MAX(threads.title) FILTER (WHERE threads.created_at = latest.created_at) AS latest_thread_title,
MAX(threads.slug) FILTER (WHERE threads.created_at = latest.created_at) AS latest_thread_slug
FROM users
LEFT JOIN posts ON posts.user_id = users.id
LEFT JOIN threads ON threads.user_id = users.id
LEFT JOIN (
SELECT user_id, MAX(created_at) AS created_at
FROM threads
GROUP BY user_id
) latest ON latest.user_id = users.id
WHERE users.id = ?
]], user.id)[1]
self.latest_posts = db.query([[ self.latest_posts = db.query([[
SELECT SELECT
posts.id, posts.created_at, post_history.content, post_history.edited_at, threads.title AS thread_title, topics.name as topic_name, threads.slug as thread_slug posts.id, posts.created_at, post_history.content, post_history.edited_at, threads.title AS thread_title, topics.name as topic_name, threads.slug as thread_slug
@ -315,15 +298,6 @@ app:get("user_inbox", "/:username/inbox", function(self)
self.new_posts = {} self.new_posts = {}
local subscription = Subscriptions:find({user_id = me.id}) local subscription = Subscriptions:find({user_id = me.id})
if subscription then if subscription then
self.all_subscriptions = db.query([[
SELECT threads.title AS thread_title, threads.slug AS thread_slug
FROM
threads
JOIN
subscriptions ON subscriptions.thread_id = threads.id
WHERE
subscriptions.user_id = ?
]], me.id)
local q = [[ local q = [[
WITH thread_metadata AS ( WITH thread_metadata AS (
SELECT SELECT

44
data/static/style.css
View File

@ -145,10 +145,6 @@ body {
overflow: hidden; overflow: hidden;
} }
.post-content.wider {
margin-right: 12.5%;
}
.post-inner { .post-inner {
height: 100%; height: 100%;
} }
@ -222,43 +218,35 @@ blockquote {
background-color: rgb(135.1928346457, 145.0974015748, 123.0025984252); background-color: rgb(135.1928346457, 145.0974015748, 123.0025984252);
} }
.user-info { .user-posts {
display: grid; display: grid;
grid-template-columns: 300px 1fr; grid-template-columns: 200px 1fr;
grid-template-rows: 1fr; grid-template-rows: 1fr;
gap: 0; gap: 0;
grid-template-areas: "user-page-usercard user-page-stats"; grid-auto-flow: row;
grid-template-areas: "user-page-usercard user-posts-container";
border: 2px outset rgb(135.1928346457, 145.0974015748, 123.0025984252);
} }
.user-page-usercard { .user-page-usercard {
grid-area: user-page-usercard; grid-area: user-page-usercard;
display: flex;
flex-direction: column;
align-items: center;
padding: 20px 10px; padding: 20px 10px;
border: 4px outset rgb(217.26, 220.38, 213.42); border: 4px outset rgb(217.26, 220.38, 213.42);
background-color: rgb(143.7039271654, 144.3879625984, 142.8620374016); background-color: rgb(143.7039271654, 144.3879625984, 142.8620374016);
border-right: solid 2px; border-right: solid 2px;
} }
.user-page-stats { .user-posts-container {
grid-area: user-page-stats; grid-area: user-posts-container;
padding: 20px 30px; display: grid;
border: 1px solid black; grid-template-columns: 1fr;
} grid-template-rows: 0.2fr 2.5fr;
gap: 0px 0px;
.user-stats-list { grid-auto-flow: row;
list-style: none; grid-template-areas: "post-info" "post-content";
margin: 0 0 10px 0;
}
.user-page-posts {
border-left: solid 1px black;
border-right: solid 1px black;
border-bottom: solid 1px black;
background-color: #c1ceb1;
}
.user-page-post-preview {
max-height: 200px;
mask-image: linear-gradient(180deg, #000 60%, transparent);
} }
.avatar { .avatar {

46
sass/style.scss
View File

@ -189,10 +189,6 @@ body {
overflow: hidden; overflow: hidden;
} }
.post-content.wider {
margin-right: 12.5%;
}
.post-inner { .post-inner {
height: 100%; height: 100%;
} }
@ -268,44 +264,38 @@ blockquote {
background-color: $dark2; background-color: $dark2;
} }
.user-info { .user-posts {
display: grid; display: grid;
grid-template-columns: 300px 1fr; grid-template-columns: 200px 1fr;
grid-template-rows: 1fr; grid-template-rows: 1fr;
gap: 0; gap: 0;
grid-auto-flow: row;
grid-template-areas: grid-template-areas:
"user-page-usercard user-page-stats"; "user-page-usercard user-posts-container";
border: 2px outset $dark2;
} }
.user-page-usercard { .user-page-usercard {
grid-area: user-page-usercard; grid-area: user-page-usercard;
display: flex;
flex-direction: column;
align-items: center;
padding: 20px 10px; padding: 20px 10px;
border: 4px outset $light; border: 4px outset $light;
background-color: $dark_bg; background-color: $dark_bg;
border-right: solid 2px; border-right: solid 2px;
} }
.user-page-stats { .user-posts-container {
grid-area: user-page-stats; grid-area: user-posts-container;
padding: 20px 30px; display: grid;
border: 1px solid black; grid-template-columns: 1fr;
} grid-template-rows: 0.2fr 2.5fr;
gap: 0px 0px;
.user-stats-list { grid-auto-flow: row;
list-style: none; grid-template-areas:
margin: 0 0 10px 0; "post-info"
} "post-content";
.user-page-posts {
border-left: solid 1px black;
border-right: solid 1px black;
border-bottom: solid 1px black;
background-color: $accent_color;
}
.user-page-post-preview {
max-height: 200px;
mask-image: linear-gradient(180deg,#000 60%,transparent);
} }
.avatar { .avatar {

15
views/user/inbox.etlua
View File

@ -2,21 +2,6 @@
<h1 class="thread-title">Inbox</h1> <h1 class="thread-title">Inbox</h1>
</div> </div>
<div class="inbox-container"> <div class="inbox-container">
<% if not all_subscriptions then %>
You have no subscriptions.<br>
<% else %>
Your subscriptions:
<ul>
<% for _, sub in ipairs(all_subscriptions) do %>
<li><a href="<%= url_for("thread", {slug = sub.thread_slug}) %>"><%= sub.thread_title %></a>
<form class="modform" method="post" action="<%= url_for("thread_subscribe", {slug = sub.thread_slug}) %>">
<input type="hidden" name="subscribe" value="unsubscribe">
<input class="warn" type="submit" value="Unsubscribe">
</form>
</li>
<% end %>
</ul>
<% end %>
<% if #new_posts == 0 then %> <% if #new_posts == 0 then %>
You have no unread posts. You have no unread posts.
<% else %> <% else %>

125
views/user/user.etlua
View File

@ -2,7 +2,10 @@
<% render("views.common.infobox", infobox) %> <% render("views.common.infobox", infobox) %>
<% end %> <% end %>
<div class="darkbg"> <div class="darkbg">
<h1 class="thread-title"><i><%= user.username %></i>'s profile</h1> <h1 class="thread-title">Latest posts by <i><%= user.username %></i></h1>
<div>
User permission: <i><%= PermissionLevelString[user.permission] %></i>
</div>
<% if user_is_me then -%> <% if user_is_me then -%>
<div class="user-actions"> <div class="user-actions">
<a class="linkbutton" href="<%= url_for("user_settings", {username = user.username}) %>">Settings</a> <a class="linkbutton" href="<%= url_for("user_settings", {username = user.username}) %>">Settings</a>
@ -10,81 +13,61 @@
<input class="warn" type="submit" value="Log out"> <input class="warn" type="submit" value="Log out">
</form> </form>
</div> </div>
<% if user:is_guest() then %>
<h2>You are a guest. A Moderator needs to approve your account before you will be able to post.</h2>
<% end %>
<% end %>
<% if me:is_mod() and not user:is_system() then %>
<h1 class="thread-title">Moderator controls</h1>
<% if user:is_guest() then %>
<p>This user is a guest. They signed up on <% render("views.common.timestamp", {timestamp = user.created_at}) -%>.</p>
<form class="modform" method="post" action="<%= url_for("confirm_user", {user_id = user.id}) %>">
<input type="submit" value="Confirm user">
</form>
<% else %> <% --[[ user is not guest ]] %>
<p>This user signed up on <% render("views.common.timestamp", {timestamp = user.created_at}) -%> and was confirmed on <% render("views.common.timestamp", {timestamp = user.confirmed_on}) %>.</p>
<% if user.permission < me.permission then %>
<form class="modform" method="post" action="<%= url_for("guest_user", {user_id = user.id}) %>">
<input class="warn" type="submit" value="Demote user to guest (soft ban)">
</form>
<% end %>
<% if me:is_admin() and not user:is_mod() then %>
<form class="modform" method="post" action="<%= url_for("mod_user", {user_id = user.id}) %>">
<input class="warn" type="submit" value="Promote user to moderator">
</form>
<% elseif user:is_mod() and user.permission < me.permission then %>
<form class="modform" method="post" action="<%= url_for("demod_user", {user_id = user.id}) %>">
<input class="critical" type="submit" value="Demote user to regular user">
</form>
<% end %>
<% end %>
<% end %> <% end %>
</div> </div>
<% --[[ duplicating code, maybe i'll refactor the post subview later to work anywhere <clown emoji>]] %>
<div class="user-info"> <% for i, post in ipairs(latest_posts) do %>
<div class="user-page-usercard"> <div class="user-posts">
<div class="usercard-inner"> <div class="user-page-usercard">
<img class="avatar" src="<%= avatar_url(user) %>"> <img class="avatar" src="<%= avatar_url(user) %>">
<strong class="big"><%= user.username %></strong> <b class="big"><%= user.username %></b>
<% if user.status ~= "" then %> <em class="user-status"><%= user.status %></em>
<em class="user-status"><%= user.status %></em> </div>
<% end %> <div class="user-posts-container">
<% if user.signature_rendered ~= "" then %> <div class="post-info">
Signature: <div><a href="<%= url_for("thread", {slug = post.thread_slug}, {after = post.id}) .. "#post-" .. post.id %>" title="Permalink"><i>
<div> <% if tonumber(post.edited_at) > tonumber(post.created_at) then -%>
<%- user.signature_rendered %> Edited in <%= post.thread_title %> at <% render("views.common.timestamp", {timestamp = post.edited_at}) -%>
</div> <% else -%>
<% end %> Posted in <%= post.thread_title %> on <% render("views.common.timestamp", {timestamp = post.created_at}) -%>
<% end -%>
</i></a></div>
</div>
<div class="post-content">
<%- post.content %>
</div>
</div> </div>
</div> </div>
<div class="user-page-stats"> <% end %>
<ul class="user-stats-list">
<li>Permission: <%= PermissionLevelString[user.permission] %></li> <% if user:is_guest() and user_is_me then %>
<li>Posts created: <%= stats.post_count %></li> <h2>You are a guest. A Moderator needs to approve your account before you will be able to post.</h2>
<li>Threads started: <%= stats.thread_count %></li> <% end %>
<% if stats.latest_thread_title then %>
<li>Latest started thread: <a href="<%= url_for("thread", {slug = stats.latest_thread_slug}) %>"><%= stats.latest_thread_title %></a></li> <% if me:is_mod() and not user:is_system() then %>
<div class="darkbg">
<h1>Moderator controls</h2>
<% if user:is_guest() then %>
<p>This user is a guest. They signed up on <% render("views.common.timestamp", {timestamp = user.created_at}) -%>.</p>
<form class="modform" method="post" action="<%= url_for("confirm_user", {user_id = user.id}) %>">
<input type="submit" value="Confirm user">
</form>
<% else %> <% --[[ user is not guest ]] %>
<p>This user signed up on <% render("views.common.timestamp", {timestamp = user.created_at}) -%> and was confirmed on <% render("views.common.timestamp", {timestamp = user.confirmed_on}) %>.</p>
<% if user.permission < me.permission then %>
<form class="modform" method="post" action="<%= url_for("guest_user", {user_id = user.id}) %>">
<input class="warn" type="submit" value="Demote user to guest (soft ban)">
</form>
<% end %> <% end %>
</ul> <% if me:is_admin() and not user:is_mod() then %>
Latest posts: <form class="modform" method="post" action="<%= url_for("mod_user", {user_id = user.id}) %>">
<div class="user-page-posts"> <input class="warn" type="submit" value="Promote user to moderator">
<% for _, post in ipairs(latest_posts) do %> </form>
<div class="post-content-container"> <% elseif user:is_mod() and user.permission < me.permission then %>
<div class="post-info"> <form class="modform" method="post" action="<%= url_for("demod_user", {user_id = user.id}) %>">
<% local post_url = get_post_url(post.id) %> <input class="critical" type="submit" value="Demote user to regular user">
<a href="<%= post_url %>" title="Permalink"><i> </form>
<% if tonumber(post.edited_at) > tonumber(post.created_at) then -%>
Edited at <% render("views.common.timestamp", {timestamp = post.edited_at}) -%> in <%= post.thread_title %>
<% else -%>
Posted on <% render("views.common.timestamp", {timestamp = post.created_at}) -%> in <%= post.thread_title %>
<% end -%>
</i></a>
</div>
<div class="post-content wider user-page-post-preview">
<div class="post-inner"><%- post.content %></div>
</div>
</div>
<% end %> <% end %>
</div> <% end %>
</div> </div>
</div> <% end %>