From 4807a92b63b0d5a3420dc6b32568a1f19ca40965 Mon Sep 17 00:00:00 2001
From: Jacob Gunther <jacobgunther03+github@gmail.com>
Date: Tue, 30 Aug 2022 20:56:54 -0500
Subject: [PATCH] Use shared code base

---
 go.mod        |   9 +-
 go.sum        |  17 +--
 src/icon.png  | Bin 3143 -> 0 bytes
 src/main.go   |  21 ++--
 src/redis.go  | 170 -------------------------
 src/routes.go |  14 ++-
 src/status.go | 335 --------------------------------------------------
 src/util.go   |  96 ---------------
 8 files changed, 32 insertions(+), 630 deletions(-)
 delete mode 100644 src/icon.png
 delete mode 100644 src/redis.go
 delete mode 100644 src/status.go

diff --git a/go.mod b/go.mod
index 4bc6c2b..4612a0e 100644
--- a/go.mod
+++ b/go.mod
@@ -3,9 +3,8 @@ module main
 go 1.18
 
 require (
-	github.com/go-redis/redis/v8 v8.11.5
-	github.com/gofiber/fiber/v2 v2.36.0
-	github.com/mcstatus-io/mcutil v0.0.0-20220829055335-c1c2ef192eca
+	github.com/gofiber/fiber/v2 v2.37.0
+	github.com/mcstatus-io/shared v0.0.0-20220831015146-c4896270e6f6
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -13,9 +12,11 @@ require (
 	github.com/andybalholm/brotli v1.0.4 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/go-redis/redis/v8 v8.11.5 // indirect
 	github.com/klauspost/compress v1.15.9 // indirect
+	github.com/mcstatus-io/mcutil v0.0.0-20220829055335-c1c2ef192eca // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.39.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect
-	golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24 // indirect
+	golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
 )
diff --git a/go.sum b/go.sum
index 2566dd5..36a3408 100644
--- a/go.sum
+++ b/go.sum
@@ -7,23 +7,20 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cu
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
-github.com/gofiber/fiber/v2 v2.36.0 h1:1qLMe5rhXFLPa2SjK10Wz7WFgLwYi4TYg7XrjztJHqA=
-github.com/gofiber/fiber/v2 v2.36.0/go.mod h1:tgCr+lierLwLoVHHO/jn3Niannv34WRkQETU8wiL9fQ=
+github.com/gofiber/fiber/v2 v2.37.0 h1:KVboSQ7e0wDbSFXNjXKqoigwp9HYUqgWn4uGFaUO1P8=
+github.com/gofiber/fiber/v2 v2.37.0/go.mod h1:xm3pDGlfE1xqVKb77iH8weLU0FFoTeWeK3nbiYM2Nh0=
 github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY=
 github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
-github.com/mcstatus-io/mcutil v0.0.0-20220819164348-a0bb9bd8df56 h1:FZg8KfK/9b/Jp3BtZ3KgcS0iXkqPWn80cZrc6IUe1ps=
-github.com/mcstatus-io/mcutil v0.0.0-20220819164348-a0bb9bd8df56/go.mod h1:VUB87/x9EYITmQVXZO4eS+egaZOdvxId4IdpU4L5LoA=
-github.com/mcstatus-io/mcutil v0.0.0-20220825201801-d3b6a8b30b56 h1:XtoLxtSRzXYWnLxYfkq+oJTUg0i43dltU4LQxXtr7rk=
-github.com/mcstatus-io/mcutil v0.0.0-20220825201801-d3b6a8b30b56/go.mod h1:VUB87/x9EYITmQVXZO4eS+egaZOdvxId4IdpU4L5LoA=
 github.com/mcstatus-io/mcutil v0.0.0-20220829055335-c1c2ef192eca h1:7cuzxW+L7ZsnZfhW5pL2QpCRduTmURKnBFfwREF8of4=
 github.com/mcstatus-io/mcutil v0.0.0-20220829055335-c1c2ef192eca/go.mod h1:VUB87/x9EYITmQVXZO4eS+egaZOdvxId4IdpU4L5LoA=
+github.com/mcstatus-io/shared v0.0.0-20220831015146-c4896270e6f6 h1:vs4Gqv9mjXw369ap2mM7SN3u306n7u35x+nbeLpsoX0=
+github.com/mcstatus-io/shared v0.0.0-20220831015146-c4896270e6f6/go.mod h1:0CPc1P/GzYKF3mS7CkRP3Mo/uOjU4fmZVkm0AF1c6D8=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.38.0/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I=
 github.com/valyala/fasthttp v1.39.0 h1:lW8mGeM7yydOqZKmwyMTaz/PH/A+CLgtmmcjv+OORfU=
 github.com/valyala/fasthttp v1.39.0/go.mod h1:t/G+3rLek+CyY9bnIE+YlMRddxVAAGjhxndDB4i4C0I=
 github.com/valyala/tcplisten v1.0.0 h1:rBHj/Xf+E1tRGZyWIWwJDiRY0zc1Js+CV5DqwacVSA8=
@@ -37,10 +34,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 h1:Sx/u41w+OwrInGdEckYmEuU5gHoGSL4QbDz3S9s6j4U=
-golang.org/x/sys v0.0.0-20220818161305-2296e01440c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24 h1:TyKJRhyo17yWxOMCTHKWrc5rddHORMlnZ/j57umaUd8=
-golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVqx/63mlHjefrHmxwfeY=
+golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
diff --git a/src/icon.png b/src/icon.png
deleted file mode 100644
index 51f6cb232e304a047525c1f9a320561566622fd3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3143
zcmV-N47l@&P)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj798gSDMX#@~u&}VTwY9*&z{khO&CSiz)6>4bzSPvz
zyu7@zv9Y<ixz5hc$;rvY#Kgb9zqGWp%F4>m&(FHLy0^EtkdTm@o12=Nnyag;%gf8q
z(9qJ-(x0E7aBy%yKtMh|K0Q4>d3kxMsj0HEvaYVKR8&+uJ3BWwH#RmlVPRpmwzka7
z%*e>d!NI|}xVWdMr%OvqJUl#ESy`i_qphv2v$L~IOiVa9I7352N=iyoQ&TZ9F)l7H
zEG#T9FE2VeIypHxn3$M{hlhB0cx7c}iHV7<tgL^3e{XMZSXfwbadDiSoM>ohEiElU
zK|wS$G+$p|W@cthO-)ZvPf1BhYHDh9baac0i-v}VLPA1(e0;;h!-9f>PEJlWH8n&;
zL{(K)M@L6jS65zMUR+#UZf<T!NJxEseZ|GajEszFX=z18MKUrnP*6}-R#sbETf)M^
zySuw$Vq!){Ml&-rQBhGaFfey_cXD!aU0q#LQc@}^DwdX(V`F2zy}ic9#y>wldwY9+
zetv*}fT*abU|?W%b#;@IlaG&&mzS5Fot;`*TB@q5ii(P)q@<pno^x|^h=_=kl$3UM
zcA1%(ZEbCij*etxWQ~oDfq{X8gM%w8D}{xHdU|>(DJg4fYbYovCnqN+CMG2%B_AIj
zBqSswBO@RnARHVVAt50h9UUSfB7}s5m6er|k&&UHp`xOqrKP2kl9Fd<XSOXea{vGU
z32;bRa{vGi!vFvd!vV){sAK>D3A9N>K~z{r?Uwy_)7BZsRRV*MH82Pi3P_@$7bs2T
zwCKf>C6Umk0W5(eAaamoIjJ0wWgwCT$Ysc3q@igcg|-x2yu1_`TTAKo5AGVgvqAZ(
z{bA?q>|-74-mB;N-sj%?TwOu`=YN9Nek1=?ffZdVSN-m{2(13ynl)>Fi$FK<UjwcE
z_4NGy_1<;AQeb`0y52u**x1+C_X>eco8Q>dDZZK&Ti@LFjFqnv*uDcs(4B8}YOiF)
zbN6lAHuM02T`#g5!wHl`_H?SRWbd{&-`>~zPIpf~;AMe#DT2(9=)ils-tV;hlKnmZ
z!7l`8l3>UTo8fkJT3*5ae&E^P-?w-D`du#zyp`pJoG9UvJg|Gqfx)4JAG`)yKOFvO
z<j~>g7H#&g-`^?yLSWbKBV?XXa9Kr;9@8}4$R0m&a_y)oOI)FQY~|LsdpdUi0^0u)
zAMQRSS~x-4gky15QFlw@6Nf%#2m<xWt2S&{HMy~4*x@CC_fH?)bB6aTf*{zMrWt{z
zRf{8t%2#+oIlFG(xwY?{@0fOg*1y11m<`FOViS>LX|xyUnr78##uj5fMlSU2y=Yz9
z-Z5Rjx2JpcJH0OnR9zZIr3#~XmS$*LVr6Sd(W*uDd|ouS_kR+?_~l*a|JXHl<@K#^
z16HkiNnm0m;8-Q&b2R0<24`Uu#+8BrFO9R84s<tMT#|@G&s+gpU*ETK5?b*BJGEks
z9-uVObG<MOT};=r8b()B;q27(xvMNLGsMAtE3fp9o$Ffn4Cs7c$G6R&N?ENIXqMrI
z25=8U$1)PDmZfzZo47XfX$_a$YqQTiJ3y0@=T>jr+u_<kmEr=5G7NB8njeNnK-GXo
zLR)*zj$C?gcX+kyMWC_X$;ru%|7*pPm3W5XaYc;NvjOM(q2?r^7H~CVVhS55RnhXg
zv2%cDe{G=aV`IHtU|+ZS%ow1Gl;IgQESqGLL^nd0))LC2ea*m%bJ>Xr>+;x@D_2%t
zxiUHS9H{Vl@45Y76h6Jt*WZ8G7@_AdiqfzE!?IX5o4BrP=m7_Q#=zX!+IV(680rHd
z{~PGS7d<^UXJ%%GW_$WBdc}|)DPkB#(Y0!lB(<bwvA*up8s^Rol#)4YqEwsz{P{+H
z4pbQZ61sKb#LVrh8^6-3Q;ETqibcwEDKLmYp=cv@g3zL@<mjcjVzpSUCL>?Jx3L3s
z;3PCSdg|TsiTR83JHHtSi#6S3DUNb|k18e!g_E%@u^@iT4ekugfng=pY;bhy+pnPW
zZSLwMG}XBG#qfm-JLZR`I1V#VyFxf#sOh0mN<ukqifHIlEM^psOiWZ=6ZR+;S6poV
zaCdii|7F{T(96T$-Mv5k(fk=rql#?Ai$K7jN}5-s5mgkLr0M8RU{;S@x<rvpk&*0X
zp1{0Qt5>hZ$cTp`6`2?s{_?_(DO#f>Ud-{L40~QN@M^fws^{XmP+`5IQ~mR$Ygk;*
z3zd4S)j|j6ySla@QB;8hkzum8PYvI?tr?UZ=W={A!s(<MxUN^v<?4cvCrv-lOUEWO
zMXkpR&E{f#F^?YEf9{5)Rw|Gv61Xxxy7Ry_!wBs--->e;JT0<G;MDA;<;BItoE&l%
zU8<_}#TKY8Ei5mzmIeCwfSJqlBGjr^A|iA7<8d&8K=-9w++<QJs98l;XY&iot$IFk
zY1ZMK%u;J{skQX|gXQIg#RX=LB$_#~3FSl{C?HyGyhhQqi#D5f#!u)V2n^kBwI0+3
zTk+}83H)?v@!^AqkN)!L@xz6O3z3^^)iY!rYPFgI&zKHpQ5xs5a$Zm+Pou!Lrr3B%
z5c$}4Lf50X(9~G=!6P=bnvb1Y7Rk4kmLIh0P`w$e?S<pQuo^myDCQ%{cS7CKLIja<
zlt9ox*S(N-T+4MHJVp_=^1WFqF|8#q6^ly{p(<QRd)2B@^bDLNGN|jD4$JxoDkF@^
zhK`ag>8zvshHs)^O2u5|uQIHu3(HH3iw_o{G=oSP6i)&@aYM&c6c)Tje3xSo6~>X&
zL}(OIP!qLaSd)dQqKc0neJ?ce6s`a5aimC)g0QIx8@{hqvmxua9_wM*uvRrg3N~q&
zRdiTEP&YL|Ix0$PW?)(6bG(EqQXEU32Ptrx!WjoaC@i5(7FJRv&=ISsc!{ZK2x@vL
zil!9m=%|LerWwL|nyCv!jIwA*)+K0W=6<7bzj5P-M&ZXNg`a-7db9A&Y~kk9+b1_q
z51pPlIe+5z>6!W4gFDMV&fFW?d5qP=<A#4{;_IR56XlB+=AqGPAkZlM{9U<mYg6Ir
zcXw|Vp3Ih?J}rE(W%lIe!Ob5G-n%~7D9>I!_0#ZZVfwP^D|fhX$K^v8PTd}y{_-l+
zXzVP{zEQaKW1%tpb7Az2!lq4y!}q3dY%b4^J4ef#Mhl;nH=Vlsq;RWn+JY^FLO3HG
zDIY{&CpEzjDl`g>*~37feE;sxg~82**(c@AU(;v49ld@wohw}bcJ#*RSGPXd{`b!c
zcd?X$4Ta@k?hb~g4x1vT3C#>O_KY9jGk)mI#K9x~I5x0ns#-c)q)T_sma20;Ju;FQ
z#nPPR7#1PpwgmndDI?*s%rM~0CuGPC1J2V8@ZJu=fuwn^?s~clvW_!C8k}z~1&%n1
z4n0c(j)*KFD3WGS6y%O9%MuO+dM(fc&9!LCqFoN03c%hoXquuq17u`-Be0HP_>N=3
zih@dr&v6FW`XJvF6NVuZMsP$?G8s67gDZs*5Fn0&PSSQO4r=MM797DdxRfCoBt;OD
zRbbx@!N~;@DU$)Igy1kLry#FkkXXPiRe%6U>=a2;1qME#3W7&qSprXSIg`mq5{{-g
z#Dd6J-)C8H6#JnA2K?*>w87;%KAhqx0)x%vyT0%EUg!h4G(|HYL<D@zK{B2q8HTV)
z21N)Gmq3A0ZGr?dgfk>TMkJ})pungVyFGKM6FMMZg!Nq(bmc*+O3Dl`Mv)pZ4EQ!9
zfwfJjkxG)b$_sG>oFnj*A^8~G+LEHkM|MS2Z4#^tWJeJpt0J!wQF~e2-e84+7TCFJ
z!~;`;0jp($10yDJ6_`gAa0x;TdX`8Y!pU~f4DdoF*|r&pBuOv^l942`67vx$14-Mq
z2^ocDLTwl9C?Cgsg<yyZc&%4JFO^7*MX?ewQ7q)a_ZWy#&F6D@k+((g#V875g=8Yo
zr)o<Gjxs=pBqW>!o;E~A0`Mi}N-PRI2vg*FRmkP?0<Tuucc7C8uWd2k1bV7k0n-u#
h(WpY^@;N~i{t3JmolRX88I1q{002ovPDHLkV1l^k=YjwL

diff --git a/src/main.go b/src/main.go
index 94065f5..87bebbc 100644
--- a/src/main.go
+++ b/src/main.go
@@ -8,6 +8,8 @@ import (
 	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/cors"
 	"github.com/gofiber/fiber/v2/middleware/recover"
+	"github.com/mcstatus-io/shared/redis"
+	"github.com/mcstatus-io/shared/util"
 )
 
 var (
@@ -19,9 +21,8 @@ var (
 			return ctx.SendStatus(http.StatusInternalServerError)
 		},
 	})
-	r              *Redis              = &Redis{}
-	config         *Config             = &Config{}
-	blockedServers *MutexArray[string] = nil
+	r      *redis.Redis = redis.New()
+	config *Config      = &Config{}
 )
 
 func init() {
@@ -29,13 +30,17 @@ func init() {
 		log.Fatal(err)
 	}
 
-	if err := r.Connect(config.Redis); err != nil {
-		log.Fatal(err)
+	r.SetEnabled(config.Cache.Enable)
+
+	if config.Cache.Enable {
+		if err := r.Connect(config.Redis); err != nil {
+			log.Fatal(err)
+		}
+
+		log.Println("Successfully connected to Redis")
 	}
 
-	log.Println("Successfully connected to Redis")
-
-	if err := GetBlockedServerList(); err != nil {
+	if err := util.GetBlockedServerList(); err != nil {
 		log.Fatal(err)
 	}
 
diff --git a/src/redis.go b/src/redis.go
deleted file mode 100644
index 25e5b90..0000000
--- a/src/redis.go
+++ /dev/null
@@ -1,170 +0,0 @@
-package main
-
-import (
-	"context"
-	"time"
-
-	"github.com/go-redis/redis/v8"
-)
-
-type Redis struct {
-	Client *redis.Client
-}
-
-func (r *Redis) Connect(uri string) error {
-	if !config.Cache.Enable {
-		return nil
-	}
-
-	opts, err := redis.ParseURL(uri)
-
-	if err != nil {
-		return err
-	}
-
-	r.Client = redis.NewClient(opts)
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
-
-	defer cancel()
-
-	return r.Client.Ping(ctx).Err()
-}
-
-func (r *Redis) GetCacheString(key string) (bool, string, time.Duration, error) {
-	exists, err := r.Exists(key)
-
-	if err != nil {
-		return false, "", 0, err
-	}
-
-	if !exists {
-		return false, "", 0, nil
-	}
-
-	value, err := r.GetString(key)
-
-	if err != nil {
-		return true, "", 0, err
-	}
-
-	ttl, err := r.TTL(key)
-
-	return true, value, ttl, err
-}
-
-func (r *Redis) GetCacheBytes(key string) (bool, []byte, time.Duration, error) {
-	exists, err := r.Exists(key)
-
-	if err != nil {
-		return false, nil, 0, err
-	}
-
-	if !exists {
-		return false, nil, 0, nil
-	}
-
-	value, err := r.GetBytes(key)
-
-	if err != nil {
-		return true, nil, 0, err
-	}
-
-	ttl, err := r.TTL(key)
-
-	return true, value, ttl, err
-}
-
-func (r *Redis) Exists(key string) (bool, error) {
-	if !config.Cache.Enable {
-		return false, nil
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
-
-	defer cancel()
-
-	res := r.Client.Exists(ctx, key)
-
-	if err := res.Err(); err != nil {
-		return false, err
-	}
-
-	val, err := res.Result()
-
-	return val == 1, err
-}
-
-func (r *Redis) TTL(key string) (time.Duration, error) {
-	if !config.Cache.Enable {
-		return 0, nil
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
-
-	defer cancel()
-
-	res := r.Client.TTL(ctx, key)
-
-	if err := res.Err(); err != nil {
-		return 0, err
-	}
-
-	return res.Result()
-}
-
-func (r *Redis) GetString(key string) (string, error) {
-	if !config.Cache.Enable {
-		return "", nil
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
-
-	defer cancel()
-
-	res := r.Client.Get(ctx, key)
-
-	if err := res.Err(); err != nil {
-		return "", nil
-	}
-
-	return res.Result()
-}
-
-func (r *Redis) GetBytes(key string) ([]byte, error) {
-	if !config.Cache.Enable {
-		return nil, nil
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
-
-	defer cancel()
-
-	res := r.Client.Get(ctx, key)
-
-	if err := res.Err(); err != nil {
-		return nil, err
-	}
-
-	return res.Bytes()
-}
-
-func (r *Redis) Set(key string, value interface{}, ttl time.Duration) error {
-	if !config.Cache.Enable {
-		return nil
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
-
-	defer cancel()
-
-	return r.Client.Set(ctx, key, value, ttl).Err()
-}
-
-func (r *Redis) Close() error {
-	if !config.Cache.Enable {
-		return nil
-	}
-
-	return r.Client.Close()
-}
diff --git a/src/routes.go b/src/routes.go
index 8130205..5ba2342 100644
--- a/src/routes.go
+++ b/src/routes.go
@@ -5,6 +5,8 @@ import (
 	"strconv"
 
 	"github.com/gofiber/fiber/v2"
+	"github.com/mcstatus-io/shared/status"
+	"github.com/mcstatus-io/shared/util"
 )
 
 func init() {
@@ -27,7 +29,7 @@ func JavaStatusHandler(ctx *fiber.Ctx) error {
 		return ctx.Status(http.StatusBadRequest).SendString("Invalid address value")
 	}
 
-	response, expiresAt, err := GetJavaStatus(host, port)
+	response, expiresAt, err := status.GetJavaStatus(r, host, port, config.Cache.JavaCacheDuration)
 
 	if err != nil {
 		return err
@@ -37,7 +39,7 @@ func JavaStatusHandler(ctx *fiber.Ctx) error {
 		ctx.Set("X-Cache-Time-Remaining", strconv.Itoa(int(expiresAt.Seconds())))
 	}
 
-	return ctx.Type("json").SendString(response)
+	return ctx.JSON(response)
 }
 
 func BedrockStatusHandler(ctx *fiber.Ctx) error {
@@ -47,7 +49,7 @@ func BedrockStatusHandler(ctx *fiber.Ctx) error {
 		return ctx.Status(http.StatusBadRequest).SendString("Invalid address value")
 	}
 
-	response, expiresAt, err := GetBedrockStatus(host, port)
+	response, expiresAt, err := status.GetBedrockStatus(r, host, port, config.Cache.BedrockCacheDuration)
 
 	if err != nil {
 		return err
@@ -57,7 +59,7 @@ func BedrockStatusHandler(ctx *fiber.Ctx) error {
 		ctx.Set("X-Cache-Time-Remaining", strconv.Itoa(int(expiresAt.Seconds())))
 	}
 
-	return ctx.Type("json").SendString(response)
+	return ctx.JSON(response)
 }
 
 func IconHandler(ctx *fiber.Ctx) error {
@@ -67,7 +69,7 @@ func IconHandler(ctx *fiber.Ctx) error {
 		return ctx.Status(http.StatusBadRequest).SendString("Invalid address value")
 	}
 
-	icon, expiresAt, err := GetServerIcon(host, port)
+	icon, expiresAt, err := status.GetServerIcon(r, host, port, config.Cache.IconCacheDuration)
 
 	if err != nil {
 		return err
@@ -81,7 +83,7 @@ func IconHandler(ctx *fiber.Ctx) error {
 }
 
 func DefaultIconHandler(ctx *fiber.Ctx) error {
-	return ctx.Type("png").Send(defaultIconBytes)
+	return ctx.Type("png").Send(util.DefaultIconBytes)
 }
 
 func NotFoundHandler(ctx *fiber.Ctx) error {
diff --git a/src/status.go b/src/status.go
deleted file mode 100644
index 508d674..0000000
--- a/src/status.go
+++ /dev/null
@@ -1,335 +0,0 @@
-package main
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/mcstatus-io/mcutil"
-)
-
-type StatusResponse struct {
-	Online      bool   `json:"online"`
-	Host        string `json:"host"`
-	Port        uint16 `json:"port"`
-	EULABlocked bool   `json:"eula_blocked"`
-}
-
-type JavaStatusResponse struct {
-	StatusResponse
-	Version *JavaVersion `json:"version"`
-	Players JavaPlayers  `json:"players"`
-	MOTD    MOTD         `json:"motd"`
-	Icon    *string      `json:"icon"`
-	Mods    []Mod        `json:"mods"`
-}
-
-type BedrockStatusResponse struct {
-	StatusResponse
-	Version  *BedrockVersion `json:"version"`
-	Players  *BedrockPlayers `json:"players"`
-	MOTD     *MOTD           `json:"motd"`
-	Gamemode *string         `json:"gamemode"`
-	ServerID *string         `json:"server_id"`
-	Edition  *string         `json:"edition"`
-}
-
-type JavaVersion struct {
-	NameRaw   string `json:"name_raw"`
-	NameClean string `json:"name_clean"`
-	NameHTML  string `json:"name_html"`
-	Protocol  int    `json:"protocol"`
-}
-
-type BedrockVersion struct {
-	Name     *string `json:"name"`
-	Protocol *int64  `json:"protocol"`
-}
-
-type JavaPlayers struct {
-	Online int      `json:"online"`
-	Max    int      `json:"max"`
-	List   []Player `json:"list"`
-}
-
-type BedrockPlayers struct {
-	Online *int64 `json:"online"`
-	Max    *int64 `json:"max"`
-}
-
-type Player struct {
-	UUID      string `json:"uuid"`
-	NameRaw   string `json:"name_raw"`
-	NameClean string `json:"name_clean"`
-	NameHTML  string `json:"name_html"`
-}
-
-type MOTD struct {
-	Raw   string `json:"raw"`
-	Clean string `json:"clean"`
-	HTML  string `json:"html"`
-}
-
-type Mod struct {
-	Name    string `json:"name"`
-	Version string `json:"version"`
-}
-
-func GetJavaStatus(host string, port uint16) (string, *time.Duration, error) {
-	cacheKey := fmt.Sprintf("java:%s-%d", host, port)
-
-	exists, value, ttl, err := r.GetCacheString(cacheKey)
-
-	if exists {
-		return value, &ttl, err
-	}
-
-	response, err := json.Marshal(FetchJavaStatus(host, port))
-
-	if err != nil {
-		return "", nil, err
-	}
-
-	if err := r.Set(cacheKey, response, config.Cache.JavaCacheDuration); err != nil {
-		return "", nil, err
-	}
-
-	return string(response), nil, nil
-}
-
-func GetBedrockStatus(host string, port uint16) (string, *time.Duration, error) {
-	cacheKey := fmt.Sprintf("bedrock:%s-%d", host, port)
-
-	exists, value, ttl, err := r.GetCacheString(cacheKey)
-
-	if exists {
-		return value, &ttl, err
-	}
-
-	response, err := json.Marshal(FetchBedrockStatus(host, port))
-
-	if err != nil {
-		return "", nil, err
-	}
-
-	if err := r.Set(cacheKey, response, config.Cache.BedrockCacheDuration); err != nil {
-		return "", nil, err
-	}
-
-	return string(response), nil, nil
-}
-
-func GetServerIcon(host string, port uint16) ([]byte, *time.Duration, error) {
-	cacheKey := fmt.Sprintf("icon:%s-%d", host, port)
-
-	exists, value, ttl, err := r.GetCacheBytes(cacheKey)
-
-	if exists {
-		return value, &ttl, err
-	}
-
-	icon := defaultIconBytes
-
-	status, err := mcutil.Status(host, port)
-
-	if err == nil && status.Favicon != nil && strings.HasPrefix(*status.Favicon, "data:image/png;base64,") {
-		data, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(*status.Favicon, "data:image/png;base64,"))
-
-		if err != nil {
-			return nil, nil, err
-		}
-
-		icon = data
-	}
-
-	if err := r.Set(cacheKey, icon, config.Cache.IconCacheDuration); err != nil {
-		return nil, nil, err
-	}
-
-	return icon, nil, nil
-}
-
-func FetchJavaStatus(host string, port uint16) interface{} {
-	status, err := mcutil.Status(host, port)
-
-	if err != nil {
-		statusLegacy, err := mcutil.StatusLegacy(host, port)
-
-		if err != nil {
-			return StatusResponse{
-				Online:      false,
-				Host:        host,
-				Port:        port,
-				EULABlocked: IsBlockedAddress(host),
-			}
-		}
-
-		response := JavaStatusResponse{
-			StatusResponse: StatusResponse{
-				Online:      true,
-				Host:        host,
-				Port:        port,
-				EULABlocked: IsBlockedAddress(host),
-			},
-			Version: nil,
-			Players: JavaPlayers{
-				Online: statusLegacy.Players.Online,
-				Max:    statusLegacy.Players.Max,
-				List:   make([]Player, 0),
-			},
-			MOTD: MOTD{
-				Raw:   statusLegacy.MOTD.Raw,
-				Clean: statusLegacy.MOTD.Clean,
-				HTML:  statusLegacy.MOTD.HTML,
-			},
-			Icon: nil,
-			Mods: make([]Mod, 0),
-		}
-
-		if statusLegacy.Version != nil {
-			response.Version = &JavaVersion{
-				NameRaw:   statusLegacy.Version.NameRaw,
-				NameClean: statusLegacy.Version.NameClean,
-				NameHTML:  statusLegacy.Version.NameHTML,
-				Protocol:  statusLegacy.Version.Protocol,
-			}
-		}
-
-		return response
-	}
-
-	playerList := make([]Player, 0)
-
-	if status.Players.Sample != nil {
-		for _, player := range status.Players.Sample {
-			playerList = append(playerList, Player{
-				UUID:      player.ID,
-				NameRaw:   player.NameRaw,
-				NameClean: player.NameClean,
-				NameHTML:  player.NameHTML,
-			})
-		}
-	}
-
-	modList := make([]Mod, 0)
-
-	if status.ModInfo != nil {
-		for _, mod := range status.ModInfo.Mods {
-			modList = append(modList, Mod{
-				Name:    mod.ID,
-				Version: mod.Version,
-			})
-		}
-	}
-
-	return JavaStatusResponse{
-		StatusResponse: StatusResponse{
-			Online:      true,
-			Host:        host,
-			Port:        port,
-			EULABlocked: IsBlockedAddress(host),
-		},
-		Version: &JavaVersion{
-			NameRaw:   status.Version.NameRaw,
-			NameClean: status.Version.NameClean,
-			NameHTML:  status.Version.NameHTML,
-			Protocol:  status.Version.Protocol,
-		},
-		Players: JavaPlayers{
-			Online: status.Players.Online,
-			Max:    status.Players.Max,
-			List:   playerList,
-		},
-		MOTD: MOTD{
-			Raw:   status.MOTD.Raw,
-			Clean: status.MOTD.Clean,
-			HTML:  status.MOTD.HTML,
-		},
-		Icon: status.Favicon,
-		Mods: modList,
-	}
-}
-
-func FetchBedrockStatus(host string, port uint16) interface{} {
-	status, err := mcutil.StatusBedrock(host, port)
-
-	if err != nil {
-		return StatusResponse{
-			Online:      false,
-			Host:        host,
-			Port:        port,
-			EULABlocked: IsBlockedAddress(host),
-		}
-	}
-
-	response := BedrockStatusResponse{
-		StatusResponse: StatusResponse{
-			Online:      true,
-			Host:        host,
-			Port:        port,
-			EULABlocked: IsBlockedAddress(host),
-		},
-		Version:  nil,
-		Players:  nil,
-		MOTD:     nil,
-		Gamemode: status.Gamemode,
-		ServerID: status.ServerID,
-		Edition:  status.Edition,
-	}
-
-	if status.Version != nil {
-		if response.Version == nil {
-			response.Version = &BedrockVersion{
-				Name:     nil,
-				Protocol: nil,
-			}
-		}
-
-		response.Version.Name = status.Version
-	}
-
-	if status.ProtocolVersion != nil {
-		if response.Version == nil {
-			response.Version = &BedrockVersion{
-				Name:     nil,
-				Protocol: nil,
-			}
-		}
-
-		response.Version.Protocol = status.ProtocolVersion
-	}
-
-	if status.OnlinePlayers != nil {
-		if response.Players == nil {
-			response.Players = &BedrockPlayers{
-				Online: nil,
-				Max:    nil,
-			}
-		}
-
-		response.Players.Online = status.OnlinePlayers
-	}
-
-	if status.MaxPlayers != nil {
-		if response.Players == nil {
-			response.Players = &BedrockPlayers{
-				Online: nil,
-				Max:    nil,
-			}
-		}
-
-		response.Players.Max = status.MaxPlayers
-	}
-
-	if status.MOTD != nil {
-		response.MOTD = &MOTD{
-			Raw:   status.MOTD.Raw,
-			Clean: status.MOTD.Clean,
-			HTML:  status.MOTD.HTML,
-		}
-	}
-
-	return response
-}
diff --git a/src/util.go b/src/util.go
index baa3127..42771c1 100644
--- a/src/util.go
+++ b/src/util.go
@@ -1,91 +1,14 @@
 package main
 
 import (
-	"crypto/sha1"
 	_ "embed"
-	"encoding/hex"
 	"fmt"
-	"io"
 	"log"
-	"net/http"
 	"os"
-	"regexp"
 	"strconv"
 	"strings"
-	"sync"
 )
 
-var (
-	//go:embed icon.png
-	defaultIconBytes []byte
-	ipAddressRegExp  = regexp.MustCompile(`^\d{1,3}(\.\d{1,3}){3}$`)
-)
-
-func GetBlockedServerList() error {
-	resp, err := http.Get("https://sessionserver.mojang.com/blockedservers")
-
-	if err != nil {
-		return err
-	}
-
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("unexpected status code: %d", resp.StatusCode)
-	}
-
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-
-	if err != nil {
-		return err
-	}
-
-	blockedServers = &MutexArray[string]{
-		List:  strings.Split(string(body), "\n"),
-		Mutex: &sync.Mutex{},
-	}
-
-	return nil
-}
-
-func IsBlockedAddress(address string) bool {
-	split := strings.Split(strings.ToLower(address), ".")
-
-	isIPAddress := ipAddressRegExp.MatchString(address)
-
-	for k := range split {
-		newAddress := ""
-
-		switch k {
-		case 0:
-			{
-				newAddress = strings.Join(split, ".")
-
-				break
-			}
-		default:
-			{
-				if isIPAddress {
-					newAddress = fmt.Sprintf("%s.*", strings.Join(split[0:len(split)-k], "."))
-				} else {
-					newAddress = fmt.Sprintf("*.%s", strings.Join(split[k:], "."))
-				}
-
-				break
-			}
-		}
-
-		newAddressBytes := sha1.Sum([]byte(newAddress))
-		newAddressHash := hex.EncodeToString(newAddressBytes[:])
-
-		if blockedServers.Has(newAddressHash) {
-			return true
-		}
-	}
-
-	return false
-}
-
 func ParseAddress(address string, defaultPort uint16) (string, uint16, error) {
 	result := strings.SplitN(address, ":", 2)
 
@@ -119,22 +42,3 @@ func GetInstanceID() (uint16, error) {
 
 	return 0, nil
 }
-
-type MutexArray[K comparable] struct {
-	List  []K
-	Mutex *sync.Mutex
-}
-
-func (m *MutexArray[K]) Has(value K) bool {
-	m.Mutex.Lock()
-
-	defer m.Mutex.Unlock()
-
-	for _, v := range m.List {
-		if v == value {
-			return true
-		}
-	}
-
-	return false
-}