Compare commits
No commits in common. "26643cd271b7efeaab9a00d829e182297082555c" and "adf1e6008e5166232c24b1de09640f9c9fb6ffba" have entirely different histories.
26643cd271
...
adf1e6008e
3 changed files with 29 additions and 118 deletions
|
|
@ -3,7 +3,6 @@ package commands
|
|||
import (
|
||||
"bytes"
|
||||
"image/color"
|
||||
"io"
|
||||
"math"
|
||||
"math/rand/v2"
|
||||
"slices"
|
||||
|
|
@ -47,35 +46,6 @@ func Stats(s *discordgo.Session, i *discordgo.InteractionCreate, opt cmd.OptionM
|
|||
}
|
||||
days = uint(in)
|
||||
}
|
||||
var w io.WriterTo
|
||||
var err error
|
||||
if v, ok := opt["user"]; ok {
|
||||
w, err = statsMember(s, i, days, v.UserValue(s).ID)
|
||||
} else {
|
||||
w, err = statsAll(s, i, days)
|
||||
}
|
||||
if err != nil {
|
||||
if err = resp.IsEphemeral().SetMessage("Il y a eu une erreur...").Send(); err != nil {
|
||||
logger.Alert("commands/stats.go - Sending error occurred", err.Error())
|
||||
}
|
||||
return
|
||||
}
|
||||
b := new(bytes.Buffer)
|
||||
_, err = w.WriteTo(b)
|
||||
if err != nil {
|
||||
logger.Alert("commands/stats.go - Writing png", err.Error())
|
||||
}
|
||||
err = resp.AddFile(&discordgo.File{
|
||||
Name: "plot.png",
|
||||
ContentType: "image/png",
|
||||
Reader: b,
|
||||
}).Send()
|
||||
if err != nil {
|
||||
logger.Alert("commands/stats.go - Sending response", err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
func statsAll(s *discordgo.Session, i *discordgo.InteractionCreate, days uint) (io.WriterTo, error) {
|
||||
var rawData []*data
|
||||
if gokord.Debug {
|
||||
var rawCopaingData []*user.CopaingXP
|
||||
|
|
@ -85,7 +55,7 @@ func statsAll(s *discordgo.Session, i *discordgo.InteractionCreate, days uint) (
|
|||
Error
|
||||
if err != nil {
|
||||
logger.Alert("commands/stats.go - Fetching result", err.Error())
|
||||
return nil, err
|
||||
return
|
||||
}
|
||||
rawData = make([]*data, len(rawCopaingData))
|
||||
for in, d := range rawCopaingData {
|
||||
|
|
@ -101,7 +71,7 @@ func statsAll(s *discordgo.Session, i *discordgo.InteractionCreate, days uint) (
|
|||
res := gokord.DB.Raw(sql, i.GuildID, exp.TimeStampNDaysBefore(days))
|
||||
if err := res.Scan(&rawDbData).Error; err != nil {
|
||||
logger.Alert("commands/stats.go - Fetching result", err.Error())
|
||||
return nil, err
|
||||
return
|
||||
}
|
||||
rawData = make([]*data, len(rawDbData))
|
||||
for in, d := range rawDbData {
|
||||
|
|
@ -122,7 +92,7 @@ func statsAll(s *discordgo.Session, i *discordgo.InteractionCreate, days uint) (
|
|||
var cp user.Copaing
|
||||
if err := gokord.DB.First(&cp, raw.CopaingID).Error; err != nil {
|
||||
logger.Alert("commands/stats.go - Finding copaing", err.Error(), "id", raw.CopaingID)
|
||||
return nil, err
|
||||
return
|
||||
}
|
||||
copaings[raw.CopaingID] = &cp
|
||||
}
|
||||
|
|
@ -141,76 +111,6 @@ func statsAll(s *discordgo.Session, i *discordgo.InteractionCreate, days uint) (
|
|||
})
|
||||
}
|
||||
|
||||
return generatePlot(s, i, days, copaings, stats)
|
||||
}
|
||||
|
||||
func statsMember(s *discordgo.Session, i *discordgo.InteractionCreate, days uint, discordID string) (io.WriterTo, error) {
|
||||
cp := user.GetCopaing(discordID, i.GuildID)
|
||||
var rawData []*data
|
||||
if gokord.Debug {
|
||||
var rawCopaingData []*user.CopaingXP
|
||||
err := gokord.DB.
|
||||
Where(
|
||||
"guild_id = ? and created_at > ? and copaing_id = ?",
|
||||
i.GuildID, exp.TimeStampNDaysBefore(days), discordID,
|
||||
).
|
||||
Find(&rawCopaingData).
|
||||
Error
|
||||
if err != nil {
|
||||
logger.Alert("commands/stats.go - Fetching result", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
rawData = make([]*data, len(rawCopaingData))
|
||||
for in, d := range rawCopaingData {
|
||||
rawData[in] = &data{
|
||||
CreatedAt: d.CreatedAt,
|
||||
XP: int(d.XP),
|
||||
CopaingID: int(d.CopaingID),
|
||||
}
|
||||
}
|
||||
} else {
|
||||
sql := `SELECT "created_at"::date::text, sum("xp") as xp, "copaing_id" FROM copaing_xps WHERE "guild_id" = ? and "created_at" > ? and "copaing_id" = ? GROUP BY "created_at"::date, "copaing_id"`
|
||||
var rawDbData []dbData
|
||||
res := gokord.DB.Raw(sql, i.GuildID, exp.TimeStampNDaysBefore(days), discordID)
|
||||
if err := res.Scan(&rawDbData).Error; err != nil {
|
||||
logger.Alert("commands/stats.go - Fetching result", err.Error())
|
||||
return nil, err
|
||||
}
|
||||
rawData = make([]*data, len(rawDbData))
|
||||
for in, d := range rawDbData {
|
||||
rawData[in] = &data{
|
||||
CreatedAt: d.CreatedAt.Time,
|
||||
XP: d.XP,
|
||||
CopaingID: d.CopaingID,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
copaings := map[int]*user.Copaing{
|
||||
int(cp.ID): cp,
|
||||
}
|
||||
stats := map[int]*[]plotter.XY{}
|
||||
|
||||
for _, raw := range rawData {
|
||||
pts, ok := stats[raw.CopaingID]
|
||||
if !ok {
|
||||
pts = &[]plotter.XY{}
|
||||
stats[raw.CopaingID] = pts
|
||||
}
|
||||
t := float64(raw.CreatedAt.Unix() - time.Now().Unix())
|
||||
if !gokord.Debug {
|
||||
t = math.Ceil(t / (24 * 60 * 60))
|
||||
}
|
||||
*pts = append(*pts, plotter.XY{
|
||||
X: t,
|
||||
Y: float64(raw.XP),
|
||||
})
|
||||
}
|
||||
|
||||
return generatePlot(s, i, days, copaings, stats)
|
||||
}
|
||||
|
||||
func generatePlot(s *discordgo.Session, i *discordgo.InteractionCreate, days uint, copaings map[int]*user.Copaing, stats map[int]*[]plotter.XY) (io.WriterTo, error) {
|
||||
p := plot.New()
|
||||
p.Title.Text = "Évolution de l'XP"
|
||||
p.X.Label.Text = "Jours"
|
||||
|
|
@ -223,7 +123,7 @@ func generatePlot(s *discordgo.Session, i *discordgo.InteractionCreate, days uin
|
|||
m, err := s.GuildMember(i.GuildID, c.DiscordID)
|
||||
if err != nil {
|
||||
logger.Alert("commands/stats.go - Fetching guild member", err.Error())
|
||||
return nil, err
|
||||
return
|
||||
}
|
||||
slices.SortFunc(*stats[in], func(a, b plotter.XY) int {
|
||||
if a.X < b.X {
|
||||
|
|
@ -249,7 +149,7 @@ func generatePlot(s *discordgo.Session, i *discordgo.InteractionCreate, days uin
|
|||
l, err := plotter.NewLine(plotter.XYs(*stats[in]))
|
||||
if err != nil {
|
||||
logger.Alert("commands/stats.go - Adding line points", err.Error())
|
||||
return nil, err
|
||||
return
|
||||
}
|
||||
l.LineStyle.Width = vg.Points(1)
|
||||
l.LineStyle.Dashes = []vg.Length{vg.Points(5), vg.Points(5)}
|
||||
|
|
@ -260,7 +160,19 @@ func generatePlot(s *discordgo.Session, i *discordgo.InteractionCreate, days uin
|
|||
w, err := p.WriterTo(8*vg.Inch, 6*vg.Inch, "png")
|
||||
if err != nil {
|
||||
logger.Alert("commands/stats.go - Generating png", err.Error())
|
||||
return nil, err
|
||||
return
|
||||
}
|
||||
b := new(bytes.Buffer)
|
||||
_, err = w.WriteTo(b)
|
||||
if err != nil {
|
||||
logger.Alert("commands/stats.go - Writing png", err.Error())
|
||||
}
|
||||
err = resp.AddFile(&discordgo.File{
|
||||
Name: "plot.png",
|
||||
ContentType: "image/png",
|
||||
Reader: b,
|
||||
}).Send()
|
||||
if err != nil {
|
||||
logger.Alert("commands/stats.go - Sending response", err.Error())
|
||||
}
|
||||
return w, nil
|
||||
}
|
||||
|
|
|
|||
10
main.go
10
main.go
|
|
@ -85,16 +85,6 @@ func main() {
|
|||
SetHandler(commands.Credits)
|
||||
|
||||
statsCmd := cmd.New("stats", "Affiche des stats :D").
|
||||
AddOption(cmd.NewOption(
|
||||
discordgo.ApplicationCommandOptionInteger,
|
||||
"days",
|
||||
"Nombre de jours à afficher dans le graphique",
|
||||
)).
|
||||
AddOption(cmd.NewOption(
|
||||
discordgo.ApplicationCommandOptionUser,
|
||||
"user",
|
||||
"Utilisateur à inspecter",
|
||||
)).
|
||||
SetHandler(commands.Stats)
|
||||
|
||||
innovations, err := gokord.LoadInnovationFromJson(updatesData)
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/anhgelus/gokord"
|
||||
"github.com/anhgelus/gokord/logger"
|
||||
)
|
||||
|
||||
type Copaing struct {
|
||||
|
|
@ -34,7 +35,15 @@ const (
|
|||
func GetCopaing(discordID string, guildID string) *Copaing {
|
||||
c := Copaing{DiscordID: discordID, GuildID: guildID}
|
||||
if err := c.Load(); err != nil {
|
||||
panic(err)
|
||||
logger.Alert(
|
||||
"user/member.go - Loading user",
|
||||
err.Error(),
|
||||
"discord_id",
|
||||
discordID,
|
||||
"guild_id",
|
||||
guildID,
|
||||
)
|
||||
return nil
|
||||
}
|
||||
return &c
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue