mirror of
https://github.com/mgerb/go-discord-bot
synced 2026-01-10 17:12:48 +00:00
added web server
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1 +1,2 @@
|
|||||||
config.json
|
config.json
|
||||||
|
dist/config.json
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
{
|
{
|
||||||
"Token": "",
|
"Token": "",
|
||||||
"Activator": "#"
|
"BotPrefix": "#"
|
||||||
}
|
}
|
||||||
BIN
dist/GoBot-linux
vendored
BIN
dist/GoBot-linux
vendored
Binary file not shown.
BIN
dist/GoBot-mac
vendored
BIN
dist/GoBot-mac
vendored
Binary file not shown.
BIN
dist/GoBot-windows.exe
vendored
BIN
dist/GoBot-windows.exe
vendored
Binary file not shown.
4
dist/config.json
vendored
4
dist/config.json
vendored
@@ -1,4 +0,0 @@
|
|||||||
{
|
|
||||||
"Token": "",
|
|
||||||
"Activator": "#"
|
|
||||||
}
|
|
||||||
4
dist/config.template.json
vendored
Normal file
4
dist/config.template.json
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"Token": "",
|
||||||
|
"BotPrefix": "#"
|
||||||
|
}
|
||||||
10
index.html
Normal file
10
index.html
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
test 123
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
2
makefile
2
makefile
@@ -14,7 +14,7 @@ clean:
|
|||||||
rm -rf ./dist
|
rm -rf ./dist
|
||||||
|
|
||||||
copyconfig:
|
copyconfig:
|
||||||
cp config.template.json ./dist/config.json
|
cp config.template.json ./dist/config.template.json
|
||||||
cp -r ./sounds ./dist/
|
cp -r ./sounds ./dist/
|
||||||
|
|
||||||
all: linux mac windows copyconfig
|
all: linux mac windows copyconfig
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ func Connect(token string) {
|
|||||||
fmt.Println("Bot connected")
|
fmt.Println("Bot connected")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Start - blocking function that starts a websocket listenting for discord callbacks
|
||||||
func Start() {
|
func Start() {
|
||||||
// Open the websocket and begin listening.
|
// Open the websocket and begin listening.
|
||||||
err := Session.Open()
|
err := Session.Open()
|
||||||
@@ -41,7 +42,7 @@ func Start() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
fmt.Println("Bot is now running. Press CTRL-C to exit.")
|
fmt.Println("Bot is now running...")
|
||||||
|
|
||||||
// Simple way to keep program running until CTRL-C is pressed.
|
// Simple way to keep program running until CTRL-C is pressed.
|
||||||
<-make(chan struct{})
|
<-make(chan struct{})
|
||||||
|
|||||||
@@ -12,10 +12,10 @@ var Config configStruct
|
|||||||
|
|
||||||
type configStruct struct {
|
type configStruct struct {
|
||||||
Token string `json:"Token"`
|
Token string `json:"Token"`
|
||||||
Activator string `json:"Activator"`
|
BotPrefix string `json:"BotPrefix"` //prefix to use for bot commands
|
||||||
}
|
}
|
||||||
|
|
||||||
func Configure() {
|
func Init() {
|
||||||
|
|
||||||
log.Println("Reading config file...")
|
log.Println("Reading config file...")
|
||||||
|
|
||||||
|
|||||||
@@ -7,22 +7,48 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"github.com/bwmarrin/discordgo"
|
"github.com/bwmarrin/discordgo"
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
var sounds = make(map[string][][]byte, 0)
|
var (
|
||||||
|
sounds = make(map[string][][]byte, 0)
|
||||||
|
|
||||||
|
soundPlayingLock = false
|
||||||
|
)
|
||||||
|
|
||||||
const SOUNDS_DIR string = "./sounds/"
|
const SOUNDS_DIR string = "./sounds/"
|
||||||
|
|
||||||
func SoundsHandler(s *discordgo.Session, m *discordgo.MessageCreate) {
|
func SoundsHandler(s *discordgo.Session, m *discordgo.MessageCreate) {
|
||||||
if strings.HasPrefix(m.Content, config.Config.Activator) {
|
|
||||||
|
// exit function call if sound is playing
|
||||||
|
if soundPlayingLock {
|
||||||
|
fmt.Println("Exiting function call")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// check if valid command
|
||||||
|
if strings.HasPrefix(m.Content, config.Config.BotPrefix) {
|
||||||
|
|
||||||
|
soundName := strings.TrimPrefix(m.Content, config.Config.BotPrefix)
|
||||||
|
|
||||||
|
// check if sound exists in memory
|
||||||
|
if _, ok := sounds[soundName]; !ok {
|
||||||
|
// try to load the sound if not found in memory
|
||||||
|
err := loadFile(soundName)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
fmt.Println(err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Find the channel that the message came from.
|
// Find the channel that the message came from.
|
||||||
c, err := s.State.Channel(m.ChannelID)
|
c, err := s.State.Channel(m.ChannelID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Could not find channel.
|
// Could not find channel.
|
||||||
|
fmt.Println("User channel not found.")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,7 +62,7 @@ func SoundsHandler(s *discordgo.Session, m *discordgo.MessageCreate) {
|
|||||||
// Look for the message sender in that guilds current voice states.
|
// Look for the message sender in that guilds current voice states.
|
||||||
for _, vs := range g.VoiceStates {
|
for _, vs := range g.VoiceStates {
|
||||||
if vs.UserID == m.Author.ID {
|
if vs.UserID == m.Author.ID {
|
||||||
err = playSound(s, g.ID, vs.ChannelID, strings.TrimPrefix(m.Content, config.Config.Activator))
|
err = playSound(s, g.ID, vs.ChannelID, soundName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("Error playing sound:", err)
|
fmt.Println("Error playing sound:", err)
|
||||||
}
|
}
|
||||||
@@ -47,36 +73,19 @@ func SoundsHandler(s *discordgo.Session, m *discordgo.MessageCreate) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// loadSound attempts to load an encoded sound file from disk.
|
// load dca file into memory
|
||||||
func LoadSounds() error {
|
|
||||||
|
|
||||||
files, _ := ioutil.ReadDir(SOUNDS_DIR)
|
|
||||||
|
|
||||||
for _, file := range files {
|
|
||||||
fmt.Println(file.Name())
|
|
||||||
err := loadFile(file.Name())
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
fmt.Println(err.Error())
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func loadFile(fileName string) error {
|
func loadFile(fileName string) error {
|
||||||
|
fmt.Println("Loading file: " + fileName + ".dca")
|
||||||
|
|
||||||
trimmedName := strings.TrimSuffix(fileName, ".dca")
|
file, err := os.Open(SOUNDS_DIR + fileName + ".dca")
|
||||||
sounds[trimmedName] = make([][]byte, 0)
|
|
||||||
|
|
||||||
file, err := os.Open(SOUNDS_DIR + fileName)
|
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Println("Error opening dca file :", err)
|
fmt.Println("Error opening dca file :", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sounds[fileName] = make([][]byte, 0)
|
||||||
|
|
||||||
var opuslen int16
|
var opuslen int16
|
||||||
|
|
||||||
for {
|
for {
|
||||||
@@ -84,12 +93,13 @@ func loadFile(fileName string) error {
|
|||||||
err = binary.Read(file, binary.LittleEndian, &opuslen)
|
err = binary.Read(file, binary.LittleEndian, &opuslen)
|
||||||
|
|
||||||
// If this is the end of the file, just return.
|
// If this is the end of the file, just return.
|
||||||
if err == io.EOF || err == io.ErrUnexpectedEOF {
|
if err != nil {
|
||||||
file.Close()
|
file.Close()
|
||||||
if err != nil {
|
if err == io.EOF {
|
||||||
|
return nil
|
||||||
|
} else if err == io.ErrUnexpectedEOF {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -107,7 +117,7 @@ func loadFile(fileName string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
sounds[trimmedName] = append(sounds[trimmedName], InBuf)
|
sounds[fileName] = append(sounds[fileName], InBuf)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -119,6 +129,9 @@ func playSound(s *discordgo.Session, guildID, channelID string, sound string) (e
|
|||||||
return errors.New("Sound not found")
|
return errors.New("Sound not found")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//prevent other sounds from interrupting
|
||||||
|
soundPlayingLock = true
|
||||||
|
|
||||||
// Join the provided voice channel.
|
// Join the provided voice channel.
|
||||||
vc, err := s.ChannelVoiceJoin(guildID, channelID, false, false)
|
vc, err := s.ChannelVoiceJoin(guildID, channelID, false, false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -145,5 +158,7 @@ func playSound(s *discordgo.Session, guildID, channelID string, sound string) (e
|
|||||||
// Disconnect from the provided voice channel.
|
// Disconnect from the provided voice channel.
|
||||||
_ = vc.Disconnect()
|
_ = vc.Disconnect()
|
||||||
|
|
||||||
|
soundPlayingLock = false
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
18
src/main.go
18
src/main.go
@@ -4,26 +4,22 @@ import (
|
|||||||
"./bot"
|
"./bot"
|
||||||
"./config"
|
"./config"
|
||||||
"./handlers"
|
"./handlers"
|
||||||
)
|
"./webserver"
|
||||||
|
|
||||||
// Variables used for command line parameters
|
|
||||||
var (
|
|
||||||
BotID string
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
//read config file
|
//read config file
|
||||||
config.Configure()
|
config.Init()
|
||||||
|
|
||||||
//connect bot to account with token
|
//connect bot to account with token
|
||||||
bot.Connect(config.Config.Token)
|
bot.Connect(config.Config.Token)
|
||||||
|
|
||||||
//load sound files into memory
|
|
||||||
handlers.LoadSounds()
|
|
||||||
|
|
||||||
//add handlers
|
//add handlers
|
||||||
bot.AddHandler(handlers.SoundsHandler)
|
bot.AddHandler(handlers.SoundsHandler)
|
||||||
|
|
||||||
//start websock to listen for messages
|
// start new go routine for the discord websockets
|
||||||
bot.Start()
|
go bot.Start()
|
||||||
|
|
||||||
|
// start the web server
|
||||||
|
webserver.Start()
|
||||||
}
|
}
|
||||||
|
|||||||
45
src/webserver/server.go
Normal file
45
src/webserver/server.go
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
package webserver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"github.com/buaazp/fasthttprouter"
|
||||||
|
"github.com/valyala/fasthttp"
|
||||||
|
"log"
|
||||||
|
)
|
||||||
|
|
||||||
|
func logger(next fasthttp.RequestHandler) fasthttp.RequestHandler {
|
||||||
|
return func(ctx *fasthttp.RequestCtx) {
|
||||||
|
logger := ctx.Logger()
|
||||||
|
logger.Printf(ctx.RemoteAddr().String())
|
||||||
|
next(ctx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func applyMiddleware(handler fasthttp.RequestHandler) fasthttp.RequestHandler {
|
||||||
|
newHandler := logger(handler)
|
||||||
|
newHandler = fasthttp.CompressHandler(newHandler)
|
||||||
|
|
||||||
|
return newHandler
|
||||||
|
}
|
||||||
|
|
||||||
|
func registerRoutes(router *fasthttprouter.Router) {
|
||||||
|
router.GET("/test", func(ctx *fasthttp.RequestCtx) {
|
||||||
|
fmt.Fprint(ctx, "routing works!")
|
||||||
|
})
|
||||||
|
|
||||||
|
router.NotFound = func(ctx *fasthttp.RequestCtx) {
|
||||||
|
fasthttp.ServeFile(ctx, "./index.html")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func Start() {
|
||||||
|
router := fasthttprouter.New()
|
||||||
|
|
||||||
|
registerRoutes(router)
|
||||||
|
|
||||||
|
// apply our middleware
|
||||||
|
handlers := applyMiddleware(router.Handler)
|
||||||
|
|
||||||
|
// start web server
|
||||||
|
log.Fatal(fasthttp.ListenAndServe("0.0.0.0:8080", handlers))
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user