diff --git a/nimscan/scanner.nim b/nimscan/scanner.nim index 24e8451..ed8e9f9 100644 --- a/nimscan/scanner.nim +++ b/nimscan/scanner.nim @@ -37,13 +37,14 @@ proc hit(host: string) {.gcsafe.} = proc main(): void {.thread.} = while true: - var ip = GenerateIP() - var ping = status(ip) + var + ip = GenerateIP() + ping = status(ip) if ping: hit(ip) discard -var cmd = os.execShellCmd("clear") +discard os.execShellCmd("clear") var cLock: Lock initLock(cLock) var thread: Thread[void] diff --git a/server/css/index.css b/server/css/index.css new file mode 100644 index 0000000..ac3a19f --- /dev/null +++ b/server/css/index.css @@ -0,0 +1,20 @@ +@import url('https://fonts.googleapis.com/css2?family=Nunito+Sans:wght@200&display=swap'); +.😳 { + padding: 10px; + color: #dcddde; + font-size: 20px; + border: solid rgba(168, 168, 168, 0.89) 1px; +} +.👽 { + font-family: 'Nunito Sans'; + padding: 10px; + font-size: 25px; + color: rgba(255, 255, 255, 0.959); + text-align: center; +} +.💀 { + background-color: rgba(49, 49, 49, 0.89); +} +body { + background-color: rgb(20, 20, 20); +} \ No newline at end of file diff --git a/server/index.js b/server/index.js index 8b7653d..4e1f170 100644 --- a/server/index.js +++ b/server/index.js @@ -23,7 +23,7 @@ const makeEmbed = (mc, neit) => { .addField("**Players**", `\`${mc.players.online}/${mc.players.max}\``, true) .addField("**Ping**", `\`${mc.roundTripLatency}ms\``, true) .addField("**Motd**", "```\n" + mc.motd.clean + "\n```") - .addField("**Playerlist Sample**", "```\n" + mc.PlayerList + "\n```") + .addField("**Playerlist Sample**", "```fix\n" + mc.PlayerList + "\n```") .addField("**IP Range**", "```\n" + geoIP.pretty(mc.ip.range[0]) + " - " + geoIP.pretty(mc.ip.range[1]) + "```") .setTimestamp() @@ -71,7 +71,7 @@ app.post("/server", async (req, res) => { Minecraft.Server = `${Server}:25565` var cleanMOTD = replaceMOTD(Minecraft.motd.clean) Minecraft.PlayerList = "" - Minecraft.players.sample ? Minecraft.players.sample.forEach(e => Minecraft.PlayerList += `${e.name}::${e.id}\n`) : Minecraft.PlayerList = "No Players" + Minecraft.players.sample ? Minecraft.players.sample.forEach(e => Minecraft.PlayerList += `${e.name} : ${e.id}\n`) : Minecraft.PlayerList = "No Players" db.exec(`INSERT INTO servers VALUES ( '${Minecraft.Server}', '${Minecraft.version.name}', @@ -100,5 +100,63 @@ app.listen(9000, () => { console.clear() console.log("server ready") }) +app.use(express.static(`${__dirname}/css`)) +app.get('/', async(req, res) => { + db.all(`SELECT host, version FROM servers`, async(err, servers) => { + var table = "" + for (var srv of servers) { + var proto = srv.version.split(" ") + proto.length >= 2 ? software = proto[0] : software = "Vanilla" + proto.length <= 1 ? version = proto[0] : version = proto[1] + table += `
Host | Version | Software |