added map

This commit is contained in:
Acid
2026-05-26 18:04:08 -04:00
parent a3ec2fada7
commit 5288323831
3 changed files with 121 additions and 23 deletions
+57 -12
View File
@@ -2,9 +2,9 @@ package main
import ( import (
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"io" "io"
"log/slog"
"net" "net"
"net/http" "net/http"
"os" "os"
@@ -24,6 +24,28 @@ type ipResponse struct {
Continent string `json:"continent"` Continent string `json:"continent"`
} }
type IPInfo struct {
Query string `json:"query"`
Status string `json:"status"`
Country string `json:"country"`
CountryCode string `json:"countryCode"`
Region string `json:"region"`
RegionName string `json:"regionName"`
City string `json:"city"`
Zip string `json:"zip"`
Lat float64 `json:"lat"`
Lon float64 `json:"lon"`
Timezone string `json:"timezone"`
ISP string `json:"isp"`
Org string `json:"org"`
AS string `json:"as"`
}
type TemolateData struct {
Ip ipResponse
IP2 IPInfo
}
func main() { func main() {
mux := http.NewServeMux() mux := http.NewServeMux()
@@ -40,6 +62,7 @@ func main() {
http.ListenAndServe(":8080", mux) http.ListenAndServe(":8080", mux)
} }
// Routes
func handleRoot(w http.ResponseWriter, r *http.Request) { func handleRoot(w http.ResponseWriter, r *http.Request) {
templ, err := template.ParseFiles("templates/home.html") templ, err := template.ParseFiles("templates/home.html")
if err != nil { if err != nil {
@@ -58,34 +81,35 @@ func handleRoot(w http.ResponseWriter, r *http.Request) {
host, _, _ = net.SplitHostPort(r.RemoteAddr) host, _, _ = net.SplitHostPort(r.RemoteAddr)
} }
dox, err := callApi(host) dox := callApi(host)
if err != nil { dox2 := secondApi(host)
http.Error(w, "api call failed", http.StatusInternalServerError)
return
}
templ.Execute(w, dox) templ.Execute(w, TemolateData{Ip: dox, IP2: *dox2})
} }
func serveRobots(w http.ResponseWriter, r *http.Request) { func serveRobots(w http.ResponseWriter, r *http.Request) {
http.ServeFile(w, r, ("templates/robots.txt")) http.ServeFile(w, r, ("templates/robots.txt"))
} }
func callApi(ip string) (ipResponse, error) { // utils
func callApi(ip string) ipResponse {
api := os.Getenv("IPAPI") api := os.Getenv("IPAPI")
fmt.Printf("api: %v\n", api)
slog.Info("client called", "ip", ip)
var values ipResponse var values ipResponse
if api == " " { if api == " " {
return values, errors.New("No api key") slog.Error("No api provided")
return values
} }
url := fmt.Sprintf("https://api.ipinfo.io/lite/%s?token=%s", ip, api) url := fmt.Sprintf("https://api.ipinfo.io/lite/%s?token=%s", ip, api)
request, err := http.Get(url) request, err := http.Get(url)
if err != nil { if err != nil {
return values, errors.New("request failed") slog.Error("callApi Error")
return values
} }
defer request.Body.Close() defer request.Body.Close()
@@ -93,5 +117,26 @@ func callApi(ip string) (ipResponse, error) {
err = json.Unmarshal(body, &values) err = json.Unmarshal(body, &values)
return values, nil return values
}
func secondApi(ip string) *IPInfo {
url := fmt.Sprintf("http://ip-api.com/json/%s", ip)
var res IPInfo
response, err := http.Get(url)
if err != nil {
slog.Error("secondApi err")
return &res
}
defer response.Body.Close()
body, _ := io.ReadAll(response.Body)
json.Unmarshal(body, &res)
slog.Debug("secondApi", "city", res.City, "lat", res.Lat, "lon", res.Lon, "status", res.Status)
return &res
} }
+17
View File
@@ -13,6 +13,23 @@ h1 {
font-family: GlitchGoblin; font-family: GlitchGoblin;
} }
.layout {
display: flex;
gap: 40px;
align-items: flex-start;
padding: 0 40px;
}
.container {
flex-shrink: 0;
}
#map {
width: 400px;
height: 400px;
flex-shrink: 0;
}
.info { .info {
margin-bottom: 20px; margin-bottom: 20px;
} }
+46 -10
View File
@@ -1,24 +1,60 @@
<!doctype html> <!doctype html>
<html> <html>
<head>
<head>
<link rel="icon" type="image/x-icon" href="/static/favicon.ico" /> <link rel="icon" type="image/x-icon" href="/static/favicon.ico" />
<link rel="stylesheet" href="/static/styles.css" /> <link rel="stylesheet" href="/static/styles.css" />
<meta name="viewport" content="width=device-width,initial-scale=1"> <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
<meta charset="UTF-8"> <meta name="viewport" content="width=device-width,initial-scale=1" />
<meta charset="UTF-8" />
<title>Who are you?</title> <title>Who are you?</title>
</head> </head>
<body>
<body>
<h1> <h1>
U HAVE THREAD <br /> U HAVE THREAD <br />
UPON MY DOMAIN <br /> UPON MY DOMAIN <br />
& MUST SUFFER <br /> & MUST SUFFER <br />
WHO R U? WHO R U?
</h1> </h1>
<div class="layout">
<div class="container"> <div class="container">
<div class="info"><h2>IP Address:</h2><p>{{.IP}}</p></div> <div class="info">
<div class="info"><h2>Country:</h2><p>{{.Country}}</p></div> <h2>IP Address:</h2>
<div class="info"><h2>Continent:</h2><p>{{.Continent}}</p></div> <p>{{.Ip.IP}}</p>
<div class="info"><h2>Internet Provider:</h2><p>{{.AsName}}</p></div>
</div> </div>
</body> <div class="info">
<h2>Country:</h2>
<p>{{.Ip.Country}}</p>
</div>
<div class="info">
<h2>Continent:</h2>
<p>{{.Ip.Continent}}</p>
</div>
<div class="info">
<h2>Internet Provider:</h2>
<p>{{.Ip.AsName}}</p>
</div>
<div class="info">
<h2>City:</h2>
<p>{{.IP2.City}}</p>
</div>
<div class="info">
<h2>Coordinates:</h2>
<p>{{.IP2.Lat}}, {{.IP2.Lon}}</p>
</div>
</div>
<div id="map"></div>
<script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
<script>
var map = L.map('map', { maxZoom: 10 }).setView([{{.IP2.Lat}}, {{.IP2.Lon}}], 8);
L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '© OpenStreetMap'
}).addTo(map);
L.marker([{{.IP2.Lat}}, {{.IP2.Lon}}]).addTo(map);
</script>
</div>
</body>
</html> </html>