feat: more peer-info command details

Author: kehiy

client/client.go

@@ -99,6 +99,16 @@ func (c *Client) IsValidator(address string) (bool, error) {
 	return false, nil
 }
 
+func (c *Client) GetValidatorInfo(address string) (*pactus.GetValidatorResponse, error) {
+	validator, err := c.blockchainClient.GetValidator(context.Background(),
+		&pactus.GetValidatorRequest{Address: address})
+	if err != nil {
+		return nil, err
+	}
+
+	return validator, nil
+}
+
 func (c *Client) TransactionData(hash string) (*pactus.TransactionInfo, error) {
 	data, err := c.transactionClient.GetTransaction(context.Background(),
 		&pactus.GetTransactionRequest{

discord/discord.go

@@ -151,6 +151,10 @@ func (b *Bot) messageHandler(s *discordgo.Session, m *discordgo.MessageCreate) {
 			return
 		}
 
+		parts := strings.Split(strings.Split(peerInfo.Address, "/")[2], "/")
+		ip := parts[0]
+		geoData := getGeoIP(ip)
+
 		notSyncedMsg := "this peer is not synced with network, gRPC is disabled or doesn't have public IP address."
 		syncedMsg := "**this peer is synced with network**"
 
@@ -169,12 +173,27 @@ func (b *Bot) messageHandler(s *discordgo.Session, m *discordgo.MessageCreate) {
 			isSynced = syncedMsg
 		}
 
+		val, err := c.GetValidatorInfo(trimmedAddress)
+		if err != nil {
+			msg := p.Sprintf("An error occurred %v\n", err)
+			_, _ = s.ChannelMessageSendReply(m.ChannelID, msg, m.Reference())
+			return
+		}
+
 		msg := p.Sprintf("Peer info\n")
 		msg += p.Sprintf("Peer ID: %v\n", peerID)
 		msg += p.Sprintf("IP address: %v\n", peerInfo.Address)
 		msg += p.Sprintf("Agent: %v\n", peerInfo.Agent)
 		msg += p.Sprintf("Moniker: %v\n", peerInfo.Moniker)
 		msg += p.Sprintf("IsSynced: %v\n", isSynced)
+		msg += p.Sprintf("Country: %v\n", geoData.CountryName)
+		msg += p.Sprintf("City: %v\n", geoData.City)
+		msg += p.Sprintf("Region Name: %v\n", geoData.RegionName)
+		msg += p.Sprintf("--------------------Validator Info----------------\n")
+		msg += p.Sprintf("Number: %v", val.Validator.Number)
+		msg += p.Sprintf("Last bonding height: %v", val.Validator.LastBondingHeight)
+		msg += p.Sprintf("Last sortition height: %v", val.Validator.LastSortitionHeight)
+		msg += p.Sprintf("Stake amount: %v", val.Validator.Stake)
 		_, _ = s.ChannelMessageSendReply(m.ChannelID, msg, m.Reference())
 		return
 	}

discord/ip.go

@@ -0,0 +1,47 @@
+package discord
+
+import (
+	"encoding/json"
+	"io"
+	"net/http"
+)
+
+type GeoIP struct {
+	// The right side is the name of the JSON variable
+	Ip          string  `json:"ip"`
+	CountryCode string  `json:"country_code"`
+	CountryName string  `json:"country_name"`
+	RegionCode  string  `json:"region_code"`
+	RegionName  string  `json:"region_name"`
+	City        string  `json:"city"`
+	Zipcode     string  `json:"zipcode"`
+	Lat         float32 `json:"latitude"`
+	Lon         float32 `json:"longitude"`
+	MetroCode   int     `json:"metro_code"`
+	AreaCode    int     `json:"area_code"`
+}
+
+func getGeoIP(ip string) *GeoIP {
+	geo := &GeoIP{}
+	response, err := http.Get("https://freegeoip.net/json/" + ip)
+	if err != nil {
+		return geo
+	}
+	defer response.Body.Close()
+
+	// response.Body() is a reader type. We have
+	// to use ioutil.ReadAll() to read the data
+	// in to a byte slice(string)
+	body, err := io.ReadAll(response.Body)
+	if err != nil {
+		return geo
+	}
+
+	// Unmarshal the JSON byte slice to a GeoIP struct
+	err = json.Unmarshal(body, &geo)
+	if err != nil {
+		return geo
+	}
+
+	return geo
+}