Skip to content

Fix signin error #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
c0unts merged 4 commits into from
Oct 21, 2025
Merged

Fix signin error #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8d21ba
reuse is dumb and tiring
c0unts Oct 21, 2025
6a59f7b
make it so the interaction can survive 3 second timers
c0unts Oct 21, 2025
bc0fedf
Fixed using wrong interaction
c0unts Oct 21, 2025
e8b4235
Merge branch 'main' into signin-error
c0unts Oct 21, 2025
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
65 changes: 26 additions & 39 deletions commands/slash/signin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,18 @@ func Signin() (*discordgo.ApplicationCommand, func(s *discordgo.Session, i *disc

entSigninType := helpers.StringToType(signinType)

// Notify sign-in creator that sign-in message was created
err = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Content: "Creating signin and signing in for you...",
Flags: discordgo.MessageFlagsEphemeral,
},
})
if err != nil {
logging.Error(s, err.Error(), i.Member.User, span, logrus.Fields{"error": err})
}

// Check if sign-in creator has already signed in
recentSignin, err := data.Signin.RecentSignin(i.Member.User.ID, entSigninType, span.Context())
if err != nil {
Expand Down Expand Up @@ -166,6 +178,17 @@ func Signin() (*discordgo.ApplicationCommand, func(s *discordgo.Session, i *disc
)
defer span.Finish()

err = s.InteractionRespond(j.Interaction, &discordgo.InteractionResponse{
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Content: "Signing in for you...",
Flags: discordgo.MessageFlagsEphemeral,
},
})
if err != nil {
logging.Error(s, err.Error(), i.Member.User, span, logrus.Fields{"error": err})
}

// Check if user signed in recently
recentSignin, err := data.Signin.RecentSignin(j.Member.User.ID, entSigninType, span.Context())
if err != nil {
Expand All @@ -175,13 +198,7 @@ func Signin() (*discordgo.ApplicationCommand, func(s *discordgo.Session, i *disc

if recentSignin {
// User has already signed in, notify and exit
err = s.InteractionRespond(j.Interaction, &discordgo.InteractionResponse{
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Content: "You have already signed in for **" + signinType + "**!",
Flags: discordgo.MessageFlagsEphemeral,
},
})
err = helpers.IntRespondEdit(s, j, "You have already signed in for **"+signinType+"**!")
if err != nil {
logging.Error(s, err.Error(), j.Member.User, span_signinSlug, logrus.Fields{"error": err})
}
Expand All @@ -205,22 +222,7 @@ func Signin() (*discordgo.ApplicationCommand, func(s *discordgo.Session, i *disc
}

// Notify user that they have signed in
err = s.InteractionRespond(j.Interaction, &discordgo.InteractionResponse{
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Flags: discordgo.MessageFlagsEphemeral,
Content: "Signing in...",
},
})
if err != nil {
logging.Error(s, err.Error(), j.Member.User, span_signinSlug, logrus.Fields{"error": err})
return
}

followupMessage := signinMessage(j.Member.User.ID, entSigninType, span_signinSlug.Context())
_, err = s.InteractionResponseEdit(j.Interaction, &discordgo.WebhookEdit{
Content: &followupMessage,
})
err = helpers.IntRespondEdit(s, j, signinMessage(j.Member.User.ID, entSigninType, span_signinSlug.Context()))
if err != nil {
logging.Error(s, err.Error(), j.Member.User, span_signinSlug, logrus.Fields{"error": err})
return
Expand Down Expand Up @@ -257,22 +259,7 @@ func Signin() (*discordgo.ApplicationCommand, func(s *discordgo.Session, i *disc
logging.Error(s, err.Error(), i.Member.User, span, logrus.Fields{"error": err})
}

// Notify sign-in creator that sign-in message was created
err = s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
Type: discordgo.InteractionResponseChannelMessageWithSource,
Data: &discordgo.InteractionResponseData{
Content: "Creating signin and signing in for you...",
Flags: discordgo.MessageFlagsEphemeral,
},
})
if err != nil {
logging.Error(s, err.Error(), i.Member.User, span, logrus.Fields{"error": err})
}

followupMessage := fmt.Sprintf("Signin Message Created, it will close in %d hours!\n%s", delay, signinMessage(i.Member.User.ID, entSigninType, span.Context()))
_, err = s.InteractionResponseEdit(i.Interaction, &discordgo.WebhookEdit{
Content: &followupMessage,
})
err = helpers.IntRespondEdit(s, i, fmt.Sprintf("Signin Message Created, it will close in %d hours!\n%s", delay, signinMessage(i.Member.User.ID, entSigninType, span.Context())))
if err != nil {
logging.Error(s, err.Error(), i.Member.User, span, logrus.Fields{"error": err})
return
Expand Down
15 changes: 15 additions & 0 deletions helpers/signin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package helpers

import (
"github.com/bwmarrin/discordgo"
)

func IntRespondEdit(s *discordgo.Session, i *discordgo.InteractionCreate, message string) error {
_, err := s.InteractionResponseEdit(i.Interaction, &discordgo.WebhookEdit{
Content: &message,
})
if err != nil {
return err
}
return nil
}
Loading