Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions pollbot/pollbot/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"time"

"github.com/keybase/go-keybase-chat-bot/kbchat"
"github.com/keybase/go-keybase-chat-bot/kbchat/types/chat1"
"github.com/keybase/managed-bots/base"
)

Expand Down Expand Up @@ -91,14 +92,25 @@ func (h *HTTPSrv) handleVote(w http.ResponseWriter, r *http.Request) {
// WithoutCancel: the browser submits the vote and may close the connection;
// DB writes and poll result updates must complete regardless.
ctx := context.WithoutCancel(r.Context())
if err := h.db.CastVote(ctx, username, vote); err != nil {
h.Errorf("failed to cast vote: %s", err)
convID, resultMsgID, numChoices, err := h.db.GetPollInfo(ctx, vote.ID)
if err != nil {
h.Errorf("failed to find poll result msg: %s", err)
h.showError(w)
return
}
convID, resultMsgID, numChoices, err := h.db.GetPollInfo(ctx, vote.ID)
members, err := h.kbc.ListMembersByConvID(convID)
if err != nil {
h.Errorf("failed to find poll result msg: %s", err)
h.Errorf("failed to list conv members: %s", err)
h.showError(w)
return
}
if !isConvMember(members, username) {
h.Debug("vote rejected: %s is not a member of %s", username, convID)
h.showError(w)
return
}
if err := h.db.CastVote(ctx, username, vote); err != nil {
h.Errorf("failed to cast vote: %s", err)
h.showError(w)
return
}
Expand Down Expand Up @@ -149,3 +161,17 @@ func (h *HTTPSrv) handleImage(w http.ResponseWriter, r *http.Request) {
}

func (h *HTTPSrv) handleHealthCheck(_ http.ResponseWriter, _ *http.Request) {}

func isConvMember(members chat1.ChatMembersDetails, username string) bool {
allMembers := [][]chat1.ChatMemberDetails{
members.Owners, members.Admins, members.Writers, members.Readers,
}
for _, group := range allMembers {
for _, m := range group {
if m.Username == username {
return true
}
}
}
return false
}
3 changes: 1 addition & 2 deletions triviabot/triviabot/session.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

"github.com/keybase/go-keybase-chat-bot/kbchat"
"github.com/keybase/go-keybase-chat-bot/kbchat/types/chat1"
"github.com/keybase/go-keybase-chat-bot/kbchat/types/keybase1"
"github.com/keybase/managed-bots/base"
)

Expand Down Expand Up @@ -218,14 +217,14 @@
// ignore bot users here
s.numUsersInConv = len(res.Owners) + len(res.Admins) + len(res.Writers) + len(res.Readers)
// If we're not a bot member exclude us from the member count.
if !s.isBotRole(res) {

Check failure on line 220 in triviabot/triviabot/session.go

View workflow job for this annotation

GitHub Actions / test (1.25.x, ubuntu-latest)

cannot use res (variable of struct type keybase1.TeamMembersDetails) as chat1.ChatMembersDetails value in argument to s.isBotRole (typecheck)
s.numUsersInConv--
}
}
return nil
}

func (s *session) isBotRole(members keybase1.TeamMembersDetails) bool {
func (s *session) isBotRole(members chat1.ChatMembersDetails) bool {
for _, member := range append(members.Bots, members.RestrictedBots...) {
if member.Username == s.kbc.GetUsername() {
return true
Expand Down
Loading