sixam/proposals
1
0
Fork 0
mirror of https://github.com/JamesClarke7283/proposals.git synced 2025-03-21 16:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Another fix for comments

Browse source
This commit is contained in:
James David Clarke 2023-12-23 20:35:25 +00:00
parent 4693df0f6f
commit ea0495105f
No known key found for this signature in database
GPG key ID: 9F5ECFD0E20F1C4C
1 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
init.lua
View file

@ -80,16 +80,18 @@ end
-- Function to show proposal details and voting options, with delete and edit buttons for the author or admin -- Function to show proposal details and voting options, with delete and edit buttons for the author or admin
-- Function to show proposal details and voting options, with delete and edit buttons for the author or admin -- Function to show proposal details and voting options, with delete and edit buttons for the author or admin
-- Function to show proposal details and voting options, with delete and edit buttons for the author or admin -- Function to show proposal details and voting options, with delete and edit buttons for the author or admin
-- Function to show proposal details and voting options, with delete and edit buttons for the author or admin
local function show_proposal_details(player_name, proposal_index) local function show_proposal_details(player_name, proposal_index)
local proposal = proposals[proposal_index] local proposal = proposals[proposal_index]
if not proposal then return end if not proposal then return end
proposal.comments = proposal.comments or {} proposal.comments = proposal.comments or {}
local player_has_privilege = minetest.check_player_privs(player_name, {proposals_admin=true}) local player_has_privilege = minetest.check_player_privs(player_name, {proposals_admin=true})
local is_author = proposal.author == player_name local is_author = proposal.author == player_name
local has_commented = proposal.comments[player_name] ~= nil
local can_edit = is_author or player_has_privilege
-- Starting formspec layout
local formspec = "size[12,12]" .. local formspec = "size[12,12]" ..
"label[0.5,0.5;" .. minetest.formspec_escape(proposal.title) .. " by " .. proposal.author .. "]" .. "label[0.5,0.5;" .. minetest.formspec_escape(proposal.title) .. " by " .. proposal.author .. "]" ..
"textarea[0.5,1.5;11,2;;" .. minetest.formspec_escape(proposal.description) .. ";]" .. "textarea[0.5,1.5;11,2;;" .. minetest.formspec_escape(proposal.description) .. ";]" ..
@ -98,37 +100,39 @@ local function show_proposal_details(player_name, proposal_index)
"button[3,5;2,1;vote_no;Vote No]" .. "button[3,5;2,1;vote_no;Vote No]" ..
"button[5.5,5;2,1;vote_abstain;Abstain]" "button[5.5,5;2,1;vote_abstain;Abstain]"
-- Comments title -- Comments section
formspec = formspec .. "label[0.5,6;Comments:]" formspec = formspec .. "label[0.5,6;Comments:]"
-- Comment box and scrollbar
local comments_str = "" local comments_str = ""
for commenter, comment in pairs(proposal.comments) do for commenter, comment in pairs(proposal.comments) do
comments_str = comments_str .. commenter .. ": " .. minetest.formspec_escape(comment) .. "\n\n" comments_str = comments_str .. commenter .. ":\n" .. comment .. "\n\n"
end end
-- Trim the final newlines
comments_str = comments_str:gsub("\n\n$", "")
formspec = formspec .. "box[0.5,6.5;11,3;#FFF]" .. -- Comments textarea with a scrollbar
"scroll_container[0.5,6.5;10.8,3;scrollbar;vertical]" .. formspec = formspec .. "scroll_container[0.5,6.5;11,3;scrollbar;vertical]" ..
"textarea[0.25,0.25;10.5,4;;;" .. comments_str .. "]" .. "textarea[0.25,0.25;10.5,4;;;" .. comments_str .. ";true]" ..
"scroll_container_end[]" "scroll_container_end[]"
-- Edit and Delete buttons for comments at the bottom (outside of the scroll container) -- Add Comment button only if the player has not commented yet
if player_has_privilege then if not has_commented and player_name ~= proposal.author then
formspec = formspec .. "button[0.5,9.75;3,1;edit_comment;Edit Comment]" .. formspec = formspec .. "button[0.5,10;3,1;add_comment;Add Comment]"
"button[4,9.75;3,1;delete_comment;Delete Comment]"
end end
-- Additional buttons if the player has privileges or is the author -- Edit and Delete Comment buttons only if the player has commented
if is_author or player_has_privilege then if has_commented and not can_edit then
formspec = formspec .. "button[9,10;3,1;edit_comment;Edit Comment]" ..
"button[9,11;3,1;delete_comment;Delete Comment]"
end
-- Edit Proposal and Delete Proposal buttons if the player has privileges or is the author
if can_edit then
formspec = formspec .. "button[0.5,11;3,1;edit_proposal;Edit Proposal]" .. formspec = formspec .. "button[0.5,11;3,1;edit_proposal;Edit Proposal]" ..
"button[4,11;3,1;delete_proposal;Delete Proposal]" "button[4,11;3,1;delete_proposal;Delete Proposal]"
end end
-- Add comment button only for non-authors -- Back button
if player_name ~= proposal.author then
formspec = formspec .. "button[0.5,10.5;3,1;add_comment;Add Comment]"
end
formspec = formspec .. "button[9,11;3,1;back;Back]" formspec = formspec .. "button[9,11;3,1;back;Back]"
minetest.show_formspec(player_name, "vote_changes:proposal_" .. proposal_index, formspec) minetest.show_formspec(player_name, "vote_changes:proposal_" .. proposal_index, formspec)
@ -136,6 +140,7 @@ end
-- Function to show the edit proposal formspec -- Function to show the edit proposal formspec
local function show_edit_proposal_formspec(player_name, proposal_index) local function show_edit_proposal_formspec(player_name, proposal_index)
local proposal = proposals[proposal_index] local proposal = proposals[proposal_index]