submit: reorganize check for Google Play testers

Signed-off-by: Sumner Evans <[email protected]>

submit.go

@@ -367,22 +367,20 @@ func (s *submitServer) parseRequest(w http.ResponseWriter, req *http.Request, re
 		}
 	}
 
-	if p.AppName == "booper" {
-		if gplaySpamEmailRegex.MatchString(p.Data["user_id"]) {
-			log.Println("Dropping report from", p.Data["user_id"])
-			w.Header().Set("Content-Type", "application/json")
-			w.WriteHeader(200)
-			_, _ = w.Write([]byte("{}"))
-			return nil
-		}
-	}
-
 	userID, hasUserID := p.Data["user_id"]
 	delete(p.Data, "user_id")
 	delete(p.Data, "verified_device_id")
 	if !hasUserID {
 		return p
 	} else if p.AppName == "booper" {
+		if gplaySpamEmailRegex.MatchString(userID) {
+			log.Println("Dropping report from", userID)
+			w.Header().Set("Content-Type", "application/json")
+			w.WriteHeader(200)
+			_, _ = w.Write([]byte("{}"))
+			return nil
+		}
+
 		whoami, err := s.verifyIMAToken(req.Context(), req.Header.Get("Authorization"), userID)
 		if err != nil {
 			log.Printf("Error verifying user ID (%s): %v", userID, err)