SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

[bugfix] update fedi api to support multiple separate votes in same multiple choice poll (#3809)

Browse Source
This commit is contained in:
kim
2025-02-20 10:13:07 +00:00
committed by GitHub
parent 2f5629143d
commit a03a35a5d6
6 changed files with 142 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
internal/gtsmodel/poll.go
View File

@@ -60,8 +60,8 @@ func (p *Poll) Closed() bool {
time.Now().After(p.ClosedAt)
}
// IncrementVotes increments Poll vote and voter counts for given choices.
func (p *Poll) IncrementVotes(choices []int) {
// IncrementVotes increments Poll vote counts for given choices, and voters if 'isNew' is set.
func (p *Poll) IncrementVotes(choices []int, isNew bool) {
if len(choices) == 0 {
return
}
@@ -69,11 +69,13 @@ func (p *Poll) IncrementVotes(choices []int) {
for _, choice := range choices {
p.Votes[choice]++
}
(*p.Voters)++
if isNew {
(*p.Voters)++
}
}
// DecrementVotes decrements Poll vote and voter counts for given choices.
func (p *Poll) DecrementVotes(choices []int) {
// DecrementVotes decrements Poll vote counts for given choices, and voters if 'withVoter' is set.
func (p *Poll) DecrementVotes(choices []int, withVoter bool) {
if len(choices) == 0 {
return
}
@@ -83,7 +85,8 @@ func (p *Poll) DecrementVotes(choices []int) {
p.Votes[choice]--
}
}
if (*p.Voters) != 0 {
if (*p.Voters) != 0 &&
withVoter {
(*p.Voters)--
}
}