Skip to content

Commit c4f0e87

Browse files
committed
fix: 🐛 fix some bugs
1 parent 16cb0d8 commit c4f0e87

File tree

3 files changed

+108
-10
lines changed

3 files changed

+108
-10
lines changed

command.go

Lines changed: 102 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,58 @@ var commands = []*discordgo.ApplicationCommand{
105105
{
106106
Type: discordgo.ApplicationCommandOptionInteger,
107107
Name: "grade",
108-
Description: "Grade. [1 - 12]",
108+
Description: "Grade.",
109109
Required: true,
110+
Choices: []*discordgo.ApplicationCommandOptionChoice{
111+
{
112+
Name: "1",
113+
Value: 1,
114+
},
115+
{
116+
Name: "2",
117+
Value: 2,
118+
},
119+
{
120+
Name: "3",
121+
Value: 3,
122+
},
123+
{
124+
Name: "4",
125+
Value: 4,
126+
},
127+
{
128+
Name: "5",
129+
Value: 5,
130+
},
131+
{
132+
Name: "6",
133+
Value: 6,
134+
},
135+
{
136+
Name: "7",
137+
Value: 7,
138+
},
139+
{
140+
Name: "8",
141+
Value: 8,
142+
},
143+
{
144+
Name: "9",
145+
Value: 9,
146+
},
147+
{
148+
Name: "10",
149+
Value: 10,
150+
},
151+
{
152+
Name: "11",
153+
Value: 11,
154+
},
155+
{
156+
Name: "12",
157+
Value: 12,
158+
},
159+
},
110160
},
111161
{
112162
Type: discordgo.ApplicationCommandOptionRole,
@@ -144,8 +194,58 @@ var commands = []*discordgo.ApplicationCommand{
144194
{
145195
Type: discordgo.ApplicationCommandOptionInteger,
146196
Name: "grade",
147-
Description: "Grade. [1 - 12]",
197+
Description: "Grade.",
148198
Required: true,
199+
Choices: []*discordgo.ApplicationCommandOptionChoice{
200+
{
201+
Name: "1",
202+
Value: 1,
203+
},
204+
{
205+
Name: "2",
206+
Value: 2,
207+
},
208+
{
209+
Name: "3",
210+
Value: 3,
211+
},
212+
{
213+
Name: "4",
214+
Value: 4,
215+
},
216+
{
217+
Name: "5",
218+
Value: 5,
219+
},
220+
{
221+
Name: "6",
222+
Value: 6,
223+
},
224+
{
225+
Name: "7",
226+
Value: 7,
227+
},
228+
{
229+
Name: "8",
230+
Value: 8,
231+
},
232+
{
233+
Name: "9",
234+
Value: 9,
235+
},
236+
{
237+
Name: "10",
238+
Value: 10,
239+
},
240+
{
241+
Name: "11",
242+
Value: 11,
243+
},
244+
{
245+
Name: "12",
246+
Value: 12,
247+
},
248+
},
149249
},
150250
},
151251
},

command_verify.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,16 @@ func (c *Checkpoint) verify(s *discordgo.Session, i *discordgo.InteractionCreate
4242
return
4343
}
4444

45-
successRespond(s, i, "You have been verified!")
46-
4745
err = c.session.GuildMemberRoleAdd(i.GuildID, i.Member.User.ID, g.VerifiedRole)
4846
if err != nil {
4947
errorRespond(s, i, err)
50-
51-
return
5248
}
5349

50+
successRespond(s, i, "You have been verified!")
51+
5452
err = c.session.GuildMemberNickname(i.GuildID, i.Member.User.ID, fmt.Sprintf("%s %b.", firstName, lastName[0]))
5553
if err != nil {
5654
errorRespond(s, i, err)
57-
58-
return
5955
}
6056

6157
if g.GradeRoles[grade-1] == "" {
@@ -65,7 +61,5 @@ func (c *Checkpoint) verify(s *discordgo.Session, i *discordgo.InteractionCreate
6561
err = c.session.GuildMemberRoleAdd(i.GuildID, i.Member.User.ID, g.GradeRoles[grade-1])
6662
if err != nil {
6763
errorRespond(s, i, err)
68-
69-
return
7064
}
7165
}

utils.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,9 @@ func warningRespond(s *discordgo.Session, i *discordgo.InteractionCreate, m stri
134134
}
135135

136136
func errorRespond(s *discordgo.Session, i *discordgo.InteractionCreate, err error) {
137+
log.Error().
138+
Err(err).
139+
Msg("Error occured")
140+
137141
respond(s, i, ephemeralify(embedResponse(errorEmbed(err))))
138142
}

0 commit comments

Comments
 (0)