mirror of
https://github.com/JamesClarke7283/proposals.git
synced 2025-03-21 16:01:23 +00:00
Hopefully comments are fixed now
This commit is contained in:
parent
ea0495105f
commit
3d362341d5
1 changed files with 13 additions and 28 deletions
41
init.lua
41
init.lua
|
@ -77,20 +77,15 @@ 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
|
||||||
-- 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 has_commented = proposal.comments[player_name] ~= nil
|
||||||
local can_edit = is_author or player_has_privilege
|
|
||||||
|
|
||||||
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 .. "]" ..
|
||||||
|
@ -98,49 +93,39 @@ local function show_proposal_details(player_name, proposal_index)
|
||||||
"label[0.5,4;Votes: Yes(" .. proposal.votes.yes .. ") No(" .. proposal.votes.no .. ") Abstain(" .. proposal.votes.abstain .. ")]" ..
|
"label[0.5,4;Votes: Yes(" .. proposal.votes.yes .. ") No(" .. proposal.votes.no .. ") Abstain(" .. proposal.votes.abstain .. ")]" ..
|
||||||
"button[0.5,5;2,1;vote_yes;Vote Yes]" ..
|
"button[0.5,5;2,1;vote_yes;Vote Yes]" ..
|
||||||
"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]" ..
|
||||||
|
"label[0.5,6;Comments:]"
|
||||||
-- Comments section
|
|
||||||
formspec = formspec .. "label[0.5,6;Comments:]"
|
|
||||||
|
|
||||||
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 .. ":\n" .. 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$", "")
|
comments_str = comments_str:gsub("\n\n$", "")
|
||||||
|
|
||||||
-- Comments textarea with a scrollbar
|
-- Scrollable area for comments
|
||||||
formspec = formspec .. "scroll_container[0.5,6.5;11,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 .. ";true]" ..
|
"textarea[0.25,0.25;10.5,4;;;" .. minetest.formspec_escape(comments_str) .. ";true]" ..
|
||||||
"scroll_container_end[]"
|
"scroll_container_end[]"
|
||||||
|
|
||||||
-- Add Comment button only if the player has not commented yet
|
if not is_author then
|
||||||
if not has_commented and player_name ~= proposal.author then
|
if not has_commented then
|
||||||
formspec = formspec .. "button[0.5,10;3,1;add_comment;Add Comment]"
|
formspec = formspec .. "button[0.5,10;3,1;add_comment;Add Comment]"
|
||||||
|
else
|
||||||
|
formspec = formspec .. "button[0.5,10;3,1;edit_my_comment;Edit My Comment]" ..
|
||||||
|
"button[4,10;3,1;delete_my_comment;Delete My Comment]"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Edit and Delete Comment buttons only if the player has commented
|
if player_has_privilege or is_author 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
|
||||||
|
|
||||||
-- Back button
|
|
||||||
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)
|
||||||
end
|
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]
|
||||||
|
|
Loading…
Add table
Reference in a new issue