Merge pull request #220 from JustHumanz/rework_prediction

Remove prediction & slash command logs

go.mod

@@ -24,7 +24,7 @@ require (
 	github.com/stretchr/testify v1.7.0 // indirect
 	github.com/top-gg/go-dbl v0.0.0-20201116001615-e844586b1159
 	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
-	golang.org/x/net v0.0.0-20210908191846-a5e095526f91 // indirect
+	golang.org/x/net v0.0.0-20210908191846-a5e095526f91
 	golang.org/x/sys v0.0.0-20210908160347-a851e7ddeee0 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
 	google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83 // indirect

pkg/config/config.go

@@ -168,6 +168,7 @@ type ConfigFile struct {
 	DonationLink   string `toml:"DonationLink"`
 	TopGG          string `toml:"TOPGG"`
 	Domain         string `toml:"Domain"`
+	PrometheusURL  string `toml:"PrometheusURL"`
 	LowResources   bool   `toml:"LowResources"` //Disable update like fanart & set wait every 5 counter
 	Metric         bool   `toml:"Metric"`
 	Twitch         struct {

pkg/database/generaldb.go

@@ -131,7 +131,7 @@ func (Member Member) GetSubsCount() (*MemberSubs, error) {
 	)
 
 	val, err := GeneralCache.Get(context.Background(), Key).Result()
-	if len(val) == 0 || err == redis.Nil {
+	if val == "" || err == redis.Nil {
 		rows, err := DB.Query(`SELECT * FROM Subscriber WHERE VtuberMember_id=?`, Member.ID)
 		if err != nil {
 			return nil, err

pkg/engine/initSlash.go

@@ -449,7 +449,13 @@ func InitSlash(Bot *discordgo.Session, GroupsPayload []database.Group, NewGuild
 						Type:        discordgo.ApplicationCommandOptionString,
 						Required:    true,
 						Name:        "vtuber-name",
-						Description: "select vtuber name",
+						Description: "input vtuber name",
+					},
+					{
+						Type:        discordgo.ApplicationCommandOptionInteger,
+						Required:    false,
+						Name:        "prediction-count",
+						Description: "imput prediction-count(days)\nexample,1 is tomorrow or 7 is next week",
 					},
 				},
 			},

pkg/engine/prediction.go

@@ -0,0 +1,44 @@
+package engine
+
+import (
+	"encoding/json"
+	"strconv"
+
+	"github.com/JustHumanz/Go-Simp/pkg/config"
+	"github.com/JustHumanz/Go-Simp/pkg/database"
+	"github.com/JustHumanz/Go-Simp/pkg/network"
+)
+
+func Prediction(vtuber database.Member, state string, tar int) (int, error) {
+
+	type PromeMetric struct {
+		Status string `json:"status"`
+		Data   struct {
+			Resulttype string `json:"resultType"`
+			Result     []struct {
+				Metric interface{}   `json:"metric"`
+				Value  []interface{} `json:"value"`
+			} `json:"result"`
+		} `json:"data"`
+	}
+
+	var Data PromeMetric
+
+	RawQuery := "/api/v1/query?query=%0Apredict_linear(get_subscriber{state%3D\"" + state + "\"%2C+vtuber%3D\"" + vtuber.Name + "\"}+[356d]%2C86400*" + strconv.Itoa(tar) + ")"
+
+	RawData, err := network.Curl(config.GoSimpConf.PrometheusURL+RawQuery, nil)
+	if err != nil {
+		return 0, nil
+	}
+	err = json.Unmarshal(RawData, &Data)
+	if err != nil {
+		return 0, nil
+	}
+	val := Data.Data.Result[0].Value[1].(string)
+	valInt, err := strconv.ParseFloat(val, 64)
+	if err != nil {
+		return 0, nil
+	}
+	return int(valInt), nil
+
+}

service/frontend/runner.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"math/rand"
 	"reflect"
 	"regexp"
 	"strconv"
@@ -14,7 +15,6 @@ import (
 	engine "github.com/JustHumanz/Go-Simp/pkg/engine"
 	network "github.com/JustHumanz/Go-Simp/pkg/network"
 	pilot "github.com/JustHumanz/Go-Simp/service/pilot/grpc"
-	"github.com/JustHumanz/Go-Simp/service/prediction"
 	"github.com/JustHumanz/Go-Simp/service/utility/runfunc"
 	"github.com/bwmarrin/discordgo"
 	"github.com/olekukonko/tablewriter"
@@ -32,7 +32,6 @@ var (
 	GroupsPayload      *[]database.Group
 	configfile         config.ConfigFile
 	Bot                *discordgo.Session
-	PredictionConn     prediction.PredictionClient
 	VtuberGroupChoices []*discordgo.ApplicationCommandOptionChoice
 )
 
@@ -67,7 +66,6 @@ const (
 
 func init() {
 	log.SetFormatter(&log.TextFormatter{FullTimestamp: true, DisableColors: true})
-	PredictionConn = prediction.NewPredictionClient(network.InitgRPC(config.Prediction))
 }
 
 //StartInit running the fe
@@ -164,7 +162,6 @@ func main() {
 			Bot.AddHandler(BiliBiliSpace)
 			Bot.AddHandler(YoutubeMessage)
 			Bot.AddHandler(TwitchMessage)
-			Bot.AddHandler(SubsMessage)
 			Bot.AddHandler(Lewd)
 			Bot.AddHandler(StartRegister)
 			c.Stop()
@@ -186,7 +183,7 @@ func main() {
 	}
 
 	go pilot.RunHeartBeat(gRCPconn, "Frontend")
-	go engine.InitSlash(Bot, *GroupsPayload, nil)
+	//go engine.InitSlash(Bot, *GroupsPayload, nil)
 
 	Bot.AddHandler(func(s *discordgo.Session, i *discordgo.InteractionCreate) {
 		if h, ok := commandHandlers[i.ApplicationCommandData().Name]; ok {
@@ -624,3 +621,7 @@ func Clear(v interface{}) {
 	p := reflect.ValueOf(v).Elem()
 	p.Set(reflect.Zero(p.Type()))
 }
+
+func gacha() bool {
+	return rand.Float32() < 0.5
+}