From 6c750bcaed4bb97ece8299d3d1a4f552194e7b8f Mon Sep 17 00:00:00 2001
From: Jacob Gunther <jacobgunther03+github@gmail.com>
Date: Sun, 21 Aug 2022 01:00:13 -0500
Subject: [PATCH] Undo blocked servers cache list

---
 .gitignore  |  3 +--
 src/main.go |  2 ++
 src/util.go | 63 ++---------------------------------------------------
 3 files changed, 5 insertions(+), 63 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2fc1f04..85cb51e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 bin/
 config.yml
-.DS_Store
-blocked-servers.json
\ No newline at end of file
+.DS_Store
\ No newline at end of file
diff --git a/src/main.go b/src/main.go
index 8c777c6..5cc4b23 100644
--- a/src/main.go
+++ b/src/main.go
@@ -38,6 +38,8 @@ func init() {
 		log.Fatal(err)
 	}
 
+	log.Println("Successfully retrieved EULA blocked servers")
+
 	if instanceID := os.Getenv("INSTANCE_ID"); len(instanceID) > 0 {
 		value, err := strconv.ParseUint(instanceID, 10, 16)
 
diff --git a/src/util.go b/src/util.go
index 8b03a0f..9e7469e 100644
--- a/src/util.go
+++ b/src/util.go
@@ -4,16 +4,12 @@ import (
 	"crypto/sha1"
 	_ "embed"
 	"encoding/hex"
-	"encoding/json"
 	"fmt"
 	"io/ioutil"
-	"log"
 	"net/http"
-	"os"
 	"regexp"
 	"strconv"
 	"strings"
-	"time"
 )
 
 var (
@@ -22,11 +18,6 @@ var (
 	ipAddressRegExp  = regexp.MustCompile(`^\d{1,3}(\.\d{1,3}){3}$`)
 )
 
-type BlockedServersFile struct {
-	LastUpdated time.Time `json:"last_updated"`
-	Servers     []string  `json:"servers"`
-}
-
 func Contains[T comparable](arr []T, v T) bool {
 	for _, value := range arr {
 		if v == value {
@@ -38,36 +29,6 @@ func Contains[T comparable](arr []T, v T) bool {
 }
 
 func GetBlockedServerList() error {
-	f, err := os.OpenFile("blocked-servers.json", os.O_CREATE|os.O_RDWR, 0777)
-
-	if err != nil {
-		return err
-	}
-
-	defer f.Close()
-
-	data, err := ioutil.ReadAll(f)
-
-	if err != nil {
-		return err
-	}
-
-	if len(data) > 0 {
-		var blockedServersFile BlockedServersFile
-
-		if err = json.Unmarshal(data, &blockedServersFile); err != nil {
-			return err
-		}
-
-		if time.Since(blockedServersFile.LastUpdated).Hours() < 24 {
-			blockedServersMutex.Lock()
-			blockedServers = blockedServersFile.Servers
-			blockedServersMutex.Unlock()
-
-			return nil
-		}
-	}
-
 	resp, err := http.Get("https://sessionserver.mojang.com/blockedservers")
 
 	if err != nil {
@@ -78,8 +39,6 @@ func GetBlockedServerList() error {
 		return fmt.Errorf("unexpected status code: %d", resp.StatusCode)
 	}
 
-	log.Println("Successfully retrieved EULA blocked servers")
-
 	defer resp.Body.Close()
 
 	body, err := ioutil.ReadAll(resp.Body)
@@ -90,27 +49,9 @@ func GetBlockedServerList() error {
 
 	blockedServersMutex.Lock()
 	blockedServers = strings.Split(string(body), "\n")
+	blockedServersMutex.Unlock()
 
-	defer blockedServersMutex.Unlock()
-
-	if data, err = json.Marshal(BlockedServersFile{
-		LastUpdated: time.Now(),
-		Servers:     blockedServers,
-	}); err != nil {
-		return err
-	}
-
-	if err = f.Truncate(0); err != nil {
-		return err
-	}
-
-	if _, err = f.Seek(0, 0); err != nil {
-		return err
-	}
-
-	_, err = f.Write(data)
-
-	return err
+	return nil
 }
 
 func IsBlockedAddress(address string) bool {