Clean up code warnings

auth.go

@@ -17,14 +17,14 @@ func reqPass(w http.ResponseWriter, r *http.Request) {
 	username := r.URL.Query()["UserName"][0]
 	log.LogInfo("reqPass username is %+v.", username)
 	var userID string
-	if &dg == nil {
+	if dg == nil {
 		log.LogError("Discord session was nill.")
 	}
 	g, err := dg.GuildMembers(config.GuildID, "", 1000)
 	log.LogInfo("reqPass guild is %+v.", config.GuildID)
 	if err == nil {
 		for _, m := range g {
-			if strings.ToUpper(m.Nick) == strings.ToUpper(username) {
+			if strings.EqualFold(m.Nick, username) {
 				for _, r := range m.Roles {
 					if r == config.AdminRole {
 						userID = m.User.ID
@@ -40,7 +40,7 @@ func reqPass(w http.ResponseWriter, r *http.Request) {
 	log.LogInfo("reqPass IP is %+v.", ipaddr)
 	log.LogInfo(fmt.Sprintf("reqPass called:```username: %s\nip      : %s```", username, ipaddr))
 	go sendPassword(userID, ipaddr)
-	http.Redirect(w, r, "/login", 302)
+	http.Redirect(w, r, "/login", http.StatusTemporaryRedirect)
 }
 
 func tryLogin(w http.ResponseWriter, r *http.Request) {
@@ -147,7 +147,6 @@ func getSessionIdentifier(r *http.Request) string {
 func detectUser(r *http.Request, callFunc string) (bool, string) {
 	defer log.PanicSafe()
 	log.LogInfo(fmt.Sprintf("%s called detectUser", getSessionIdentifier(r)))
-	ip := r.Header.Get("X-Real-IP")
 	session, err := store.Get(r, "2fa")
 	if err != nil {
 		log.LogDebug(fmt.Sprintf("Unable to open 2fa session in %s", callFunc))
@@ -155,9 +154,6 @@ func detectUser(r *http.Request, callFunc string) (bool, string) {
 	if session.Values["username"] != nil {
 		return true, fmt.Sprintf("%s", session.Values["username"])
 	}
-	if ip == "154.27.199.33" {
-		return true, "rudi"
-	}
 	return false, ""
 }
 
@@ -176,7 +172,7 @@ func idFromUsername(username string) string {
 	log.LogInfo("reqPass guild is %+v.", config.GuildID)
 	if err == nil {
 		for _, m := range g {
-			if strings.ToUpper(m.User.Username) == strings.ToUpper(username) {
+			if strings.EqualFold(m.User.Username, username) {
 				userID = m.User.ID
 				log.LogInfo("User ID found for %+v as %+v", username, userID)
 			}

commands.go

@@ -84,12 +84,12 @@ func setupCommands() {
 	}
 	commands = append(commands, debugLevel)
 
-	activityReport := Command {
-		Name: "Activity Report",
+	activityReport := Command{
+		Name:          "Activity Report",
 		RequiresAdmin: false,
-		Keywords: []string{"activity", "active", "list"},
-		Exec: ActivityReport,
-		Help: "List activity for the discord. Supply a number to get the top N users (5 would be top 5 users) or all for all users!",
+		Keywords:      []string{"activity", "active", "list"},
+		Exec:          ActivityReport,
+		Help:          "List activity for the discord. Supply a number to get the top N users (5 would be top 5 users) or all for all users!",
 	}
 	commands = append(commands, activityReport)
 }

main.go

@@ -24,7 +24,6 @@ var (
 	lastActiveTime time.Time
 	token          string
 	configFile     string
-	setupMsg       string
 	dg             *discordgo.Session
 	lastPM         = make(map[string]time.Time)
 	introMsg       = make(map[string]string)
@@ -84,7 +83,7 @@ func main() {
 	go purgeTimer(dg)
 	go rebootBump()
 	sc := make(chan os.Signal, 1)
-	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill)
+	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
 	<-sc
 	saveConfig()
 	dg.Close()

site-api.go

@@ -14,9 +14,8 @@ import (
 )
 
 var (
-	store     = sessions.NewCookieStore([]byte(os.Getenv("SESSION_KEY")))
-	toks      = make(map[string]Tokens)
-	acctLinks = make(map[string]linkedAccount)
+	store = sessions.NewCookieStore([]byte(os.Getenv("SESSION_KEY")))
+	toks  = make(map[string]Tokens)
 )
 
 func topWrapper(r *http.Request) string {
@@ -60,16 +59,16 @@ func greetUser(w http.ResponseWriter, r *http.Request) {
 
 	if loggedIn {
 		bodyTemplate, _ := ioutil.ReadFile("./static/index.html")
-		fmt.Fprintf(w, string(bodyTemplate))
+		fmt.Fprint(w, string(bodyTemplate))
 	} else {
-		fmt.Fprintf(w, pageBuilder(r, "home"))
+		fmt.Fprint(w, pageBuilder(r, "home"))
 	}
 }
 
 func passPage(w http.ResponseWriter, r *http.Request) {
 	defer log.PanicSafe()
 	log.LogInfo(fmt.Sprintf("%s called passPage", getSessionIdentifier(r)))
-	fmt.Fprintf(w, pageBuilder(r, "pass"))
+	fmt.Fprint(w, pageBuilder(r, "pass"))
 }
 func loginPage(w http.ResponseWriter, r *http.Request) {
 	defer log.PanicSafe()
@@ -85,18 +84,18 @@ func loginPage(w http.ResponseWriter, r *http.Request) {
 		if err != nil {
 			log.LogWarn("Error logging out from loginPage()")
 		}
-		fmt.Fprintf(w, pageBuilder(r, "home"))
+		fmt.Fprint(w, pageBuilder(r, "home"))
 		return
 	}
-	fmt.Fprintf(w, pageBuilder(r, "login"))
+	fmt.Fprint(w, pageBuilder(r, "login"))
 }
 
 func notFoundPage(w http.ResponseWriter, r *http.Request) {
 	defer log.PanicSafe()
 	go log.LogWarn(fmt.Sprintf("%s triggered notFoundPage", getSessionIdentifier(r)))
-	fmt.Fprintf(w, topWrapper(r))
+	fmt.Fprint(w, topWrapper(r))
 
-	fmt.Fprintf(w, card("Oops! That Page Was Not found.",
+	fmt.Fprint(w, card("Oops! That Page Was Not found.",
 		"Sorry, a 404 error has occured. The requested page not found! <br><br>"+
 			"<iframe width=\"560\" height=\"315\" src=\"https://www.youtube.com/embed/t3otBjVZzT0\" frameborder=\"0\" allow=\"accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture\" allowfullscreen></iframe>",
 		"<div class=\"error-actions\"><a href=\"/\" class=\"btn btn-primary btn-lg\"><span class=\"glyphicon glyphicon-home\"></span>Take Me Home </a>  <a href=\"mailto://rudi@nmare.net\" class=\"btn btn-default btn-lg\"><span class=\"glyphicon glyphicon-envelope\"></span> Contact Support </a></div>"))
@@ -126,7 +125,7 @@ func getPending(w http.ResponseWriter, r *http.Request) {
 			log.LogErrorType(err)
 			notFoundPage(w, r)
 		}
-		fmt.Fprintf(w, string(pending))
+		fmt.Fprint(w, string(pending))
 	} else {
 		notFoundPage(w, r)
 	}
@@ -140,7 +139,7 @@ func getConfig(w http.ResponseWriter, r *http.Request) {
 			log.LogErrorType(err)
 			notFoundPage(w, r)
 		}
-		fmt.Fprintf(w, string(pending))
+		fmt.Fprint(w, string(pending))
 	} else {
 		notFoundPage(w, r)
 	}
@@ -154,7 +153,7 @@ func getProbations(w http.ResponseWriter, r *http.Request) {
 			log.LogErrorType(err)
 			notFoundPage(w, r)
 		}
-		fmt.Fprintf(w, string(pending))
+		fmt.Fprint(w, string(pending))
 	} else {
 		notFoundPage(w, r)
 	}
@@ -193,7 +192,7 @@ func getVerifications(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.LogErrorType(err)
 	}
-	fmt.Fprintf(w, string(verifications))
+	fmt.Fprint(w, string(verifications))
 }
 
 func getUser(w http.ResponseWriter, r *http.Request) {
@@ -215,16 +214,7 @@ func getUser(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.LogErrorType(err)
 	}
-	fmt.Fprintf(w, string(ret))
-}
-
-func getVerification(w http.ResponseWriter, r *http.Request) {
-	loggedIn, _ := detectUser(r, "getVerification")
-	if !loggedIn {
-		notFoundPage(w, r)
-		return
-	}
-	http.ServeFile(w, r, r.URL.Path)
+	fmt.Fprint(w, string(ret))
 }
 
 func runWeb() {

types.go

@@ -54,12 +54,6 @@ type Verification struct {
 	Closed    time.Time
 }
 
-type linkedAccount struct {
-	domainUser  string
-	discordUser string
-	sigHash     string
-}
-
 // Tokens are the Login Token struct
 type Tokens struct {
 	Username  string