Merge pull request #283 from itsneufox/revert-save-roles

Comment out role tracking functionality until database conversion

Author: NotUnlikeTheWaves

bot/discord.go

@@ -18,6 +18,7 @@ type ChannelDM struct {
 	LastMessageID string         `json:"last_message_id"`
 }
 
+/* ROLE TRACKING: Commented out atm and needs to be reviewed after converting the database
 // Define the roles that we want to track
 var trackedRoleIDs = map[string]string{
 	"1002922725553217648": 	"Clown",
@@ -31,8 +32,8 @@ var trackedRoleIDs = map[string]string{
 	"841368374356738078": 	"Suffers from dunning-kruger",
 	"987825514511220867": 	"Muted",
 	"1204891485867352144": 	"Can't @everyone",
-	
 }
+*/
 
 const greeting = `Hi! Welcome to the San Andreas Multiplayer unofficial Discord server!
 
@@ -51,7 +52,9 @@ func (app *App) ConnectDiscord() (err error) {
 	app.discordClient.S.AddHandler(app.onJoin)
 	app.discordClient.S.AddHandler(app.onReactionAdd)
 	app.discordClient.S.AddHandler(app.onReactionRemove)
+	/* ROLE TRACKING: Commented out atm and needs to be reviewed after converting the database
 	app.discordClient.S.AddHandler(app.onGuildMemberUpdate)
+	*/
 
 	intent := discordgo.MakeIntent(discordgo.IntentsAllWithoutPrivileged | discordgo.IntentsGuildMembers)
 
@@ -73,6 +76,7 @@ func (app *App) ConnectDiscord() (err error) {
 	return
 }
 
+/* ROLE TRACKING: Commented out atm and needs to be reviewed after converting the database
 // nolint:gocyclo
 func (app *App) onGuildMemberUpdate(s *discordgo.Session, event *discordgo.GuildMemberUpdate) {
 	member := event.Member
@@ -124,6 +128,7 @@ func (app *App) onGuildMemberUpdate(s *discordgo.Session, event *discordgo.Guild
 		}
 	}
 }
+*/
 
 // nolint:gocyclo
 func (app *App) onReady(s *discordgo.Session, event *discordgo.Ready) {
@@ -236,12 +241,15 @@ func (app *App) onJoin(s *discordgo.Session, event *discordgo.GuildMemberAdd) {
 		}
 	}
 
+	/* ROLE TRACKING: Commented out atm and needs to be reviewed after converting the database
 	err = app.reapplyTrackedRoles(event.Member.User.ID, event.GuildID)
 	if err != nil {
 		zap.L().Error("failed to reapply tracked roles", zap.Error(err))
 	}
+	*/
 }
 
+/* ROLE TRACKING: Commented out atm and needs to be reviewed after converting the database
 func (app *App) reapplyTrackedRoles(userID, guildID string) error {
 	trackedRoles, err := app.storage.GetTrackedRoles(userID)
 	if err != nil {
@@ -267,4 +275,5 @@ func (app *App) reapplyTrackedRoles(userID, guildID string) error {
 	}
 
 	return nil
-}
+}
+*/

storage/memory.go

@@ -88,6 +88,7 @@ func (m *Memory) FetchReadmeMessage(githubOwner string, githubRepoistory string,
 func (m *Memory) UpdateReadmeMessage(session *discordgo.Session, original *discordgo.Message, upstream string) (err error) {
 	return
 }
+/* ROLE TRACKING: Commented out atm and needs to be reviewed after converting the database
 func (m *Memory) AddTrackedRole(discordUserID, roleID, roleName string) error {
 	return nil
 }
@@ -97,3 +98,4 @@ func (m *Memory) RemoveTrackedRole(discordUserID, roleID string) error {
 func (m *Memory) GetTrackedRoles(discordUserID string) ([]TrackedRole, error) {
 	return nil, nil
 }
+*/

storage/storage.go

@@ -44,9 +44,11 @@ type Storer interface {
 	FetchReadmeMessage(githubOwner string, githubRepoistory string, fileName string) (message string, err error)
 	UpdateReadmeMessage(session *discordgo.Session, original *discordgo.Message, upstream string) (err error)
 
+	/* ROLE TRACKING: Commented out atm and needs to be reviewed after converting the database
 	AddTrackedRole(discordUserID, roleID, roleName string) error
 	RemoveTrackedRole(discordUserID, roleID string) error
 	GetTrackedRoles(discordUserID string) ([]TrackedRole, error)
+	*/
 }
 
 // MongoStorer exposes a storage MongoStorer for the bot

storage/users.go

@@ -2,7 +2,7 @@ package storage
 
 import (
 	"regexp"
-	"time"
+	// "time" // ROLE TRACKING: Commented out atm and needs to be reviewed after converting the database
 
 	"github.com/globalsign/mgo/bson"
 	"github.com/pkg/errors"
@@ -17,21 +17,26 @@ type User struct {
 	BurgerUserName    string            `json:"burger_user_name" bson:"burger_user_name"`
 	BurgerVerify      bool              `json:"burgershot_verified" bson:"burgershot_verified"`
 	ReceivedReactions []ReactionCounter `json:"received_reactions" bson:"received_reactions,omitempty"`
+	/* ROLE TRACKING: Commented out atm and needs to be reviewed after converting the database
 	TrackedRoles      []TrackedRole     `json:"tracked_roles" bson:"tracked_roles,omitempty"`
+	*/
 }
 
 type ReactionCounter struct {
 	Counter  int
 	Reaction string
 }
 
+/* ROLE TRACKING: Commented out atm and needs to be reviewed after converting the database
 // TrackedRole tracks the user roles
 type TrackedRole struct {
 	RoleID   string `json:"role_id" bson:"role_id"`
 	RoleName string `json:"role_name" bson:"role_name"`
 	AddedAt  int64  `json:"added_at" bson:"added_at"`
 }
+*/
 
+/* ROLE TRACKING: Commented out atm and needs to be reviewed after converting the database
 // AddTrackedRole adds a tracked role to a user
 func (m *MongoStorer) AddTrackedRole(discordUserID, roleID, roleName string) error {
 	user, err := m.GetUserOrCreate(discordUserID)
@@ -53,7 +58,9 @@ func (m *MongoStorer) AddTrackedRole(discordUserID, roleID, roleName string) err
 	user.TrackedRoles = append(user.TrackedRoles, newRole)
 	return m.UpdateUser(user)
 }
+*/
 
+/* ROLE TRACKING: Commented out atm and needs to be reviewed after converting the database
 // RemoveTrackedRole removes a tracked role
 func (m *MongoStorer) RemoveTrackedRole(discordUserID, roleID string) error {
 	user, err := m.GetUserOrCreate(discordUserID)
@@ -70,7 +77,9 @@ func (m *MongoStorer) RemoveTrackedRole(discordUserID, roleID string) error {
 
 	return m.UpdateUser(user)
 }
+*/
 
+/* ROLE TRACKING: Commented out atm and needs to be reviewed after converting the database
 // GetTrackedRoles returns all tracked roles for a user
 func (m *MongoStorer) GetTrackedRoles(discordUserID string) ([]TrackedRole, error) {
 	user, err := m.GetUserOrCreate(discordUserID)
@@ -80,6 +89,7 @@ func (m *MongoStorer) GetTrackedRoles(discordUserID string) ([]TrackedRole, erro
 
 	return user.TrackedRoles, nil
 }
+*/
 
 // GetUserOrCreate gets a user or creates one and returns it
 func (m *MongoStorer) GetUserOrCreate(discordUserID string) (user User, err error) {