chore: more code cleanup

bot/core.go

@@ -97,6 +97,6 @@ func Start(config *types.Config) {
 		zap.Any("config", config))
 
 	signals := make(chan os.Signal, 1)
-	signal.Notify(signals, syscall.SIGTERM, syscall.SIGKILL)
+	signal.Notify(signals, syscall.SIGTERM, syscall.SIGINT)
 	<-signals
 }

bot/discord.go

@@ -89,7 +89,7 @@ func (app *App) onMessage(s *discordgo.Session, event *discordgo.MessageCreate)
 		}
 	}
 
-	if event.Message.Author.Bot == true {
+	if event.Message.Author.Bot {
 		return
 	}
 
@@ -130,7 +130,7 @@ func (app *App) onReactionAdd(s *discordgo.Session, event *discordgo.MessageReac
 	}
 
 	emoji := event.Emoji.APIName()
-	if strings.Index(emoji, ":") != -1 {
+	if strings.Contains(emoji, ":") {
 		emoji = fmt.Sprintf("<:%s>", emoji)
 	}
 	err = app.storage.AddEmojiReactionToUser(message.DiscordUserID, emoji)
@@ -147,7 +147,7 @@ func (app *App) onReactionRemove(s *discordgo.Session, event *discordgo.MessageR
 	}
 
 	emoji := event.Emoji.APIName()
-	if strings.Index(emoji, ":") != -1 {
+	if strings.Contains(emoji, ":") {
 		emoji = fmt.Sprintf("<:%s>", emoji)
 	}
 	err = app.storage.RemoveEmojiReactionFromUser(message.DiscordUserID, emoji)

storage/users.go

@@ -57,7 +57,7 @@ func (m *MongoStorer) AddEmojiReactionToUser(discordUserID string, emoji string)
 			user.ReceivedReactions[i].Counter++
 		}
 	}
-	if found == false {
+	if !found {
 		entry := ReactionCounter{
 			Counter:  1,
 			Reaction: emoji,
@@ -77,27 +77,27 @@ type TopReactionEntry struct {
 // GetTopReactions gets the top <top> amount of people who received reaction <reaction>
 func (m *MongoStorer) GetTopReactions(top int, reaction string) (result []TopReactionEntry, err error) {
 	pipeline := []bson.M{
-		bson.M{
+		{
 			"$unwind": "$received_reactions",
 		},
-		bson.M{
+		{
 			"$match": bson.M{
 				"received_reactions.reaction": reaction,
 			},
 		},
-		bson.M{
+		{
 			"$project": bson.M{
 				"discord_user_id": "$discord_user_id",
 				"counter":         "$received_reactions.counter",
 				"reaction":        "$received_reactions.reaction",
 			},
 		},
-		bson.M{
+		{
 			"$sort": bson.M{
 				"counter": -1,
 			},
 		},
-		bson.M{
+		{
 			"$limit": top,
 		},
 	}