Minor fixes (#47)

NiJeTi · Jan 2, 2025 · 28b3093 · 28b3093
1 parent f26510b
commit 28b3093
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 262 deletions.
diff --git a/internal/discord/commands/responses/common.go b/internal/discord/commands/responses/common.go
@@ -6,8 +6,9 @@ import (
 
 func Activity() *discordgo.Activity {
 	return &discordgo.Activity{
-		Name: "Collecting movies and quotes",
-		Type: discordgo.ActivityTypeCustom,
+		Name:  "Movies and Quotes",
+		Type:  discordgo.ActivityTypeCustom,
+		State: "Collecting movies and quotes",
 	}
 }
 

diff --git a/internal/discord/commands/responses/lock.go b/internal/discord/commands/responses/lock.go
@@ -6,33 +6,22 @@ import (
 	"github.com/bwmarrin/discordgo"
 )
 
-func LockSpecifyLimit(
-	channel *discordgo.Channel,
-) *discordgo.InteractionResponse {
+func LockSpecifyLimit() *discordgo.InteractionResponse {
 	return &discordgo.InteractionResponse{
 		Type: discordgo.InteractionResponseChannelMessageWithSource,
 		Data: &discordgo.InteractionResponseData{
-			Content: fmt.Sprintf(
-				"Please specify a limit for the channel %s",
-				channel.Mention(),
-			),
-			Flags: discordgo.MessageFlagsEphemeral,
+			Content: "Please specify a user limit",
+			Flags:   discordgo.MessageFlagsEphemeral,
 		},
 	}
 }
 
-func LockDone(
-	channel *discordgo.Channel,
-	limit int,
-) *discordgo.InteractionResponse {
+func LockDone(limit int) *discordgo.InteractionResponse {
 	return &discordgo.InteractionResponse{
 		Type: discordgo.InteractionResponseChannelMessageWithSource,
 		Data: &discordgo.InteractionResponseData{
-			Content: fmt.Sprintf(
-				"Locked channel %s for **%d** user(s)",
-				channel.Mention(), limit,
-			),
-			Flags: discordgo.MessageFlagsEphemeral,
+			Content: fmt.Sprintf("Locked channel for **%d** user(s)", limit),
+			Flags:   discordgo.MessageFlagsEphemeral,
 		},
 	}
 }
diff --git a/internal/discord/commands/responses/unlock.go b/internal/discord/commands/responses/unlock.go
@@ -1,18 +1,14 @@
 package responses
 
 import (
-	"fmt"
-
 	"github.com/bwmarrin/discordgo"
 )
 
-func UnlockDone(
-	channel *discordgo.Channel,
-) *discordgo.InteractionResponse {
+func UnlockDone() *discordgo.InteractionResponse {
 	return &discordgo.InteractionResponse{
 		Type: discordgo.InteractionResponseChannelMessageWithSource,
 		Data: &discordgo.InteractionResponseData{
-			Content: fmt.Sprintf("Unclocked %s", channel.Mention()),
+			Content: "Unlocked channel",
 			Flags:   discordgo.MessageFlagsEphemeral,
 		},
 	}

diff --git a/internal/generated/mocks/services/lockVoiceChan/discord.go b/internal/generated/mocks/services/lockVoiceChan/discord.go
diff --git a/internal/generated/mocks/services/unlockVoiceChan/discord.go b/internal/generated/mocks/services/unlockVoiceChan/discord.go
diff --git a/internal/services/lockVoiceChan/deps.go b/internal/services/lockVoiceChan/deps.go
@@ -15,10 +15,6 @@ type discord interface {
 		response *discordgo.InteractionResponse,
 	) error
 
-	Channel(
-		ctx context.Context, channelID models.ID,
-	) (*discordgo.Channel, error)
-
 	UserVoiceState(
 		ctx context.Context, guildID models.ID, userID models.ID,
 	) (*discordgo.VoiceState, error)

diff --git a/internal/services/lockVoiceChan/service.go b/internal/services/lockVoiceChan/service.go
@@ -48,13 +48,8 @@ func (s *Service) Exec(
 		return err
 	}
 
-	channel, err := s.discord.Channel(ctx, models.ID(voiceState.ChannelID))
-	if err != nil {
-		return fmt.Errorf("failed to get voice channel: %w", err)
-	}
-
 	if *limit > commands.LockOptionLimitMaxValue {
-		err = s.discord.Respond(ctx, i, responses.LockSpecifyLimit(channel))
+		err = s.discord.Respond(ctx, i, responses.LockSpecifyLimit())
 		if err != nil {
 			return fmt.Errorf("failed to respond: %w", err)
 		}
@@ -63,13 +58,15 @@ func (s *Service) Exec(
 	}
 
 	err = s.discord.EditChannel(
-		ctx, models.ID(channel.ID), &discordgo.ChannelEdit{UserLimit: *limit},
+		ctx,
+		models.ID(voiceState.ChannelID),
+		&discordgo.ChannelEdit{UserLimit: *limit},
 	)
 	if err != nil {
 		return fmt.Errorf("failed to edit channel user limit: %w", err)
 	}
 
-	err = s.discord.Respond(ctx, i, responses.LockDone(channel, *limit))
+	err = s.discord.Respond(ctx, i, responses.LockDone(*limit))
 	if err != nil {
 		return fmt.Errorf("failed to respond: %w", err)
 	}

diff --git a/internal/services/lockVoiceChan/service_test.go b/internal/services/lockVoiceChan/service_test.go
@@ -99,33 +99,6 @@ func TestService_Exec(t *testing.T) {
 				return lockVoiceChan.New(d)
 			},
 		},
-		"channel_error": {
-			args: args{
-				limit: nil,
-			},
-			err: errors.New("channel error"),
-			setup: func(
-				t *testing.T, _ args, err error,
-			) *lockVoiceChan.Service {
-				d := mocks.NewMockDiscord(t)
-
-				vs := &discordgo.VoiceState{ChannelID: "3"}
-				d.EXPECT().UserVoiceState(
-					ctx, models.ID(i.GuildID), models.ID(i.Member.User.ID),
-				).Return(vs, nil)
-
-				users := make([]*discordgo.Member, 1)
-				d.EXPECT().VoiceChannelUsers(
-					ctx, models.ID(i.GuildID), models.ID(vs.ChannelID),
-				).Return(users, nil)
-
-				d.EXPECT().Channel(
-					ctx, models.ID(vs.ChannelID),
-				).Return(nil, err)
-
-				return lockVoiceChan.New(d)
-			},
-		},
 		"too_many_users_response_error": {
 			args: args{
 				limit: nil,
@@ -148,13 +121,8 @@ func TestService_Exec(t *testing.T) {
 					ctx, models.ID(i.GuildID), models.ID(vs.ChannelID),
 				).Return(users, nil)
 
-				c := &discordgo.Channel{ID: vs.ChannelID}
-				d.EXPECT().Channel(
-					ctx, models.ID(vs.ChannelID),
-				).Return(c, nil)
-
 				d.EXPECT().Respond(
-					ctx, i, responses.LockSpecifyLimit(c),
+					ctx, i, responses.LockSpecifyLimit(),
 				).Return(err)
 
 				return lockVoiceChan.New(d)
@@ -180,14 +148,9 @@ func TestService_Exec(t *testing.T) {
 					ctx, models.ID(i.GuildID), models.ID(vs.ChannelID),
 				).Return(users, nil)
 
-				c := &discordgo.Channel{ID: vs.ChannelID}
-				d.EXPECT().Channel(
-					ctx, models.ID(vs.ChannelID),
-				).Return(c, nil)
-
 				d.EXPECT().EditChannel(
 					ctx,
-					models.ID(c.ID),
+					models.ID(vs.ChannelID),
 					&discordgo.ChannelEdit{UserLimit: len(users)},
 				).Return(err)
 
@@ -214,19 +177,14 @@ func TestService_Exec(t *testing.T) {
 					ctx, models.ID(i.GuildID), models.ID(vs.ChannelID),
 				).Return(users, nil)
 
-				c := &discordgo.Channel{ID: vs.ChannelID}
-				d.EXPECT().Channel(
-					ctx, models.ID(vs.ChannelID),
-				).Return(c, nil)
-
 				d.EXPECT().EditChannel(
 					ctx,
-					models.ID(c.ID),
+					models.ID(vs.ChannelID),
 					&discordgo.ChannelEdit{UserLimit: len(users)},
 				).Return(nil)
 
 				d.EXPECT().Respond(
-					ctx, i, responses.LockDone(c, len(users)),
+					ctx, i, responses.LockDone(len(users)),
 				).Return(err)
 
 				return lockVoiceChan.New(d)
@@ -275,13 +233,8 @@ func TestService_Exec(t *testing.T) {
 					ctx, models.ID(i.GuildID), models.ID(vs.ChannelID),
 				).Return(users, nil)
 
-				c := &discordgo.Channel{ID: vs.ChannelID}
-				d.EXPECT().Channel(
-					ctx, models.ID(vs.ChannelID),
-				).Return(c, nil)
-
 				d.EXPECT().Respond(
-					ctx, i, responses.LockSpecifyLimit(c),
+					ctx, i, responses.LockSpecifyLimit(),
 				).Return(nil)
 
 				return lockVoiceChan.New(d)
@@ -307,19 +260,14 @@ func TestService_Exec(t *testing.T) {
 					ctx, models.ID(i.GuildID), models.ID(vs.ChannelID),
 				).Return(users, nil)
 
-				c := &discordgo.Channel{ID: vs.ChannelID}
-				d.EXPECT().Channel(
-					ctx, models.ID(vs.ChannelID),
-				).Return(c, nil)
-
 				d.EXPECT().EditChannel(
 					ctx,
-					models.ID(c.ID),
+					models.ID(vs.ChannelID),
 					&discordgo.ChannelEdit{UserLimit: len(users)},
 				).Return(nil)
 
 				d.EXPECT().Respond(
-					ctx, i, responses.LockDone(c, len(users)),
+					ctx, i, responses.LockDone(len(users)),
 				).Return(nil)
 
 				return lockVoiceChan.New(d)
@@ -340,19 +288,14 @@ func TestService_Exec(t *testing.T) {
 					ctx, models.ID(i.GuildID), models.ID(i.Member.User.ID),
 				).Return(vs, nil)
 
-				c := &discordgo.Channel{ID: vs.ChannelID}
-				d.EXPECT().Channel(
-					ctx, models.ID(vs.ChannelID),
-				).Return(c, nil)
-
 				d.EXPECT().EditChannel(
 					ctx,
-					models.ID(c.ID),
+					models.ID(vs.ChannelID),
 					&discordgo.ChannelEdit{UserLimit: *args.limit},
 				).Return(nil)
 
 				d.EXPECT().Respond(
-					ctx, i, responses.LockDone(c, *args.limit),
+					ctx, i, responses.LockDone(*args.limit),
 				).Return(nil)
 
 				return lockVoiceChan.New(d)