diff --git a/.gitignore b/.gitignore index 639f9cc..8823d62 100644 --- a/.gitignore +++ b/.gitignore @@ -15,5 +15,4 @@ # vendor/ .env -Nourybot -nourybot \ No newline at end of file +Nourybot \ No newline at end of file diff --git a/cmd/bot/main.go b/cmd/bot/main.go deleted file mode 100644 index 41dd854..0000000 --- a/cmd/bot/main.go +++ /dev/null @@ -1,43 +0,0 @@ -package main - -import ( - "flag" - "time" - - "github.com/gempir/go-twitch-irc/v2" - "github.com/go-delve/delve/pkg/config" - log "github.com/sirupsen/logrus" -) - -var nb *bot.Bot - -func main() { - // runMode is either dev or production so that we don't join every channel - // everytime we do a small test. - runMode := flag.String("mode", "production", "Mode in which to run. (dev/production") - flag.Parse() - - conf := config.LoadConfig() - - nb = &bot.Bot{ - TwitchClient: twitch.NewClient(conf.Username, conf.Oauth), - // MongoClient: db.Connect(conf), - Uptime: time.Now(), - } - - // Depending on the mode we run in, join different channel. - if *runMode == "production" { - log.Info("[PRODUCTION]: Joining every channel.") - - // Production, joining all regular channels - db.InitialJoin(nb) - - } else if *runMode == "dev" { - log.Info("[DEV]: Joining nouryxd and nourybot.") - - // Development, only join my two channels - nb.TwitchClient.Join("nouryxd", "nourybot") - nb.Send("nourybot", "[DEV] Badabing Badaboom Pepepains") - } - -} diff --git a/cmd/nourybot/nourybot.go b/cmd/nourybot/nourybot.go new file mode 100644 index 0000000..56f03dd --- /dev/null +++ b/cmd/nourybot/nourybot.go @@ -0,0 +1,27 @@ +package main + +import ( + "time" + + "github.com/gempir/go-twitch-irc/v3" + "github.com/lyx0/nourybot/internal/bot" + "github.com/lyx0/nourybot/internal/config" + "github.com/lyx0/nourybot/internal/db" +) + +func main() { + cfg := config.LoadConfig() + + twitchClient := twitch.NewClient(cfg.Username, cfg.Oauth) + now := time.Now() + mongoClient := db.Connect(cfg) + + nb := &bot.Bot{ + TwitchClient: twitchClient, + MongoClient: mongoClient, + Uptime: now, + } + + nb.TwitchClient.Join("nourybot") + nb.TwitchClient.Connect() +} diff --git a/go.mod b/go.mod index c08b916..4e2937e 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,10 @@ module github.com/lyx0/nourybot go 1.17 require ( - github.com/dustin/go-humanize v1.0.0 - github.com/gempir/go-twitch-irc/v2 v2.5.0 + github.com/gempir/go-twitch-irc/v3 v3.0.0 github.com/joho/godotenv v1.4.0 github.com/sirupsen/logrus v1.8.1 - go.mongodb.org/mongo-driver v1.7.3 + go.mongodb.org/mongo-driver v1.8.4 ) require ( @@ -19,7 +18,7 @@ require ( github.com/xdg-go/scram v1.0.2 // indirect github.com/xdg-go/stringprep v1.0.2 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect - golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073 // indirect + golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e // indirect golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 // indirect golang.org/x/text v0.3.5 // indirect diff --git a/go.sum b/go.sum index 0b36145..418a086 100644 --- a/go.sum +++ b/go.sum @@ -1,78 +1,30 @@ -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= -github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/gempir/go-twitch-irc/v2 v2.5.0 h1:aybXNoyDNQaa4vHhXb0UpIDmspqutQUmXIYUFsjgecU= -github.com/gempir/go-twitch-irc/v2 v2.5.0/go.mod h1:120d2SdlRYg8tRnZwsyNPeS+mWPn+YmNEzB7Bv/CDGE= +github.com/gempir/go-twitch-irc/v3 v3.0.0 h1:e34R+9BdKy+qrO/wN+FCt+BUtyn38gCnJuKWscIKbl4= +github.com/gempir/go-twitch-irc/v3 v3.0.0/go.mod h1:/W9KZIiyizVecp4PEb7kc4AlIyXKiCmvlXrzlpPUytU= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= -github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= -github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= -github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= -github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= -github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= -github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= -github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk= -github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= -github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360= -github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg= -github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE= -github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= -github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= -github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= -github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg= github.com/joho/godotenv v1.4.0/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= -github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= -github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= 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/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= -github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= @@ -85,42 +37,28 @@ github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyh github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= -go.mongodb.org/mongo-driver v1.7.3 h1:G4l/eYY9VrQAK/AUgkV0koQKzQnyddnWxrd/Etf0jIs= -go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +go.mongodb.org/mongo-driver v1.8.4 h1:NruvZPPL0PBcRJKmbswoWSrmHeUvzdxA3GCPfD/NEOA= +go.mongodb.org/mongo-driver v1.8.4/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= -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/crypto v0.0.0-20201216223049-8b5274cf687f h1:aZp0e2vLN4MToVqnjNEYEtrEA8RH8U8FN1CU7JgqsPU= +golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037 h1:YyJpGZS1sBuBCzLAR1VEpK193GlqGZbnPFnPV/5Rsb4= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/internal/bot/bot.go b/internal/bot/bot.go new file mode 100644 index 0000000..475a416 --- /dev/null +++ b/internal/bot/bot.go @@ -0,0 +1,14 @@ +package bot + +import ( + "time" + + twitch "github.com/gempir/go-twitch-irc/v3" + "go.mongodb.org/mongo-driver/mongo" +) + +type Bot struct { + TwitchClient *twitch.Client + MongoClient *mongo.Client + Uptime time.Time +} diff --git a/internal/config/config.go b/internal/config/config.go new file mode 100644 index 0000000..8587620 --- /dev/null +++ b/internal/config/config.go @@ -0,0 +1,34 @@ +package config + +import ( + "os" + + "github.com/joho/godotenv" + log "github.com/sirupsen/logrus" +) + +type Config struct { + Username string + Oauth string + BotUserId string + MongoURI string +} + +func LoadConfig() *Config { + err := godotenv.Load() + + if err != nil { + log.Fatal("Error loading .env") + } + + cfg := &Config{ + Username: os.Getenv("TWITCH_USER"), + Oauth: os.Getenv("TWITCH_PASS"), + BotUserId: os.Getenv("BOT_USER_ID"), + MongoURI: os.Getenv("MONGO_URI"), + } + + log.Info("Config loaded succesfully") + + return cfg +} diff --git a/pkg/db/connect.go b/internal/db/connect.go similarity index 95% rename from pkg/db/connect.go rename to internal/db/connect.go index 89be5e6..8ec13be 100644 --- a/pkg/db/connect.go +++ b/internal/db/connect.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/lyx0/nourybot/pkg/config" + "github.com/lyx0/nourybot/internal/config" log "github.com/sirupsen/logrus" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo" diff --git a/pkg/db/addchannel.go b/pkg/db/addchannel.go deleted file mode 100644 index 066b989..0000000 --- a/pkg/db/addchannel.go +++ /dev/null @@ -1,32 +0,0 @@ -package db - -import ( - "context" - "fmt" - "time" - - "github.com/lyx0/nourybot/cmd/bot" - log "github.com/sirupsen/logrus" -) - -// AddChannel adds a given channel name to the database. -func AddChannel(target, channelName string, nb *bot.Bot) { - ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) - defer cancel() - - collection := nb.MongoClient.Database("nourybot").Collection("channels") - - // Channel - // {{"name": string}, {"connect": bool}} - chnl := Channel{channelName, true} - - _, insertErr := collection.InsertOne(ctx, chnl) - if insertErr != nil { - nb.Send(target, fmt.Sprintf("Error trying to join %s", channelName)) - log.Error(insertErr) - return - } - - nb.TwitchClient.Join(channelName) - nb.Send(target, fmt.Sprintf("Joined %s", channelName)) -} diff --git a/pkg/db/db_test.go b/pkg/db/db_test.go deleted file mode 100644 index 0a9e3ed..0000000 --- a/pkg/db/db_test.go +++ /dev/null @@ -1,18 +0,0 @@ -package db - -import "testing" - -func TestDb(t *testing.T) { - t.Run("db package test placeholder", func(t *testing.T) { - request := 1 - response := 1 - - got := request - want := response - - if got != want { - t.Errorf("got %q, want %q", got, want) - } - - }) -} diff --git a/pkg/db/initialjoin.go b/pkg/db/initialjoin.go deleted file mode 100644 index 757c7a4..0000000 --- a/pkg/db/initialjoin.go +++ /dev/null @@ -1,45 +0,0 @@ -package db - -import ( - "context" - "fmt" - "time" - - "github.com/lyx0/nourybot/cmd/bot" - log "github.com/sirupsen/logrus" - "go.mongodb.org/mongo-driver/bson" -) - -// InitialJoin is called everytime the Bot starts and joins the -// initial list of twitch channels it should be in. -func InitialJoin(nb *bot.Bot) { - collection := nb.MongoClient.Database("nourybot").Collection("channels") - - ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) - defer cancel() - - // defer nb.MongoClient.Disconnect(ctx) - - cur, currErr := collection.Find(ctx, bson.D{}) - - if currErr != nil { - panic(currErr) - } - defer cur.Close(ctx) - - var channels []Channel - if err := cur.All(ctx, &channels); err != nil { - panic(err) - } - - channelCount := 0 - - for _, ch := range channels { - nb.TwitchClient.Join(ch.Name) - // nb.TwitchClient.Say(ch.Name, "xd") - channelCount++ - log.Infof("Joined: %s\n", ch.Name) - } - // It worked - nb.Send("nourybot", fmt.Sprintf("Badabing Badaboom Pepepains Joined %v channel", channelCount)) -} diff --git a/pkg/db/listchannel.go b/pkg/db/listchannel.go deleted file mode 100644 index 4122bdb..0000000 --- a/pkg/db/listchannel.go +++ /dev/null @@ -1,37 +0,0 @@ -package db - -import ( - "context" - "time" - - "github.com/lyx0/nourybot/cmd/bot" - "go.mongodb.org/mongo-driver/bson" -) - -// Listchannel reads the list of channel from the database and -// whispers them to my own account. -func ListChannel(nb *bot.Bot) { - collection := nb.MongoClient.Database("nourybot").Collection("channels") - - ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) - defer cancel() - - cur, currErr := collection.Find(ctx, bson.D{}) - - if currErr != nil { - panic(currErr) - } - defer cur.Close(ctx) - - var channels []Channel - if err := cur.All(ctx, &channels); err != nil { - panic(err) - } - - channelList := "" - for _, ch := range channels { - channelList += ch.Name + " " - } - - nb.TwitchClient.Whisper("nouryxd", channelList) -} diff --git a/pkg/db/log_command.go b/pkg/db/log_command.go deleted file mode 100644 index 4ba097a..0000000 --- a/pkg/db/log_command.go +++ /dev/null @@ -1,47 +0,0 @@ -package db - -import ( - "context" - "time" - - "github.com/lyx0/nourybot/cmd/bot" - "github.com/sirupsen/logrus" -) - -type logCommand struct { - CommandName string `json:"command_name"` - LoginName string `json:"login_name"` - Channel string `json:"channel"` - UserID string `json:"user_id"` - Text string `json:"message"` -} - -func (l *logCommand) insert(nb *bot.Bot, commandName, name, channel, id, text string) error { - logrus.Info("logging command") - ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) - defer cancel() - - collection := nb.MongoClient.Database("nourybot").Collection("commandLogs") - - _, err := collection.InsertOne(ctx, &logCommand{ - LoginName: name, - Channel: channel, - UserID: id, - Text: text, - CommandName: commandName, - }) - if err != nil { - logrus.Info("failed to log command") - return err - } - return nil -} - -// InsertCommand is called on every message that invokes a command -// and inserts the message and command details into the database. -func InsertCommand(nb *bot.Bot, commandName, name, channel, id, text string) { - err := (&logCommand{}).insert(nb, commandName, name, channel, id, text) - if err != nil { - logrus.Info("failed to log command") - } -} diff --git a/pkg/db/log_message.go b/pkg/db/log_message.go deleted file mode 100644 index 4e57336..0000000 --- a/pkg/db/log_message.go +++ /dev/null @@ -1,45 +0,0 @@ -package db - -import ( - "context" - "time" - - "github.com/lyx0/nourybot/cmd/bot" - "github.com/sirupsen/logrus" -) - -type logMessage struct { - LoginName string `json:"login_name"` - Channel string `json:"channel"` - UserID string `json:"user_id"` - Text string `json:"message"` -} - -func (l *logMessage) insert(nb *bot.Bot, name, channel, id, text string) error { - logrus.Info("logging message") - ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) - defer cancel() - - collection := nb.MongoClient.Database("nourybot").Collection("messageLogs") - - _, err := collection.InsertOne(ctx, &logMessage{ - LoginName: name, - Channel: channel, - UserID: id, - Text: text, - }) - if err != nil { - logrus.Info("failed to log message") - return err - } - return nil -} - -// InsertMessage is called on every message and logs message details -// into the database. -func InsertMessage(nb *bot.Bot, name, channel, id, text string) { - err := (&logMessage{}).insert(nb, name, channel, id, text) - if err != nil { - logrus.Info("failed to log message") - } -} diff --git a/pkg/db/partchannel.go b/pkg/db/partchannel.go deleted file mode 100644 index f9c734c..0000000 --- a/pkg/db/partchannel.go +++ /dev/null @@ -1,38 +0,0 @@ -package db - -import ( - "context" - "fmt" - "time" - - "github.com/lyx0/nourybot/cmd/bot" - log "github.com/sirupsen/logrus" -) - -// PartChannel takes in a target channel and querys the database for -// its name. If the channel is found it deletes the channel and returns a -// success message. If the channel couldn't be found it will return an error. -func PartChannel(target, channelName string, nb *bot.Bot) { - ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) - defer cancel() - - collection := nb.MongoClient.Database("nourybot").Collection("channels") - - // Channel - // {{"name": string}, {"connect": bool}} - chnl := Channel{channelName, true} - - res, insertErr := collection.DeleteOne(ctx, chnl) - - // res.DeletedCount is 0 if trying to delete something that wasn't there. - if insertErr != nil || res.DeletedCount != 1 { - nb.Send(target, fmt.Sprintf("Error trying to part %s", channelName)) - log.Error(insertErr) - return - } - - nb.TwitchClient.Depart(channelName) - nb.Send(target, fmt.Sprintf("Parted %s", channelName)) - - // log.Info(res) -} diff --git a/pkg/db/typings.go b/pkg/db/typings.go deleted file mode 100644 index d49888f..0000000 --- a/pkg/db/typings.go +++ /dev/null @@ -1,12 +0,0 @@ -package db - -type Channel struct { - Name string `bson:"name,omitempty"` - Connect bool `bson:"connect,omitempty"` -} - -// type Command struct { -// Name string `bson:"name,omitempty"` -// Text string `bson:"text,omitempty"` -// Channel string `bson:"channel,omitempty"` -// }