diff --git a/.gitignore b/.gitignore index 92f116f..797d89f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /subscribe-bot /db /config.toml +/repos diff --git a/bot.go b/bot.go index 4aafe53..690d9db 100644 --- a/bot.go +++ b/bot.go @@ -3,7 +3,10 @@ package main import ( "errors" "fmt" + "io/ioutil" "log" + "os" + "path" "reflect" "regexp" "strconv" @@ -11,6 +14,9 @@ import ( "time" "github.com/bwmarrin/discordgo" + "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/plumbing/object" ) type Bot struct { @@ -19,10 +25,11 @@ type Bot struct { db *Db api *Osuapi requests chan int + config *Config } -func NewBot(token string, db *Db, requests chan int) (bot *Bot, err error) { - s, err := discordgo.New("Bot " + token) +func NewBot(config *Config, db *Db, requests chan int) (bot *Bot, err error) { + s, err := discordgo.New("Bot " + config.BotToken) if err != nil { return } @@ -38,7 +45,7 @@ func NewBot(token string, db *Db, requests chan int) (bot *Bot, err error) { return } - bot = &Bot{s, re, db, db.api, requests} + bot = &Bot{s, re, db, db.api, requests, config} s.AddHandler(bot.errWrap(bot.newMessageHandler)) return } @@ -67,25 +74,108 @@ func (bot *Bot) errWrap(fn interface{}) interface{} { return newFunc.Interface() } -func (bot *Bot) NotifyNewEvent(channelId string, newMaps []Event) (err error) { - for _, event := range newMaps { +func (bot *Bot) NotifyNewEvent(channels []string, newMaps []Event) (err error) { + for i, event := range newMaps { + var eventTime time.Time + eventTime, err = time.Parse(time.RFC3339, event.CreatedAt) + if err != nil { + return + } + log.Println(i, "event time", eventTime) + var ( gotBeatmapInfo = false beatmapSet Beatmapset gotDownloadedBeatmap = false downloadedBeatmap BeatmapsetDownloaded + // status git.Status + + commit *object.Commit + parent *object.Commit + patch *object.Patch + // commitFiles *object.FileIter ) beatmapSet, err = bot.getBeatmapsetInfo(event) if err != nil { log.Println("failed to retrieve beatmap info:", err) } else { gotBeatmapInfo = true - downloadedBeatmap, err = bot.downloadBeatmap(&beatmapSet) + + // try to open a repo for this beatmap + var repo *git.Repository + repoDir := path.Join(bot.config.Repos, strconv.Itoa(beatmapSet.ID)) + if _, err := os.Stat(repoDir); os.IsNotExist(err) { + os.MkdirAll(repoDir, 0777) + } + repo, err = git.PlainOpen(repoDir) + if err == git.ErrRepositoryNotExists { + // create a new repo + repo, err = git.PlainInit(repoDir, false) + } + if err != nil { + return + } + + // download latest updates to the map + err = bot.downloadBeatmapTo(&beatmapSet, repo, repoDir) if err != nil { log.Println("failed to download beatmap:", err) } else { gotDownloadedBeatmap = true } + + // create a commit + var ( + worktree *git.Worktree + files []os.FileInfo + hash plumbing.Hash + ) + worktree, err = repo.Worktree() + if err != nil { + return + } + // status, err = worktree.Status() + // if err != nil { + // return + // } + files, err = ioutil.ReadDir(repoDir) + if err != nil { + return + } + for _, f := range files { + if f.Name() == ".git" { + continue + } + worktree.Add(f.Name()) + } + hash, err = worktree.Commit( + fmt.Sprintf("evtID: %d", event.ID), + &git.CommitOptions{ + Author: &object.Signature{ + Name: beatmapSet.Creator, + Email: "nobody@localhost", + When: eventTime, + }, + }, + ) + if err != nil { + return + } + + commit, err = repo.CommitObject(hash) + if err != nil { + return + } + parent, err = commit.Parent(0) + if err != nil { + return + } + patch, err = commit.Patch(parent) + if err != nil { + return + } + + // report diffs } log.Println("BEATMAP SET", beatmapSet) @@ -113,9 +203,12 @@ func (bot *Bot) NotifyNewEvent(channelId string, newMaps []Event) (err error) { if gotDownloadedBeatmap { log.Println(downloadedBeatmap) + embed.Description = patch.String() } } - bot.ChannelMessageSendEmbed(channelId, embed) + for _, channelId := range channels { + bot.ChannelMessageSendEmbed(channelId, embed) + } } return @@ -125,13 +218,27 @@ type BeatmapsetDownloaded struct { Path string } -func (bot *Bot) downloadBeatmap(beatmapSet *Beatmapset) (downloadedBeatmap BeatmapsetDownloaded, err error) { - beatmapFile, err := bot.api.BeatmapsetDownload(beatmapSet.ID) +func (bot *Bot) downloadBeatmapTo(beatmapSet *Beatmapset, repo *git.Repository, repoDir string) (err error) { + // clear all OSU files + files, err := ioutil.ReadDir(repoDir) if err != nil { return } + for _, f := range files { + if !strings.HasSuffix(f.Name(), ".osu") { + continue + } + os.Remove(f.Name()) + } - downloadedBeatmap.Path = beatmapFile + for _, beatmap := range beatmapSet.Beatmaps { + path := path.Join(repoDir, fmt.Sprintf("%d.osu", beatmap.ID)) + + err = bot.api.DownloadSingleBeatmap(beatmap.ID, path) + if err != nil { + return + } + } return } diff --git a/go.mod b/go.mod index d7b76e0..5efb765 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.14 require ( github.com/BurntSushi/toml v0.3.1 github.com/bwmarrin/discordgo v0.22.0 + github.com/go-git/go-git/v5 v5.2.0 go.etcd.io/bbolt v1.3.5 golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520 ) diff --git a/go.sum b/go.sum index e39543c..bcc162c 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,77 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/bwmarrin/discordgo v0.22.0 h1:uBxY1HmlVCsW1IuaPjpCGT6A2DBwRn0nvOguQIxDdFM= github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= +github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= +github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM= +github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-git v1.0.0 h1:YcN9iDGDoXuIw0vHls6rINwV416HYa0EB2X+RBsyYp4= +github.com/go-git/go-git v3.2.0+incompatible h1:puJR2KQIDtZm7uQoF5h+BUFHiU2naU4tfwau90nRIoo= +github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= +github.com/go-git/go-git/v5 v5.2.0 h1:YPBLG/3UK1we1ohRkncLjaXWLW+HKp5QNM/jTli2JgI= +github.com/go-git/go-git/v5 v5.2.0/go.mod h1:kh02eMX+wdqqxgNMEyq8YgwlIOsDOa9homkUq1PoTMs= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/imdario/mergo v0.3.9 h1:UauaLniWCFHWd+Jp9oCEkTBj8VO/9DKg3PV3VCNMDIg= +github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= +github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16 h1:y6ce7gCWtnH+m3dCjzQ1PCuwl28DDIc3VNnvY29DlIA= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 h1:xMPOj6Pz6UipU1wXLkrtqpHbR0AVFnyPEQq/wRWz9lM= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520 h1:Bx6FllMpG4NWDOfhMBz1VR2QYNp/SAOHPIAsaVmxfPo= golang.org/x/sync v0.0.0-20201008141435-b3e1573b7520/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/main.go b/main.go index e023296..69ea92e 100644 --- a/main.go +++ b/main.go @@ -25,7 +25,7 @@ func main() { log.Fatal(err) } - bot, err := NewBot(config.BotToken, db, requests) + bot, err := NewBot(&config, db, requests) if err != nil { log.Fatal(err) } diff --git a/osuapi.go b/osuapi.go index d9a1fd5..d19ee20 100644 --- a/osuapi.go +++ b/osuapi.go @@ -132,6 +132,22 @@ func (api *Osuapi) Request(action string, url string, result interface{}) (err e return } +func (api *Osuapi) DownloadSingleBeatmap(beatmapId int, path string) (err error) { + url := fmt.Sprintf("https://osu.ppy.sh/osu/%d", beatmapId) + resp, err := api.httpClient.Get(url) + + file, err := os.OpenFile(path, os.O_CREATE|os.O_RDWR, 0644) + if err != nil { + return + } + + _, err = io.Copy(file, resp.Body) + if err != nil { + return + } + return +} + func (api *Osuapi) GetBeatmapSet(beatmapSetId int) (beatmapSet Beatmapset, err error) { url := fmt.Sprintf("/beatmapsets/%d", beatmapSetId) err = api.Request("GET", url, &beatmapSet) diff --git a/scrape.go b/scrape.go index 51b49b6..c93a67f 100644 --- a/scrape.go +++ b/scrape.go @@ -20,11 +20,20 @@ func RunScraper(bot *Bot, db *Db, api *Osuapi, requests chan int) { if err != nil { log.Println("err getting new maps:", err) } + log.Println("new maps for", userId, newMaps) - db.IterTrackingChannels(userId, func(channelId string) error { - bot.NotifyNewEvent(channelId, newMaps) - return nil - }) + if len(newMaps) > 0 { + channels := make([]string, 0) + db.IterTrackingChannels(userId, func(channelId string) error { + channels = append(channels, channelId) + return nil + }) + + err := bot.NotifyNewEvent(channels, newMaps) + if err != nil { + log.Println("error notifying new maps", err) + } + } // wait a minute and put them back into the queue go func(id int) {