Compare commits

..

21 Commits
jup ... main

Author SHA1 Message Date
jolheiser 75bd31e00f fix: allow user to register if they have 1 role (#19)
This assumes that the role is for onboarding purposes in-between seasons

Reviewed-on: Minecraft/canopeas#19
Co-authored-by: jolheiser <john.olheiser@gmail.com>
Co-committed-by: jolheiser <john.olheiser@gmail.com>
2024-06-18 17:15:12 +00:00
jolheiser 986473e1df
fix: update discordgo
Signed-off-by: jolheiser <john.olheiser@gmail.com>
2023-04-27 10:09:39 -05:00
jolheiser 449f99cf69 Add welcome (#17)
Reviewed-on: Minecraft/canopeas#17
Co-authored-by: jolheiser <john.olheiser@gmail.com>
Co-committed-by: jolheiser <john.olheiser@gmail.com>
2022-01-19 19:51:12 +00:00
jolheiser a15bb13ba5 Fix nickname check 2022-01-19 19:48:59 +00:00
Etzelia ac862d8d18 Ignore self in register (#13)
Ignore self in register

Signed-off-by: Etzelia <etzelia@hotmail.com>

Reviewed-on: https://git.canopymc.net/Etzelia/canopeas/pulls/13
Reviewed-by: ZeroHD <joey@ahines.net>
Co-Authored-By: Etzelia <etzelia@hotmail.com>
Co-Committed-By: Etzelia <etzelia@hotmail.com>
2021-07-17 19:51:15 +00:00
Etzelia 74e49546fe Add config for register URL and check for dupes (#12)
Update modules

Signed-off-by: Etzelia <etzelia@hotmail.com>

Update module

Signed-off-by: Etzelia <etzelia@hotmail.com>

Start CI

Move welcome channel to register table

Signed-off-by: Etzelia <etzelia@hotmail.com>

Add config for register URL and check for dupes

Signed-off-by: Etzelia <etzelia@hotmail.com>

Reviewed-on: https://git.canopymc.net/Etzelia/canopeas/pulls/12
Reviewed-by: ZeroHD <joey@ahines.net>
Co-Authored-By: Etzelia <etzelia@hotmail.com>
Co-Committed-By: Etzelia <etzelia@hotmail.com>
2021-07-17 01:26:23 +00:00
Etzelia 4fb7cc2928 Closures (#9)
Closures

Signed-off-by: Etzelia <etzelia@hotmail.com>

Reviewed-on: https://git.birbmc.com/Etzelia/canopeas/pulls/9
Co-Authored-By: Etzelia <etzelia@hotmail.com>
Co-Committed-By: Etzelia <etzelia@hotmail.com>
2021-06-20 21:35:48 +00:00
Etzelia 8e83885118 Dad joke status (#8)
Dad joke status

Signed-off-by: Etzelia <etzelia@hotmail.com>

Reviewed-on: https://git.birbmc.com/Etzelia/canopeas/pulls/8
Co-Authored-By: Etzelia <etzelia@hotmail.com>
Co-Committed-By: Etzelia <etzelia@hotmail.com>
2021-05-14 03:27:39 +00:00
Etzelia cc3ceb6668 Make imgur album commands configurable (#7)
Signed-off-by: Etzelia <etzelia@hotmail.com>

Rename echo/album field to child

Signed-off-by: Etzelia <etzelia@hotmail.com>

Mark clear as staffOnly

Signed-off-by: Etzelia <etzelia@hotmail.com>

Add imgur album commands

Signed-off-by: Etzelia <etzelia@hotmail.com>

Reviewed-on: https://git.birbmc.com/Etzelia/canopeas/pulls/7
Co-Authored-By: Etzelia <etzelia@hotmail.com>
Co-Committed-By: Etzelia <etzelia@hotmail.com>
2021-05-14 03:10:02 +00:00
Etzelia 16e0383e39
Update modules
Signed-off-by: Etzelia <etzelia@hotmail.com>
2021-05-04 22:24:39 -05:00
Etzelia 3ecd7f04e4
Quicker rate limit test
Signed-off-by: Etzelia <etzelia@hotmail.com>
2021-05-04 21:55:25 -05:00
Etzelia c5066e84e2
Make reaction roles easier to implement
Signed-off-by: Etzelia <etzelia@hotmail.com>
2021-05-04 21:45:49 -05:00
Etzelia c84c523e55
canopeas
Signed-off-by: Etzelia <etzelia@hotmail.com>
2021-05-04 11:28:04 -05:00
Etzelia 326b370ca8
Merge branch 'broom' of birbmc.com:Etzelia/sedbot into main
# Conflicts:
#	.drone.yml
2021-03-15 20:39:21 -05:00
Etzelia dec436805c
Clean up
Signed-off-by: Etzelia <etzelia@hotmail.com>
2021-02-22 23:53:55 -06:00
Etzelia beb2b4a6aa Add ServerAPI, clean up help, Twitter (#31)
Update make commands

Remove unnecessary generate step

Update Drone to Go 1.16

Add ServerAPI, clean up help, Twitter

Signed-off-by: Etzelia <etzelia@hotmail.com>

Co-authored-by: Etzelia <etzelia@hotmail.com>
Reviewed-on: https://git.etztech.xyz/Etzelia/sedbot/pulls/31
Co-Authored-By: Etzelia <etzelia@noreply.example.org>
Co-Committed-By: Etzelia <etzelia@noreply.example.org>
2021-02-22 19:27:49 +01:00
Etzelia 2dc22baa28 Birbs (#25)
Update 'discord/status.go'

Reviewed-on: https://git.etztech.xyz/Etzelia/sedbot/pulls/25
Co-Authored-By: Etzelia <etzelia@noreply.example.org>
Co-Committed-By: Etzelia <etzelia@noreply.example.org>
2021-01-20 23:13:30 +01:00
Etzelia cf674102b1 Update gojang (#24)
Update gojang

Signed-off-by: Etzelia <etzelia@hotmail.com>

Co-authored-by: Etzelia <etzelia@hotmail.com>
Reviewed-on: https://git.etztech.xyz/Etzelia/sedbot/pulls/24
Co-Authored-By: Etzelia <etzelia@noreply.example.org>
Co-Committed-By: Etzelia <etzelia@noreply.example.org>
2021-01-20 22:26:11 +01:00
Etzelia d86a1f86b0 Jupiter (#23)
Jupiter

Signed-off-by: Etzelia <etzelia@hotmail.com>

Co-authored-by: Etzelia <etzelia@hotmail.com>
Reviewed-on: https://git.etztech.xyz/Etzelia/sedbot/pulls/23
Co-Authored-By: Etzelia <etzelia@noreply.example.org>
Co-Committed-By: Etzelia <etzelia@noreply.example.org>
2021-01-17 03:45:06 +01:00
Etzelia 1b5257e6b9
Fix setting
Signed-off-by: Etzelia <etzelia@hotmail.com>
2020-09-07 22:55:43 -05:00
Etzelia a9bbc0bf92
Set up main release
Signed-off-by: Etzelia <etzelia@hotmail.com>
2020-09-07 22:53:28 -05:00
44 changed files with 1753 additions and 466 deletions

View File

@ -7,13 +7,13 @@ trigger:
steps: steps:
- name: build - name: build
pull: always pull: always
image: golang:1.15 image: golang:1.16
commands: commands:
- make test - make test
- make build-all - make build
- name: check - name: check
pull: always pull: always
image: golang:1.15 image: golang:1.16
commands: commands:
- make vet - make vet
@ -28,15 +28,15 @@ trigger:
steps: steps:
- name: build - name: build
pull: always pull: always
image: golang:1.15 image: golang:1.16
commands: commands:
- make build-all - make build
- name: gitea-release - name: gitea-release
pull: always pull: always
image: jolheiser/drone-gitea-main:latest image: jolheiser/drone-gitea-main:latest
settings: settings:
token: token:
from_secret: gitea_token from_secret: gitea_token
base: https://git.etztech.xyz base: https://git.canopymc.net
files: files:
- "sedbot" - "canopeas"

8
.gitignore vendored
View File

@ -1,8 +1,6 @@
# GoLand # GoLand
.idea/ .idea/
# Generated # canopeas
config/config_default.go canopeas*
!config/canopeas.example.toml
# sedbot
sedbot*

View File

@ -1,31 +0,0 @@
GO ?= go
.PHONY: fmt
fmt:
$(GO) fmt ./...
.PHONY: imp
imp:
imp -w
.PHONY: generate
generate:
$(GO) generate ./...
.PHONY: test
test:
$(GO) test -race ./...
.PHONY: vet
vet:
$(GO) vet ./...
.PHONY: build
build:
$(GO) build
.PHONY: build-all
build-all: generate build
.PHONY: check
check: generate imp fmt test vet build

View File

@ -1,6 +1,6 @@
# SedBot # canopeas
BirbMC Discord generi-bot. Canopy Discord generi-bot.
## Commands ## Commands
@ -20,12 +20,6 @@ BirbMC Discord generi-bot.
* `clear [<@user>] <number>` - Clear <number> messages (optionally only by @user) * `clear [<@user>] <number>` - Clear <number> messages (optionally only by @user)
## Building
```text
make build-all
```
## License ## License
[MIT](LICENSE) [MIT](LICENSE)

View File

@ -0,0 +1,135 @@
# token is the Discord token for the bot
token = ""
# prefix is the bot command prefix
prefix = "!"
# db_path is the path to the database (default is next to binary)
db_path = "canopeas.db"
# mc_path is the path to the root directory of the minecraft server
mc_path = "/home/minecraft/server/"
# fired_role is to check how many time Carolyn has been fired
fired_role = "0"
# leave_channel is the channel to post leave messages to
leave_channel = "0"
# staff_roles are for staff commands
staff_roles = []
# meme_rate is the rate limit for memes
meme_rate = "0"
# Imgur Client ID
imgur_client_id = ""
# Welcome new users
[welcome]
# Channel ID of the welcome channel
channel = "0"
# Message to send in welcome channel
message = """\
**Hey ${user}, welcome to The Canopy 🎉 !**
If you are new, please read #rules and fill out an application here: https://canopymc.net/apply.
You will need to join our creative server at `creative.canopymc.net` to be verified.
**After** applying and joining the server, please run the `!register <MC username>` (without the brackets) command in this channel to join the Discord!
"""
# DM to send to user
dm = """\
**Hey ${user}, welcome to The Canopy 🎉 !**
If you are new, please read #rules and fill out an application here: https://canopymc.net/apply.
You will need to join our survival server at `creative.canopymc.net` to be verified.
After doing that please run the `!register <MC username>` (without the brackets) command in the welcome channel to join the Discord!
"""
[register]
# role is the role to assign to a user after registering
role = "0"
# url is the URL to show to new users
url = "https://google.com"
# welcome_channel is the channel to message to welcome the newly registered user
welcome_channel = "0"
# ServerAPI options
[serverapi]
# API endpoint
endpoint = ""
# Auth token
token = ""
# Twitter options
[twitter]
# Consumer Key
consumer_key = ""
# Consumer Secret
consumer_secret = ""
# Access Token
access_token = ""
# Access Secret
access_secret = ""
# Server options
[server]
# connection address
address = ""
# connection port
port = 25565
# MCM options
[mcm]
# the token for the MCM API
token = ""
# the base URL to the MCM API
url = ""
# insults
# <args>, your <target> looks like <comparison>, you <adjective> <noun>
[insult]
targets = []
comparisons = []
adjectives = []
nouns = []
# compliments
# <args>, I would <verb> my <noun> just to <minor thing>.
[compliment]
verbs = []
nouns = []
minor_things = []
[[albums]]
name = "jupiter"
aliases = ["jup", "jupjup"]
album_id = ""
help = "Images of Jupiter"
# echoes are any basic command -> message
[[echoes]]
name = "discord"
aliases = ["invite", "gib"]
message = "<https://birbmc.com/discord>"
help = "Get the invite link"
# message_roles are for messages that should toggle a role when a user selects it
[[message_roles]]
channel_id = "0"
message_id = "0"
[[message_roles.reactions]]
role_id = "0"
emoji = "👍"
[[message_roles.reactions]]
role_id = "0"
emoji = "👎"

View File

@ -1,13 +1,15 @@
package config package config
import ( import (
_ "embed"
"io/ioutil" "io/ioutil"
"os" "os"
"github.com/pelletier/go-toml" "github.com/pelletier/go-toml"
) )
var defaultConfig = []byte("") //go:embed canopeas.example.toml
var defaultConfig []byte
type Config struct { type Config struct {
Token string `toml:"token"` Token string `toml:"token"`
@ -23,12 +25,25 @@ type Config struct {
DBPath string `toml:"db_path"` DBPath string `toml:"db_path"`
MCPath string `toml:"mc_path"` MCPath string `toml:"mc_path"`
ImgurClientID string `toml:"imgur_client_id"` ImgurClientID string `toml:"imgur_client_id"`
ServerAPI struct {
Endpoint string `toml:"endpoint"`
Token string `toml:"token"`
} `toml:"serverapi"`
Twitter struct {
ConsumerKey string `toml:"consumer_key"`
ConsumerSecret string `toml:"consumer_secret"`
AccessToken string `toml:"access_token"`
AccessSecret string `toml:"access_secret"`
} `toml:"twitter"`
StaffRoles []string `toml:"staff_roles"` StaffRoles []string `toml:"staff_roles"`
Echoes []Echo `toml:"echoes"` Echoes []Echo `toml:"echoes"`
Albums []Album `toml:"albums"`
MessageRoles []MessageRole `toml:"message_roles"` MessageRoles []MessageRole `toml:"message_roles"`
RegisterRole string `toml:"register_role"` Register struct {
RegisteredChannel string `toml:"registered_channel"` URL string `toml:"url"`
Role string `toml:"role"`
WelcomeChannel string `toml:"welcome_channel"`
} `toml:"register"`
LeaveChannel string `toml:"leave_channel"` LeaveChannel string `toml:"leave_channel"`
FiredRole string `toml:"fired_role"` FiredRole string `toml:"fired_role"`
MemeRate string `toml:"meme_rate"` MemeRate string `toml:"meme_rate"`
@ -43,13 +58,22 @@ type Config struct {
Nouns []string `toml:"nouns"` Nouns []string `toml:"nouns"`
MinorThings []string `toml:"minor_things"` MinorThings []string `toml:"minor_things"`
} `toml:"compliment"` } `toml:"compliment"`
Welcome struct {
Channel string `toml:"channel"`
Message string `toml:"message"`
DM string `toml:"dm"`
} `toml:"welcome"`
} }
type MessageRole struct { type MessageRole struct {
ChannelID string `toml:"channel_id"` ChannelID string `toml:"channel_id"`
MessageID string `toml:"message_id"` MessageID string `toml:"message_id"`
RoleID string `toml:"role_id"` Reactions []MessageReaction `toml:"reactions"`
}
type MessageReaction struct {
Emoji string `toml:"emoji"` Emoji string `toml:"emoji"`
RoleID string `toml:"role_id"`
} }
type Echo struct { type Echo struct {
@ -59,11 +83,18 @@ type Echo struct {
Help string `toml:"help"` Help string `toml:"help"`
} }
type Album struct {
Name string `toml:"name"`
Aliases []string `toml:"aliases"`
AlbumID string `toml:"album_id"`
Help string `toml:"help"`
}
func Load(configPath string) (*Config, error) { func Load(configPath string) (*Config, error) {
var err error var err error
var configContent []byte var configContent []byte
if len(configPath) == 0 { if len(configPath) == 0 {
configPath = "sedbot.toml" configPath = "canopeas.toml"
} }
configContent, err = ioutil.ReadFile(configPath) configContent, err = ioutil.ReadFile(configPath)

View File

@ -1,16 +1,16 @@
package database package database
import ( import (
"strconv"
"go.etcd.io/bbolt" "go.etcd.io/bbolt"
) )
var ( var (
firedBucket = []byte("fired") firedBucket = []byte("fired")
unbanBucket = []byte("unban")
buckets = [][]byte{ buckets = [][]byte{
firedBucket, firedBucket,
unbanBucket,
} }
) )
@ -19,7 +19,7 @@ type Database struct {
} }
func Load(dbPath string) (*Database, error) { func Load(dbPath string) (*Database, error) {
db, err := bbolt.Open(dbPath, 0600, bbolt.DefaultOptions) db, err := bbolt.Open(dbPath, 0o600, bbolt.DefaultOptions)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -35,26 +35,3 @@ func Load(dbPath string) (*Database, error) {
db: db, db: db,
}, nil }, nil
} }
func (db *Database) CheckPing(roleID string) int {
roleIDByte := []byte(roleID)
var idx int
_ = db.db.View(func(tx *bbolt.Tx) error {
num := tx.Bucket(firedBucket).Get(roleIDByte)
if num != nil {
if i, err := strconv.Atoi(string(num)); err == nil {
idx = i
}
}
return nil
})
return idx
}
func (db *Database) IncrementPing(roleID string) error {
roleIDByte := []byte(roleID)
return db.db.Update(func(tx *bbolt.Tx) error {
idx := db.CheckPing(roleID)
return tx.Bucket(firedBucket).Put(roleIDByte, []byte(strconv.Itoa(idx+1)))
})
}

30
database/ping.go 100644
View File

@ -0,0 +1,30 @@
package database
import (
"strconv"
"go.etcd.io/bbolt"
)
func (db *Database) CheckPing(roleID string) int {
roleIDByte := []byte(roleID)
var idx int
_ = db.db.View(func(tx *bbolt.Tx) error {
num := tx.Bucket(firedBucket).Get(roleIDByte)
if num != nil {
if i, err := strconv.Atoi(string(num)); err == nil {
idx = i
}
}
return nil
})
return idx
}
func (db *Database) IncrementPing(roleID string) error {
roleIDByte := []byte(roleID)
return db.db.Update(func(tx *bbolt.Tx) error {
idx := db.CheckPing(roleID)
return tx.Bucket(firedBucket).Put(roleIDByte, []byte(strconv.Itoa(idx+1)))
})
}

49
database/unban.go 100644
View File

@ -0,0 +1,49 @@
package database
import (
"strconv"
"time"
"go.etcd.io/bbolt"
)
type UnbanRecord struct {
Username string
Expiration time.Time
}
func (u UnbanRecord) ExpirationString() string {
return u.Expiration.Format("01/02/2006 at 03:04:05 pm MST")
}
func (db *Database) ListUnbans() []UnbanRecord {
unbans := make([]UnbanRecord, 0)
_ = db.db.View(func(tx *bbolt.Tx) error {
return tx.Bucket(unbanBucket).ForEach(func(username, unix []byte) error {
unixNum, err := strconv.ParseInt(string(unix), 10, 64)
if err != nil {
return err
}
unbans = append(unbans, UnbanRecord{
Username: string(username),
Expiration: time.Unix(unixNum, 0),
})
return nil
})
})
return unbans
}
func (db *Database) AddUnban(record UnbanRecord) error {
usernameByte := []byte(record.Username)
return db.db.Update(func(tx *bbolt.Tx) error {
return tx.Bucket(unbanBucket).Put(usernameByte, []byte(strconv.FormatInt(record.Expiration.Unix(), 10)))
})
}
func (db *Database) RemoveUnban(username string) error {
usernameByte := []byte(username)
return db.db.Update(func(tx *bbolt.Tx) error {
return tx.Bucket(unbanBucket).Delete(usernameByte)
})
}

54
discord/ban.go 100644
View File

@ -0,0 +1,54 @@
package discord
import (
"fmt"
"net/http"
"strings"
"time"
"git.jojodev.com/Minecraft/go-serverapi"
)
func init() {
commands = append(commands, &command{
staffOnly: true,
name: "ban",
validate: func(cmd commandInit) bool {
return isStaff(cmd.message.Member.Roles, cmd.config.StaffRoles)
},
run: func(cmd commandInit) (string, error) {
args := strings.Fields(cmd.message.Content)
if len(args) < 2 {
return "This command requires an in-game username.", nil
}
target := args[1]
reason := "You have been banned. Appeal at https://birbmc.com/appeal"
if len(args) >= 3 {
reason = fmt.Sprintf("%s. Appeal at https://birbmc.com/appeal", strings.Join(args[2:], " "))
}
ban := serverapi.Ban{
Kick: serverapi.Kick{
Unban: serverapi.Unban{
Target: target,
},
Reason: reason,
},
Source: "Discord",
Created: time.Now().Unix(),
}
status, err := cmd.sapiClient.Ban(ban)
if err != nil {
return "", err
}
if status != http.StatusOK {
return fmt.Sprintf("ServerAPI returned status %d when trying to ban %s", status, target), nil
}
return fmt.Sprintf("%s was banned by %s", target, cmd.message.Author.Username), nil
},
help: "Ban a player",
})
}

View File

@ -6,11 +6,12 @@ import (
"strconv" "strconv"
"strings" "strings"
"go.etztech.xyz/falseknees" "git.jojodev.com/Minecraft/canopeas/falseknees"
) )
func init() { func init() {
commands["birb"] = command{ commands = append(commands, &command{
name: "birb",
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return true return true
}, },
@ -42,5 +43,5 @@ func init() {
return fmt.Sprintf("%d: %s\n%s", comic.Num, comic.Title, comic.Img), nil return fmt.Sprintf("%d: %s\n%s", comic.Num, comic.Title, comic.Img), nil
}, },
help: "Get a FalseKnees comic", help: "Get a FalseKnees comic",
} })
} }

View File

@ -0,0 +1,42 @@
package discord
import (
"fmt"
"net/http"
"strings"
"git.jojodev.com/Minecraft/go-serverapi"
)
func init() {
commands = append(commands, &command{
staffOnly: true,
name: "broadcast",
validate: func(cmd commandInit) bool {
return isStaff(cmd.message.Member.Roles, cmd.config.StaffRoles)
},
run: func(cmd commandInit) (string, error) {
args := strings.Fields(cmd.message.Content)
if len(args) < 2 {
return "This command requires a message to broadcast", nil
}
message := strings.Join(args[1:], " ")
broadcast := serverapi.Broadcast{
From: cmd.message.Author.Username,
Message: message,
}
status, err := cmd.sapiClient.Broadcast(broadcast)
if err != nil {
return "", err
}
if status != http.StatusOK {
return fmt.Sprintf("ServerAPI returned status %d when trying to broadcast.", status), nil
}
return "Broadcast sent!", nil
},
help: "Send an in-game broadcast",
})
}

View File

@ -8,7 +8,9 @@ import (
const clearMax = 20 const clearMax = 20
func init() { func init() {
commands["clear"] = command{ commands = append(commands, &command{
name: "clear",
staffOnly: true,
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return isStaff(cmd.message.Member.Roles, cmd.config.StaffRoles) return isStaff(cmd.message.Member.Roles, cmd.config.StaffRoles)
}, },
@ -64,5 +66,5 @@ func init() {
return "", cmd.session.ChannelMessagesBulkDelete(cmd.message.ChannelID, batch) return "", cmd.session.ChannelMessagesBulkDelete(cmd.message.ChannelID, batch)
}, },
help: "Clear messages", help: "Clear messages",
} })
} }

View File

@ -6,7 +6,8 @@ import (
) )
func init() { func init() {
commands["compliment"] = command{ commands = append(commands, &command{
name: "compliment",
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return true return true
}, },
@ -38,5 +39,5 @@ func init() {
return "", nil return "", nil
}, },
help: "Compliment someone!", help: "Compliment someone!",
} })
} }

View File

@ -2,8 +2,11 @@ package discord
import ( import (
"encoding/json" "encoding/json"
"errors"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"github.com/rs/zerolog/log"
) )
const ( const (
@ -18,7 +21,8 @@ type dadJoke struct {
} }
func init() { func init() {
commands["dad"] = command{ commands = append(commands, &command{
name: "dad",
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return true return true
}, },
@ -27,38 +31,48 @@ func init() {
return "", nil return "", nil
} }
req, err := http.NewRequest(http.MethodGet, dadJokeAPI, nil) dj, err := newDadJoke()
if err != nil { if err != nil {
return "", err log.Warn().Msgf("error getting new dad joke: %v", err)
}
req.Header.Add("Accept", "application/json")
resp, err := http.DefaultClient.Do(req)
if err != nil {
return "", err
}
if resp.StatusCode != http.StatusOK {
return dadJokeErr, nil
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return "", err
}
var dj dadJoke
if err := json.Unmarshal(body, &dj); err != nil {
return "", nil
}
// Check status again, in case API returned an error
if dj.Status != http.StatusOK {
return dadJokeErr, nil return dadJokeErr, nil
} }
return dj.Joke, nil return dj.Joke, nil
}, },
help: "Get a random Dad joke", help: "Get a random Dad joke",
} })
}
func newDadJoke() (*dadJoke, error) {
req, err := http.NewRequest(http.MethodGet, dadJokeAPI, nil)
if err != nil {
return nil, err
}
req.Header.Add("Accept", "application/json")
resp, err := http.DefaultClient.Do(req)
if err != nil {
return nil, err
}
if resp.StatusCode != http.StatusOK {
return nil, errors.New("non-ok status")
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return nil, err
}
var dj *dadJoke
if err := json.Unmarshal(body, &dj); err != nil {
return nil, errors.New("could not unmarshal")
}
// Check status again, in case API returned an error
if dj.Status != http.StatusOK {
return nil, errors.New("API error")
}
return dj, nil
} }

View File

@ -2,23 +2,30 @@ package discord
import ( import (
"fmt" "fmt"
"os"
"strings" "strings"
"time" "time"
"go.etztech.xyz/sedbot/config" "github.com/rs/zerolog/log"
"go.etztech.xyz/sedbot/database"
"go.etztech.xyz/sedbot/imgur" "git.jojodev.com/Minecraft/go-serverapi"
"git.jojodev.com/Minecraft/canopeas/config"
"git.jojodev.com/Minecraft/canopeas/database"
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"go.jolheiser.com/beaver" "github.com/dghubble/go-twitter/twitter"
"github.com/dghubble/oauth1"
) )
// Register commands to this map // Register commands to this map
var ( var (
commands = make(map[string]command) commands = make([]*command, 0)
commandMap = make(map[string]*command)
messageRoleMap = make(map[string]map[string]string) messageRoleMap = make(map[string]map[string]string)
memeRateLimit *rateLimit memeRateLimit *rateLimit
embedColor = 0x007D96
) )
type commandInit struct { type commandInit struct {
@ -26,11 +33,19 @@ type commandInit struct {
message *discordgo.Message message *discordgo.Message
config *config.Config config *config.Config
database *database.Database database *database.Database
sapiClient *serverapi.Client
twitterClient *twitter.Client
} }
type command struct { type command struct {
staffOnly bool
deleteInvocation bool
child bool
// TODO Does this really need to exist separately?
validate func(cmd commandInit) bool validate func(cmd commandInit) bool
run func(cmd commandInit) (string, error) run func(cmd commandInit) (string, error)
name string
aliases []string
help string help string
} }
@ -40,24 +55,55 @@ func Bot(cfg *config.Config, db *database.Database) (*discordgo.Session, error)
return nil, err return nil, err
} }
// Init Jupiter images // Init rand
rand.Seed(time.Now().UnixNano()) rand.Seed(time.Now().UnixNano())
if err := imgur.Init(cfg.ImgurClientID); err != nil {
return nil, err // Init ServerAPI
sapi := serverapi.NewClient(cfg.ServerAPI.Endpoint, serverapi.WithToken(cfg.ServerAPI.Token))
// Init Twitter
twitterConfig := oauth1.NewConfig(cfg.Twitter.ConsumerKey, cfg.Twitter.ConsumerSecret)
twitterToken := oauth1.NewToken(cfg.Twitter.AccessToken, cfg.Twitter.AccessSecret)
twitterHttpClient := twitterConfig.Client(oauth1.NoContext, twitterToken)
twitterClient := twitter.NewClient(twitterHttpClient)
// Init Unban Schedule
sched := &unbanSchedule{
db: db,
sapi: sapi,
} }
go sched.Run()
for _, messageRole := range cfg.MessageRoles { for _, messageRole := range cfg.MessageRoles {
if messageRoleMap[messageRole.MessageID] == nil { if messageRoleMap[messageRole.MessageID] == nil {
messageRoleMap[messageRole.MessageID] = make(map[string]string) messageRoleMap[messageRole.MessageID] = make(map[string]string)
} }
_ = bot.MessageReactionAdd(messageRole.ChannelID, messageRole.MessageID, messageRole.Emoji) for _, reaction := range messageRole.Reactions {
messageRoleMap[messageRole.MessageID][messageRole.Emoji] = messageRole.RoleID _ = bot.MessageReactionAdd(messageRole.ChannelID, messageRole.MessageID, reaction.Emoji)
messageRoleMap[messageRole.MessageID][reaction.Emoji] = reaction.RoleID
}
} }
// Init commandMap
if err := Album(cfg); err != nil {
return nil, err
}
Echo(cfg) Echo(cfg)
for _, c := range commands {
if c.name == "" {
log.Error().Msgf("command is missing a name: %s", c.help)
continue
}
commandMap[c.name] = c
for _, a := range c.aliases {
commandMap[a] = c
}
}
bot.AddHandler(readyHandler()) bot.AddHandler(readyHandler())
bot.AddHandler(joinHandler(cfg))
bot.AddHandler(leaveHandler(cfg)) bot.AddHandler(leaveHandler(cfg))
bot.AddHandler(commandHandler(cfg, db)) bot.AddHandler(commandHandler(cfg, db, sapi, twitterClient))
bot.AddHandler(messageHandler(cfg, db)) bot.AddHandler(messageHandler(cfg, db))
bot.AddHandler(reactionAddHandler()) bot.AddHandler(reactionAddHandler())
bot.AddHandler(reactionRemoveHandler()) bot.AddHandler(reactionRemoveHandler())
@ -77,7 +123,7 @@ func Bot(cfg *config.Config, db *database.Database) (*discordgo.Session, error)
func sendTyping(s *discordgo.Session, channelID string) { func sendTyping(s *discordgo.Session, channelID string) {
if err := s.ChannelTyping(channelID); err != nil { if err := s.ChannelTyping(channelID); err != nil {
beaver.Errorf("could not send typing status: %v", err) log.Error().Msgf("could not send typing status: %v", err)
} }
} }
@ -93,16 +139,17 @@ func sendMessage(s *discordgo.Session, channelID, content string, scrub bool) *d
msg, err = s.ChannelMessageSend(channelID, content) msg, err = s.ChannelMessageSend(channelID, content)
} }
if err != nil { if err != nil {
beaver.Errorf("could not send message: %v", err) log.Error().Msgf("could not send message: %v", err)
return nil return nil
} }
return msg return msg
} }
func sendEmbed(s *discordgo.Session, channelID string, embed *discordgo.MessageEmbed) *discordgo.Message { func sendEmbed(s *discordgo.Session, channelID string, embed *discordgo.MessageEmbed) *discordgo.Message {
embed.Color = embedColor
msg, err := s.ChannelMessageSendEmbed(channelID, embed) msg, err := s.ChannelMessageSendEmbed(channelID, embed)
if err != nil { if err != nil {
beaver.Errorf("could not send embed: %v", err) log.Error().Msgf("could not send embed: %v", err)
return nil return nil
} }
return msg return msg
@ -121,11 +168,14 @@ func isStaff(authorRoleIDs, staffRoleIDs []string) bool {
func readyHandler() func(s *discordgo.Session, m *discordgo.Ready) { func readyHandler() func(s *discordgo.Session, m *discordgo.Ready) {
return func(s *discordgo.Session, r *discordgo.Ready) { return func(s *discordgo.Session, r *discordgo.Ready) {
beaver.Infof("https://discord.com/api/oauth2/authorize?client_id=%s&permissions=0&redirect_uri=https://birbmc.com&scope=bot", r.User.ID) log.Info().Msgf("https://discord.com/api/oauth2/authorize?client_id=%s&permissions=0&redirect_uri=https://birbmc.com&scope=bot", r.User.ID)
// Init status changer
go updateStatus(s)
} }
} }
func commandHandler(cfg *config.Config, db *database.Database) func(s *discordgo.Session, m *discordgo.MessageCreate) { func commandHandler(cfg *config.Config, db *database.Database, sapi *serverapi.Client, twitterClient *twitter.Client) func(s *discordgo.Session, m *discordgo.MessageCreate) {
return func(s *discordgo.Session, m *discordgo.MessageCreate) { return func(s *discordgo.Session, m *discordgo.MessageCreate) {
// Ignore bots // Ignore bots
if m.Author.Bot { if m.Author.Bot {
@ -145,25 +195,36 @@ func commandHandler(cfg *config.Config, db *database.Database) func(s *discordgo
cmdArg := strings.ToLower(args[0]) cmdArg := strings.ToLower(args[0])
cmd, ok := commands[cmdArg] cmd, ok := commandMap[cmdArg]
if !ok { if !ok {
return return
} }
if cmd.staffOnly && !isStaff(m.Member.Roles, cfg.StaffRoles) {
return
}
cmdInit := commandInit{ cmdInit := commandInit{
session: s, session: s,
message: m.Message, message: m.Message,
config: cfg, config: cfg,
database: db, database: db,
sapiClient: sapi,
twitterClient: twitterClient,
} }
if !cmd.validate(cmdInit) { if !cmd.validate(cmdInit) {
sendMessage(s, m.ChannelID, "You cannot run this command.", false) sendMessage(s, m.ChannelID, "You cannot run this command.", false)
return return
} }
if cmd.deleteInvocation {
if err := s.ChannelMessageDelete(m.Message.ChannelID, m.Message.ID); err != nil {
log.Warn().Msgf("could not remove invocation for %s: %v", m.Content, err)
}
}
feedback, err := cmd.run(cmdInit) feedback, err := cmd.run(cmdInit)
if err != nil { if err != nil {
feedback = "Internal error" feedback = "Internal error"
beaver.Errorf("error while running %s: %v", cmdArg, err) log.Error().Msgf("error while running %s: %v", cmdArg, err)
} }
if len(feedback) > 0 { if len(feedback) > 0 {
sendMessage(s, m.ChannelID, feedback, false) sendMessage(s, m.ChannelID, feedback, false)
@ -182,7 +243,7 @@ func messageHandler(cfg *config.Config, db *database.Database) func(s *discordgo
for _, role := range m.MentionRoles { for _, role := range m.MentionRoles {
if cfg.FiredRole == role { if cfg.FiredRole == role {
if err := db.IncrementPing(cfg.FiredRole); err != nil { if err := db.IncrementPing(cfg.FiredRole); err != nil {
beaver.Errorf("could not increment ping for %s: %v", cfg.FiredRole, err) log.Error().Msgf("could not increment ping for %s: %v", cfg.FiredRole, err)
} }
} }
} }
@ -204,14 +265,14 @@ func reactionRemoveHandler() func(s *discordgo.Session, m *discordgo.MessageReac
func reactionHandler(add bool, s *discordgo.Session, m *discordgo.MessageReaction) { func reactionHandler(add bool, s *discordgo.Session, m *discordgo.MessageReaction) {
if _, ok := messageRoleMap[m.MessageID]; ok { if _, ok := messageRoleMap[m.MessageID]; ok {
if r, ok := messageRoleMap[m.MessageID][m.Emoji.APIName()]; ok { if r, ok := messageRoleMap[m.MessageID][m.Emoji.APIName()]; ok {
var roleCmd func(guildID, userID, roleID string) (err error) var roleCmd func(guildID, userID, roleID string, opts ...discordgo.RequestOption) (err error)
if add { if add {
roleCmd = s.GuildMemberRoleAdd roleCmd = s.GuildMemberRoleAdd
} else { } else {
roleCmd = s.GuildMemberRoleRemove roleCmd = s.GuildMemberRoleRemove
} }
if err := roleCmd(m.GuildID, m.UserID, r); err != nil { if err := roleCmd(m.GuildID, m.UserID, r); err != nil {
beaver.Errorf("could not modify role %s for user %s", r, m.UserID) log.Error().Msgf("could not modify role %s for user %s", r, m.UserID)
} }
} }
} }
@ -222,3 +283,45 @@ func leaveHandler(cfg *config.Config) func(s *discordgo.Session, m *discordgo.Gu
sendMessage(s, cfg.LeaveChannel, fmt.Sprintf("%s (%s) left the server. :sob:", m.Mention(), m.User.String()), true) sendMessage(s, cfg.LeaveChannel, fmt.Sprintf("%s (%s) left the server. :sob:", m.Mention(), m.User.String()), true)
} }
} }
func updateStatus(s *discordgo.Session) {
ticker := time.NewTicker(time.Minute * 30)
for {
dj, err := newDadJoke()
if err != nil {
log.Warn().Msgf("could not get new dad joke: %v", err)
} else if err := s.UpdateGameStatus(0, dj.Joke); err != nil {
log.Warn().Msgf("could not update status: %v", err)
}
<-ticker.C
}
}
func joinHandler(cfg *config.Config) func(s *discordgo.Session, m *discordgo.GuildMemberAdd) {
return func(s *discordgo.Session, m *discordgo.GuildMemberAdd) {
sendMessage(s, cfg.Welcome.Channel, os.Expand(cfg.Welcome.Message, func(s string) string {
switch strings.ToLower(s) {
case "user":
return m.Mention()
default:
return s
}
}), false)
if cfg.Welcome.DM != "" {
dm, err := s.UserChannelCreate(m.User.ID)
if err != nil {
log.Err(err).Msgf("could not create DM with %s", m.User.Username)
return
}
sendMessage(s, dm.ID, os.Expand(cfg.Welcome.DM, func(s string) string {
switch strings.ToLower(s) {
case "user":
return m.Mention()
default:
return s
}
}), false)
}
}
}

View File

@ -4,45 +4,59 @@ import (
"fmt" "fmt"
"strings" "strings"
"go.etztech.xyz/sedbot/config" "git.jojodev.com/Minecraft/canopeas/config"
"github.com/bwmarrin/discordgo"
) )
func Echo(cfg *config.Config) { func Echo(cfg *config.Config) {
echoes := make([]string, 0) for _, echo := range cfg.Echoes {
for _, e := range cfg.Echoes { e := echo // Closure
echo := e commands = append(commands, &command{
commands[echo.Name] = command{ name: e.Name,
aliases: e.Aliases,
child: true,
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return true return true
}, },
run: func(cmd commandInit) (string, error) { run: func(cmd commandInit) (string, error) {
return echo.Message, nil return e.Message, nil
}, },
help: echo.Help, help: e.Help,
} })
for _, a := range echo.Aliases {
alias := a
commands[alias] = command{
validate: func(cmd commandInit) bool {
return true
},
run: func(cmd commandInit) (string, error) {
return echo.Message, nil
},
help: echo.Help,
}
}
combined := append([]string{echo.Name}, echo.Aliases...)
echoes = append(echoes, fmt.Sprintf("**%s**: %s", strings.Join(combined, ", "), echo.Help))
} }
commands["echoes"] = command{ commands = append(commands, &command{
deleteInvocation: true,
name: "echoes",
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return true return true
}, },
run: func(cmd commandInit) (string, error) { run: func(cmd commandInit) (string, error) {
return strings.Join(echoes, "\n"), nil embed := &discordgo.MessageEmbed{
Title: "Echo Commands",
Fields: make([]*discordgo.MessageEmbedField, len(cfg.Echoes)),
}
for i, echo := range cfg.Echoes {
name := echo.Name
if len(echo.Aliases) > 0 {
name += fmt.Sprintf(" (%s)", strings.Join(echo.Aliases, ", "))
}
embed.Fields[i] = &discordgo.MessageEmbedField{
Name: name,
Value: echo.Help,
Inline: true,
}
}
channel, err := cmd.session.UserChannelCreate(cmd.message.Author.ID)
if err != nil {
return "", err
}
sendEmbed(cmd.session, channel.ID, embed)
return "", nil
}, },
help: "Get all dynamic messages", help: "Get all dynamic messages",
} })
} }

View File

@ -5,7 +5,8 @@ import (
) )
func init() { func init() {
commands["fired"] = command{ commands = append(commands, &command{
name: "fired",
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return true return true
}, },
@ -14,5 +15,5 @@ func init() {
cmd.database.CheckPing(cmd.config.FiredRole)), nil cmd.database.CheckPing(cmd.config.FiredRole)), nil
}, },
help: "Check how many times Carolyn has been fired.", help: "Check how many times Carolyn has been fired.",
} })
} }

View File

@ -3,39 +3,86 @@ package discord
import ( import (
"fmt" "fmt"
"strings" "strings"
"github.com/bwmarrin/discordgo"
) )
func init() { func init() {
commands["help"] = command{ commands = append(commands, &command{
deleteInvocation: true,
name: "help",
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return true return true
}, },
run: func(cmd commandInit) (string, error) { run: func(cmd commandInit) (string, error) {
args := strings.Fields(cmd.message.Content)[1:] args := strings.Fields(cmd.message.Content)[1:]
var resp string var resp *discordgo.MessageEmbed
if len(args) == 1 { if len(args) == 1 {
resp = singleHelp(args[0]) resp = singleHelp(cmd, args[0])
} else { } else {
resp = allHelp() resp = allHelp(cmd)
} }
return resp, nil
channel, err := cmd.session.UserChannelCreate(cmd.message.Author.ID)
if err != nil {
return "", err
}
sendEmbed(cmd.session, channel.ID, resp)
return "", nil
}, },
help: "HELP! HEEEEEEEEEELP!", help: "HELP! HEEEEEEEEEELP!",
} })
} }
func singleHelp(cmd string) string { func singleHelp(cmd commandInit, arg string) *discordgo.MessageEmbed {
if c, ok := commands[cmd]; ok { embed := &discordgo.MessageEmbed{
return fmt.Sprintf("%s: %s", cmd, c.help) Title: "Unkown Command",
Color: 0x007D96,
} }
return "Unknown command" c, ok := commandMap[arg]
if !ok {
return embed
}
if c.staffOnly && !isStaff(cmd.message.Member.Roles, cmd.config.StaffRoles) {
return embed
}
embed.Title = c.name
embed.Description = c.help
return embed
} }
func allHelp() string { func allHelp(cmd commandInit) *discordgo.MessageEmbed {
helps := make([]string, 0) staff := isStaff(cmd.message.Member.Roles, cmd.config.StaffRoles)
for n, c := range commands { embed := &discordgo.MessageEmbed{
helps = append(helps, fmt.Sprintf("%s: %s", n, c.help)) Title: "SedBot Help",
Fields: make([]*discordgo.MessageEmbedField, 0),
} }
return strings.Join(helps, "\n") if staff {
embed.Description = "Commands with an asterisk (*) are staff-only"
}
for _, c := range commands {
if c.child {
continue
}
cmdName := c.name
if len(c.aliases) > 0 {
cmdName += fmt.Sprintf(" (%s)", strings.Join(c.aliases, ", "))
}
if c.staffOnly {
cmdName = fmt.Sprintf("*%s", cmdName)
}
if !c.staffOnly || staff {
embed.Fields = append(embed.Fields, &discordgo.MessageEmbedField{
Name: cmdName,
Value: c.help,
Inline: true,
})
}
}
return embed
} }

View File

@ -5,14 +5,17 @@ import (
"strings" "strings"
"time" "time"
"github.com/rs/zerolog/log"
"gitea.com/jolheiser/gojang"
"gitea.com/jolheiser/gojang/rate"
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"go.jolheiser.com/beaver"
"go.jolheiser.com/gojang"
"go.jolheiser.com/gojang/rate"
) )
func init() { func init() {
cmd := command{ commands = append(commands, &command{
name: "history",
aliases: []string{"names"},
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return true return true
}, },
@ -42,13 +45,13 @@ func init() {
if rate.IsRateLimitExceededError(err) { if rate.IsRateLimitExceededError(err) {
return "Rate limited by Mojang, slow down!", nil return "Rate limited by Mojang, slow down!", nil
} }
beaver.Errorf("Profile: %v", err) log.Error().Msgf("Profile: %v", err)
return "Could not contact the Mojang API.", nil return "Could not contact the Mojang API.", nil
} }
names, err := client.UUIDToNameHistory(profile.UUID) names, err := client.UUIDToNameHistory(profile.UUID)
if err != nil { if err != nil {
beaver.Errorf("UUIDToNameHistory: %v", err) log.Error().Msgf("UUIDToNameHistory: %v", err)
return "Could not contact the Mojang API.", nil return "Could not contact the Mojang API.", nil
} }
@ -79,8 +82,5 @@ func init() {
return "", nil return "", nil
}, },
help: "Minecraft name history", help: "Minecraft name history",
} })
commands["history"] = cmd
commands["names"] = cmd
} }

71
discord/imgur.go 100644
View File

@ -0,0 +1,71 @@
package discord
import (
"fmt"
"strings"
"git.jojodev.com/Minecraft/canopeas/config"
"git.jojodev.com/Minecraft/canopeas/imgur"
"github.com/bwmarrin/discordgo"
)
func Album(cfg *config.Config) error {
for _, a := range cfg.Albums {
images, err := imgur.Get(cfg.ImgurClientID, a.AlbumID)
if err != nil {
return err
}
commands = append(commands, &command{
name: a.Name,
aliases: a.Aliases,
child: true,
validate: func(cmd commandInit) bool {
return true
},
run: func(cmd commandInit) (string, error) {
if !memeRateLimit.Try() {
return "", nil
}
img := images[rand.Intn(len(images))-1]
return img.Link, nil
},
help: a.Help,
})
}
commands = append(commands, &command{
deleteInvocation: true,
name: "albums",
validate: func(cmd commandInit) bool {
return true
},
run: func(cmd commandInit) (string, error) {
embed := &discordgo.MessageEmbed{
Title: "Album Commands",
Fields: make([]*discordgo.MessageEmbedField, len(cfg.Albums)),
}
for i, a := range cfg.Albums {
name := a.Name
if len(a.Aliases) > 0 {
name += fmt.Sprintf(" (%s)", strings.Join(a.Aliases, ", "))
}
embed.Fields[i] = &discordgo.MessageEmbedField{
Name: name,
Value: a.Help,
Inline: true,
}
}
channel, err := cmd.session.UserChannelCreate(cmd.message.Author.ID)
if err != nil {
return "", err
}
sendEmbed(cmd.session, channel.ID, embed)
return "", nil
},
help: "Get all imgur albums",
})
return nil
}

View File

@ -1,9 +1,10 @@
package discord package discord
import "go.etztech.xyz/inspiro" import "git.jojodev.com/Minecraft/canopeas/inspiro"
func init() { func init() {
commands["inspire"] = command{ commands = append(commands, &command{
name: "inspire",
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return true return true
}, },
@ -22,5 +23,5 @@ func init() {
return img, nil return img, nil
}, },
help: "Get inspired!", help: "Get inspired!",
} })
} }

View File

@ -6,7 +6,8 @@ import (
) )
func init() { func init() {
commands["insult"] = command{ commands = append(commands, &command{
name: "insult",
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return true return true
}, },
@ -39,5 +40,5 @@ func init() {
return "", nil return "", nil
}, },
help: "Insult someone!", help: "Insult someone!",
} })
} }

View File

@ -1,23 +0,0 @@
package discord
import "go.etztech.xyz/sedbot/imgur"
func init() {
cmd := command{
validate: func(cmd commandInit) bool {
return true
},
run: func(cmd commandInit) (string, error) {
if !memeRateLimit.Try() {
return "", nil
}
img := imgur.Images[rand.Intn(len(imgur.Images))-1]
return img.Link, nil
},
help: "Get a Jupiter image",
}
commands["jupiter"] = cmd
commands["jup"] = cmd
commands["jupjup"] = cmd
}

View File

@ -7,16 +7,17 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"go.etztech.xyz/sedbot/config" "git.jojodev.com/Minecraft/go-mcm"
"git.jojodev.com/Minecraft/go-mcm/model/django"
"go.etztech.xyz/go-mcm" "git.jojodev.com/Minecraft/canopeas/config"
"go.etztech.xyz/go-mcm/model/django"
) )
const bannedPlayersFile = "banned-players.json" const bannedPlayersFile = "banned-players.json"
func init() { func init() {
commands["register"] = command{ commands = append(commands, &command{
name: "register",
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return len(cmd.message.Member.Roles) == 0 return len(cmd.message.Member.Roles) == 0
}, },
@ -66,35 +67,49 @@ func init() {
return "No application found for that player", nil return "No application found for that player", nil
} }
} }
} else if len(apps) > 0 {
if apps[0].Accepted != nil && *apps[0].Accepted {
return "Please join the server and then re-try this command", nil
} }
} else { if len(apps) == 0 {
return "No player or applications found for that username", nil return "No player or applications found for that username", nil
} }
accepted := apps[0].Accepted
accepted := apps[0].Accepted
if accepted == nil { if accepted == nil {
return "Your application is still being reviewed, hang tight", nil return "Your application is still being reviewed, hang tight", nil
} else if !*accepted { } else if !*accepted {
return "Your application was denied, good luck finding a new server", nil return "Your application was denied, good luck finding a new server", nil
} }
// Accepted if nickname != "" {
// Accepted, check for dupe user
guild, err := cmd.session.State.Guild(cmd.message.GuildID)
if err != nil {
return "", err
}
for _, member := range guild.Members {
nick := member.Nick
if nick == "" {
nick = member.User.Username
}
if strings.EqualFold(nickname, nick) && cmd.message.Author.ID != member.User.ID {
return "A member with that name already exists in this Discord. Please contact staff.", nil
}
}
if err := cmd.session.GuildMemberNickname(cmd.message.GuildID, cmd.message.Author.ID, nickname); err != nil { if err := cmd.session.GuildMemberNickname(cmd.message.GuildID, cmd.message.Author.ID, nickname); err != nil {
return "", err return "", err
} }
if err := cmd.session.GuildMemberRoleAdd(cmd.message.GuildID, cmd.message.Author.ID, cmd.config.RegisterRole); err != nil {
}
if err := cmd.session.GuildMemberRoleAdd(cmd.message.GuildID, cmd.message.Author.ID, cmd.config.Register.Role); err != nil {
return "", err return "", err
} }
// Don't return feedback because this goes in a different channel // Don't return feedback because this goes in a different channel
sendMessage(cmd.session, cmd.config.RegisteredChannel, fmt.Sprintf("Welcome, **%s**!", cmd.message.Author.Mention()), false) sendMessage(cmd.session, cmd.config.Register.WelcomeChannel, fmt.Sprintf("Welcome, **%s**!", cmd.message.Author.Mention()), false)
return "", nil return "", nil
}, },
help: "Register yourself with the Discord", help: "Register yourself with the Discord",
} })
} }
type Ban struct { type Ban struct {

View File

@ -4,25 +4,26 @@ import (
"fmt" "fmt"
"strings" "strings"
"gitea.com/jolheiser/gojang/query"
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"go.jolheiser.com/gojang/query"
) )
func init() { func init() {
cmd := command{ commands = append(commands, &command{
name: "status",
aliases: []string{"version", "online"},
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return true return true
}, },
run: func(cmd commandInit) (string, error) { run: func(cmd commandInit) (string, error) {
server := query.NewServer(cmd.config.Server.Address, cmd.config.Server.Port) server := query.NewServer(cmd.config.Server.Address, cmd.config.Server.Port)
q, err := server.Query(query.DefaultTimeout) q, err := server.Query(query.DefaultTimeout, query.DefaultDeadline)
if err != nil { if err != nil {
return "", err return "", err
} }
embed := &discordgo.MessageEmbed{ embed := &discordgo.MessageEmbed{
Color: 0x007D96,
Title: fmt.Sprintf("Server Status for `%s`", cmd.config.Server.Address), Title: fmt.Sprintf("Server Status for `%s`", cmd.config.Server.Address),
Description: q.MOTD, Description: q.MOTD,
Fields: []*discordgo.MessageEmbedField{ Fields: []*discordgo.MessageEmbedField{
@ -32,12 +33,12 @@ func init() {
Inline: true, Inline: true,
}, },
{ {
Name: "Player's Online", Name: "~~Players~~ Birbs Online",
Value: fmt.Sprintf("%d / %d", q.CurrentPlayers, q.MaxPlayers), Value: fmt.Sprintf("%d / %d", q.CurrentPlayers, q.MaxPlayers),
Inline: true, Inline: true,
}, },
{ {
Name: "Players", Name: "~~Players~~ Birbs",
Value: strings.Join(q.Players, ", "), Value: strings.Join(q.Players, ", "),
}, },
}, },
@ -46,9 +47,5 @@ func init() {
return "", nil return "", nil
}, },
help: "Get the server status", help: "Get the server status",
} })
commands["status"] = cmd
commands["version"] = cmd
commands["online"] = cmd
} }

34
discord/tweet.go 100644
View File

@ -0,0 +1,34 @@
package discord
import (
"fmt"
"strings"
)
func init() {
commands = append(commands, &command{
staffOnly: true,
name: "tweet",
validate: func(cmd commandInit) bool {
return isStaff(cmd.message.Member.Roles, cmd.config.StaffRoles)
},
run: func(cmd commandInit) (string, error) {
args := strings.Fields(cmd.message.Content)
if len(args) < 2 {
return "This command requires a message to tweet", nil
}
message := strings.Join(args[1:], " ")
tweet, resp, err := cmd.twitterClient.Statuses.Update(message, nil)
if err != nil {
return "", err
}
if resp.StatusCode%100 != 2 {
}
return fmt.Sprintf("https://twitter.com/%d/status/%d", tweet.User.ID, tweet.ID), nil
},
help: "Send a tweet from the BirbMC Twitter",
})
}

41
discord/unban.go 100644
View File

@ -0,0 +1,41 @@
package discord
import (
"fmt"
"strconv"
"strings"
"time"
"git.jojodev.com/Minecraft/canopeas/database"
)
func init() {
commands = append(commands, &command{
staffOnly: true,
name: "unban",
validate: func(cmd commandInit) bool {
return isStaff(cmd.message.Member.Roles, cmd.config.StaffRoles)
},
run: func(cmd commandInit) (string, error) {
args := strings.Fields(cmd.message.Content)
if len(args) < 3 {
return "This command requires an in-game username and number of days (use 0 days to unban on next schedule).", nil
}
days, err := strconv.Atoi(args[2])
if err != nil {
return "number of days must be an integer", nil
}
target := args[1]
expiration := time.Now().Add(time.Hour * 24 * time.Duration(days))
record := database.UnbanRecord{
Username: target,
Expiration: expiration,
}
return fmt.Sprintf("%s will be unbanned on %s", target, record.ExpirationString()),
cmd.database.AddUnban(record)
},
help: "Unban a player",
})
}

36
discord/unbans.go 100644
View File

@ -0,0 +1,36 @@
package discord
import (
"github.com/bwmarrin/discordgo"
)
func init() {
commands = append(commands, &command{
staffOnly: true,
name: "unbans",
validate: func(cmd commandInit) bool {
return isStaff(cmd.message.Member.Roles, cmd.config.StaffRoles)
},
run: func(cmd commandInit) (string, error) {
unbans := cmd.database.ListUnbans()
if len(unbans) == 0 {
return "There are no pending unbans", nil
}
embed := &discordgo.MessageEmbed{
Fields: make([]*discordgo.MessageEmbedField, len(unbans)),
}
for i, record := range cmd.database.ListUnbans() {
embed.Fields[i] = &discordgo.MessageEmbedField{
Name: record.Username,
Value: record.ExpirationString(),
Inline: true,
}
}
sendEmbed(cmd.session, cmd.message.ChannelID, embed)
return "", nil
},
help: "Check the unban scheduler",
})
}

View File

@ -2,7 +2,14 @@ package discord
import ( import (
r "math/rand" r "math/rand"
"net/http"
"time" "time"
"github.com/rs/zerolog/log"
"git.jojodev.com/Minecraft/go-serverapi"
"git.jojodev.com/Minecraft/canopeas/database"
) )
type rateLimit struct { type rateLimit struct {
@ -38,3 +45,40 @@ func random(list []string) string {
idx := rand.Intn(size) idx := rand.Intn(size)
return list[idx] return list[idx]
} }
type unbanSchedule struct {
db *database.Database
sapi *serverapi.Client
}
func (u *unbanSchedule) Run() {
u.check()
ticker := time.NewTicker(time.Minute * 5)
for {
<-ticker.C
u.check()
}
}
func (u *unbanSchedule) check() {
log.Debug().Msg("Running unban schedule")
now := time.Now()
for _, record := range u.db.ListUnbans() {
if now.After(record.Expiration) {
log.Info().Msgf("Unbanning %s", record.Username)
unban := serverapi.Unban{
Target: record.Username,
}
status, err := u.sapi.Unban(unban)
if err != nil {
log.Err(err).Msg("")
}
if status != http.StatusOK {
log.Error().Msgf("ServerAPI returned status %d when trying to ban %s", status, record.Username)
}
if err := u.db.RemoveUnban(record.Username); err != nil {
log.Error().Msgf("could not remove unban for %s in database", record.Username)
}
}
}
}

View File

@ -11,7 +11,7 @@ func TestRateLimit(t *testing.T) {
} }
now() now()
limit := NewRateLimit(time.Second * 2) limit := NewRateLimit(time.Second)
if ok := limit.Try(); !ok { if ok := limit.Try(); !ok {
now() now()
@ -25,7 +25,7 @@ func TestRateLimit(t *testing.T) {
t.FailNow() t.FailNow()
} }
time.Sleep(time.Second) time.Sleep(time.Millisecond * 500)
if ok := limit.Try(); ok { if ok := limit.Try(); ok {
now() now()
@ -33,7 +33,7 @@ func TestRateLimit(t *testing.T) {
t.FailNow() t.FailNow()
} }
time.Sleep(time.Second) time.Sleep(time.Millisecond * 500)
if ok := limit.Try(); !ok { if ok := limit.Try(); !ok {
now() now()

View File

@ -7,15 +7,13 @@ import (
) )
func init() { func init() {
commands["welcome"] = command{ commands = append(commands, &command{
deleteInvocation: true,
name: "welcome",
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return isStaff(cmd.message.Member.Roles, cmd.config.StaffRoles) return isStaff(cmd.message.Member.Roles, cmd.config.StaffRoles)
}, },
run: func(cmd commandInit) (string, error) { run: func(cmd commandInit) (string, error) {
if err := cmd.session.ChannelMessageDelete(cmd.message.ChannelID, cmd.message.ID); err != nil {
return "", err
}
orphans := make([]*discordgo.Member, 0) orphans := make([]*discordgo.Member, 0)
members, err := cmd.session.GuildMembers(cmd.message.GuildID, "", 1000) members, err := cmd.session.GuildMembers(cmd.message.GuildID, "", 1000)
@ -49,5 +47,5 @@ func init() {
return "", nil return "", nil
}, },
help: "Get a list of people with no roles", help: "Get a list of people with no roles",
} })
} }

View File

@ -2,15 +2,17 @@ package discord
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"strconv" "strconv"
"strings" "strings"
"go.jolheiser.com/xkcd" "gitea.com/jolheiser/xkcd"
) )
func init() { func init() {
commands["xkcd"] = command{ commands = append(commands, &command{
name: "xkcd",
validate: func(cmd commandInit) bool { validate: func(cmd commandInit) bool {
return true return true
}, },
@ -29,7 +31,7 @@ func init() {
} else { } else {
comicNum, err := strconv.Atoi(args[1]) comicNum, err := strconv.Atoi(args[1])
if err != nil { if err != nil {
return "", err return "", errors.New("this command only accepts a number or no arguments")
} }
comic, err = client.Comic(context.Background(), comicNum) comic, err = client.Comic(context.Background(), comicNum)
} }
@ -40,5 +42,5 @@ func init() {
return fmt.Sprintf("%d: %s\n%s\n%s", comic.Num, comic.SafeTitle, comic.Alt, comic.Img), nil return fmt.Sprintf("%d: %s\n%s\n%s", comic.Num, comic.SafeTitle, comic.Alt, comic.Img), nil
}, },
help: "Get an xkcd comic", help: "Get an xkcd comic",
} })
} }

View File

@ -0,0 +1,29 @@
package falseknees
import "net/http"
// Client is a FalseKnees client
type Client struct {
http *http.Client
}
// New returns a new Client
func New(opts ...ClientOption) *Client {
c := &Client{
http: http.DefaultClient,
}
for _, opt := range opts {
opt(c)
}
return c
}
// ClientOption is options for a Client
type ClientOption func(*Client)
// WithHTTP is a ClientOption for using a different http.Client
func WithHTTP(client *http.Client) ClientOption {
return func(c *Client) {
c.http = client
}
}

View File

@ -0,0 +1,130 @@
package falseknees
import (
"context"
"errors"
"fmt"
"io/ioutil"
"math/rand"
"net/http"
"regexp"
"strconv"
"time"
)
var (
updateInterval = time.Minute * 30
baseURL = "https://www.falseknees.com/"
currentRe = regexp.MustCompile(`window\.location\.href.+"(.+)\.html"`)
imageRe = regexp.MustCompile(`src="(imgs.+\.png)".+title="(.+)"`)
current int
lastUpdate time.Time
)
// Comic is a FalseKnees comic
type Comic struct {
Num int
Title string
Img string
}
// Comic returns a specific Comic
func (c *Client) Comic(ctx context.Context, num int) (*Comic, error) {
return c.comic(ctx, num)
}
// Current returns the current Comic
func (c *Client) Current(ctx context.Context) (*Comic, error) {
if err := c.updateCurrent(ctx); err != nil {
return nil, err
}
return c.Comic(ctx, current)
}
// Random returns a random Comic
func (c *Client) Random(ctx context.Context) (*Comic, error) {
if err := c.updateCurrent(ctx); err != nil {
return nil, err
}
rand.Seed(time.Now().UnixNano())
return c.Comic(ctx, rand.Intn(current)+1)
}
func (c *Client) updateCurrent(ctx context.Context) error {
now := time.Now()
if !lastUpdate.IsZero() && lastUpdate.After(now.Add(-updateInterval)) {
return nil
}
lastUpdate = now
u := fmt.Sprintf("%sindex.html", baseURL)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, u, nil)
if err != nil {
return err
}
resp, err := c.http.Do(req)
if err != nil {
return err
}
if resp.StatusCode != http.StatusOK {
return fmt.Errorf("could not get page for index: %s", resp.Status)
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return err
}
defer resp.Body.Close()
match := currentRe.FindStringSubmatch(string(body))
if len(match) == 0 {
return errors.New("could not find current comic")
}
curr, err := strconv.Atoi(match[1])
if err != nil {
return err
}
current = curr
return nil
}
func (c *Client) comic(ctx context.Context, num int) (*Comic, error) {
u := fmt.Sprintf("%s%d.html", baseURL, num)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, u, nil)
if err != nil {
return nil, err
}
resp, err := c.http.Do(req)
if err != nil {
return nil, err
}
if resp.StatusCode != http.StatusOK {
return nil, fmt.Errorf("could not get page for comic %d: %s", num, resp.Status)
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return nil, err
}
defer resp.Body.Close()
match := imageRe.FindStringSubmatch(string(body))
if len(match) == 0 {
return nil, fmt.Errorf("could not find comic #%d", num)
}
return &Comic{
Num: num,
Title: match[2],
Img: fmt.Sprintf("%s%s", baseURL, match[1]),
}, nil
}

View File

@ -0,0 +1,483 @@
package falseknees
import (
"context"
"fmt"
"net/http"
"net/http/httptest"
"os"
"testing"
)
var (
server *httptest.Server
client *Client
)
func TestMain(m *testing.M) {
handler := func(w http.ResponseWriter, r *http.Request) {
if r.URL.Path == "/index.html" {
_, _ = w.Write(indexHTML)
return
}
if r.URL.Path == "/389.html" {
_, _ = w.Write(currentHTML)
return
}
if r.URL.Path == "/252.html" {
_, _ = w.Write(bunnyHTML)
return
}
w.WriteHeader(http.StatusNotFound)
}
server = httptest.NewServer(http.HandlerFunc(handler))
baseURL = server.URL + "/"
currentComic.Img = fmt.Sprintf("%simgs/389.png", baseURL)
bunnyComic.Img = fmt.Sprintf("%simgs/252.png", baseURL)
client = New()
os.Exit(m.Run())
}
func TestCurrent(t *testing.T) {
t.Parallel()
comic, err := client.Current(context.Background())
if err != nil {
t.Logf("could not get current comic: %v\n", err)
t.FailNow()
}
if *comic != currentComic {
t.Log("comic does not match test data")
t.FailNow()
}
}
func TestComic(t *testing.T) {
t.Parallel()
comic, err := client.Comic(context.Background(), 252)
if err != nil {
t.Logf("could not get comic 252: %v\n", err)
t.FailNow()
}
if *comic != bunnyComic {
t.Log("comic does not match test data")
t.FailNow()
}
}
var (
currentComic = Comic{
Num: 389,
Title: "that's the good stuff",
}
bunnyComic = Comic{
Num: 252,
Title: "Spring is the fucking greatest shit",
}
indexHTML = []byte(`<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="description"
content="False Knees is a webcomic written by Joshua Barkman. All silly nonsense is my own." />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="refresh" content="0; URL=389.html" />
<script type="text/javascript">
window.location.href = "389.html"
</script>
<!-- Favicon -->
<link rel="icon" type="image/png" href="imgs/favicon.png" sizes="96x96">
<!-- Facebook Meta tags -->
<meta property="og:title" content="False Knees" />
<meta property="og:type" content="blog" />
<meta property="og:url" content="http://www.falseknees.com/index.html" />
<meta property="og:image" content="http://www.falseknees.com/imgs/389.png" />
<meta property="og:site_name" content="False Knees" />
<meta property="fb:admins" content="1646220005" />
<link rel="image_src" href="imgs/389.png" />
<link type="text/css" rel="stylesheet" href="stylesheet.css" />
<title>Page Redirection</title>
<!-- Google Analytics -->
<script type="text/javascript">
var _gaq = _gaq || [];
var pluginUrl =
'//www.google-analytics.com/plugins/ga/inpage_linkid.js';
_gaq.push(['_require', 'inpage_linkid', pluginUrl]);
_gaq.push(['_setAccount', 'UA-37345913-1']);
_gaq.push(['_setDomainName', 'falseknees.com']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</head>
<body>
<div id="fb-root"></div>
<script>
(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v2.0";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));
</script>
<!-- Title Image -->
<table align="center">
<tr>
<td>
<div id="title">
<a href="index.html"><img src="imgs/falseknees.png" width="800" /></a>
</div>
</td>
</tr>
</table>
<!-- New Button Placement -->
<div align="center">
<p>
<table>
<tr>
<td><a href="about.html"
title=""><img src="imgs/aboutoff.png" height="50" alt="About" onmouseover="this.src='imgs/abouton.png'" onmouseout="this.src='imgs/aboutoff.png'" /></a>
</td>
<td><a title=""><img src="imgs/stara.png" height="50" alt="" /></a></td>
<td><a href="https://false-knees.myshopify.com/"
title=""><img src="imgs/store.png" height="50" alt="Store" onmouseover="this.src='imgs/storeon.png'" onmouseout="this.src='imgs/store.png'" /></a>
</td>
<td><a title=""><img src="imgs/starb.png" height="50" alt="" /></a></td>
<td><a href="https://www.patreon.com/falseknees?ty=h"><img src="imgs/patron.png" height="50" onmouseover="this.src='imgs/patroff.png'" onmouseout="this.src='imgs/patron.png'"/></a>
</td>
<td><a title=""><img src="imgs/starc.png" height="50" alt="" /></a></td>
<td><a href="book.html"
title=""><img src="imgs/book.png" height="40" alt="About" onmouseover="this.src='imgs/bookon.png'" onmouseout="this.src='imgs/book.png'" /></a>
</td>
</tr>
</table>
</p>
</div>
<!-- Comic -->
<div>
<img src="imgs/389.png" width="600" title="that's the good stuff" />
</div>
<!-- Descriptive Text Box -->
<!-- Descriptive Text Box -->
<div align="center">
</div>
<!-- Navigation Buttons -->
<div align="center">
<p>
<table>
<tr>
<td><a href="1.html"
title=""><img src="imgs/first.png" height="60" alt="First" onmouseover="this.src='imgs/firston.png'" onmouseout="this.src='imgs/first.png'" /></a>
</td>
<td><a href="388.html"
title=""><img src="imgs/previous.png" height="60" alt="Previous" onmouseover="this.src='imgs/previouson.png'" onmouseout="this.src='imgs/previous.png'" /></a>
</td>
<td><a href="archive.html"
title=""><img src="imgs/archive.png" height="60" alt="Archive" onmouseover="this.src='imgs/archive2.png'" onmouseout="this.src='imgs/archive.png'" /></a>
</td>
<td><a href="index.html"
title=""><img src="imgs/next.png" height="60" alt="Next" onmouseover="this.src='imgs/nexton.png'" onmouseout="this.src='imgs/next.png'" /></a>
</td>
<td><a href="index.html"
title=""><img src="imgs/last.png" height="60" alt="Last" onmouseover="this.src='imgs/laston.png'" onmouseout="this.src='imgs/last.png'" /></a>
</td>
</tr>
</table>
</p>
</div>
<!-- Social Media -->
<table class="social" align="center">
<tr>
<td><a href="http://falseknees.tumblr.com/"><img src="imgs/TumblrButton.png" width="60" onmouseover="this.src='imgs/TumblrButtonOn.png'" onmouseout="this.src='imgs/TumblrButton.png'"/></a>
</td>
<td><a href="https://instagram.com/FalseKnees"><img src="imgs/instagram.png" width="60" onmouseover="this.src='imgs/instagramon.png'" onmouseout="this.src='imgs/instagram.png'"/></a>
</td>
<td><a href="https://www.facebook.com/FalseKnees?ref=hl"><img src="imgs/FacebookButton.png" width="60" onmouseover="this.src='imgs/FacebookButtonOn.png'" onmouseout="this.src='imgs/FacebookButton.png'"/></a>
</td>
<td><a href="http://www.webtoons.com/en/challenge/false-knees/list?title_no=79544"><img src="imgs/webtooff.png" width="60" onmouseover="this.src='imgs/webtoon.png'" onmouseout="this.src='imgs/webtooff.png'"/></a>
</td>
<td><a href="https://tapas.io/series/FalseKnees"><img src="imgs/tap.png" width="60" onmouseover="this.src='imgs/tapon.png'" onmouseout="this.src='imgs/tap.png'"/></a>
</td>
</tr>
</table>
<!-- Copyright -->
<div>
<p>False Knees &copy 2013-whenever Joshua Barkman</p>
</div>
</body>
</html>`)
currentHTML = []byte(`<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="description" content="False Knees is a webcomic written by Joshua Barkman. All silly nonsense is my own." />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<!-- Favicon -->
<link rel="icon" type="image/png" href="imgs/favicon.png" sizes="96x96">
<!-- Facebook Meta tags -->
<meta property="og:title" content="False Knees" />
<meta property="og:type" content="blog" />
<meta property="og:url" content="http://www.falseknees.com/389.html" />
<meta property="og:image" content="http://www.falseknees.com/imgs/389.png" />
<meta property="og:site_name" content="False Knees" />
<meta property="fb:admins" content="1646220005" />
<link rel="image_src" href="imgs/389.png" />
<link type="text/css" rel="stylesheet" href="stylesheet.css" />
<title>False Knees</title>
<!-- Google Analytics -->
<script type="text/javascript">
var _gaq = _gaq || [];
var pluginUrl =
'//www.google-analytics.com/plugins/ga/inpage_linkid.js';
_gaq.push(['_require', 'inpage_linkid', pluginUrl]);
_gaq.push(['_setAccount', 'UA-37345913-1']);
_gaq.push(['_setDomainName', 'falseknees.com']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</head>
<body>
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v2.0";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<!-- Title Image -->
<table align="center">
<tr>
<td><div id="title">
<a href="index.html"><img src="imgs/falseknees.png" width="800" /></a>
</div></td>
</tr>
</table>
<!-- New Button Placement -->
<div align="center">
<p>
<table>
<tr>
<td><a href="about.html" title=""><img src="imgs/aboutoff.png" height="50" alt="About" onmouseover="this.src='imgs/abouton.png'" onmouseout="this.src='imgs/aboutoff.png'" /></a></td>
<td><a title=""><img src="imgs/stara.png" height="50" alt="" /></a></td>
<td><a href="https://false-knees.myshopify.com/" title=""><img src="imgs/store.png" height="50" alt="Store" onmouseover="this.src='imgs/storeon.png'" onmouseout="this.src='imgs/store.png'" /></a></td>
<td><a title=""><img src="imgs/starb.png" height="50" alt="" /></a></td>
<td><a href="https://www.patreon.com/falseknees?ty=h"><img src="imgs/patron.png" height="50" onmouseover="this.src='imgs/patroff.png'" onmouseout="this.src='imgs/patron.png'"/></a></td>
<td><a title=""><img src="imgs/starc.png" height="50" alt="" /></a></td>
<td><a href="book.html" title=""><img src="imgs/book.png" height="40" alt="About" onmouseover="this.src='imgs/bookon.png'" onmouseout="this.src='imgs/book.png'" /></a></td>
</tr>
</table></p>
</div>
<!-- Comic -->
<div>
<img src="imgs/389.png" width="600" title="that's the good stuff" />
</div>
<!-- Descriptive Text Box -->
<!-- Descriptive Text Box -->
<div align="center">
</div>
<!-- Navigation Buttons -->
<div align="center">
<p>
<table>
<tr>
<td><a href="1.html" title=""><img src="imgs/first.png" height="60" alt="First" onmouseover="this.src='imgs/firston.png'" onmouseout="this.src='imgs/first.png'" /></a></td>
<td><a href="388.html" title=""><img src="imgs/previous.png" height="60" alt="Previous" onmouseover="this.src='imgs/previouson.png'" onmouseout="this.src='imgs/previous.png'" /></a></td>
<td><a href="archive.html" title=""><img src="imgs/archive.png" height="60" alt="Archive" onmouseover="this.src='imgs/archive2.png'" onmouseout="this.src='imgs/archive.png'" /></a></td>
<td><a href="389.html" title=""><img src="imgs/next.png" height="60" alt="Next" onmouseover="this.src='imgs/nexton.png'" onmouseout="this.src='imgs/next.png'" /></a></td>
<td><a href="index.html" title=""><img src="imgs/last.png" height="60" alt="Last" onmouseover="this.src='imgs/laston.png'" onmouseout="this.src='imgs/last.png'" /></a></td>
</tr>
</table></p>
</div>
<!-- Social Media -->
<table class="social" align="center">
<tr>
<td><a href="http://falseknees.tumblr.com/"><img src="imgs/TumblrButton.png" width="60" onmouseover="this.src='imgs/TumblrButtonOn.png'" onmouseout="this.src='imgs/TumblrButton.png'"/></a>
</td>
<td><a href="https://instagram.com/FalseKnees"><img src="imgs/instagram.png" width="60" onmouseover="this.src='imgs/instagramon.png'" onmouseout="this.src='imgs/instagram.png'"/></a>
</td>
<td><a href="https://www.facebook.com/FalseKnees?ref=hl"><img src="imgs/FacebookButton.png" width="60" onmouseover="this.src='imgs/FacebookButtonOn.png'" onmouseout="this.src='imgs/FacebookButton.png'"/></a>
</td>
<td><a href="http://www.webtoons.com/en/challenge/false-knees/list?title_no=79544"><img src="imgs/webtooff.png" width="60" onmouseover="this.src='imgs/webtoon.png'" onmouseout="this.src='imgs/webtooff.png'"/></a>
</td>
<td><a href="https://tapas.io/series/FalseKnees"><img src="imgs/tap.png" width="60" onmouseover="this.src='imgs/tapon.png'" onmouseout="this.src='imgs/tap.png'"/></a>
</td>
</tr>
</table>
<!-- Copyright -->
<div>
<p>False Knees &copy 2013-whenever Joshua Barkman</p>
</div>
</body>
</html>
`)
bunnyHTML = []byte(`<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="description" content="False Knees is a webcomic written by Joshua Barkman. All silly nonsense is my own." />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<!-- Favicon -->
<link rel="icon" type="image/png" href="imgs/favicon.png" sizes="96x96">
<!-- Facebook Meta tags -->
<meta property="og:title" content="False Knees" />
<meta property="og:type" content="blog" />
<meta property="og:url" content="http://www.falseknees.com/252.html" />
<meta property="og:image" content="http://www.falseknees.com/imgs/252.png" />
<meta property="og:site_name" content="False Knees" />
<meta property="fb:admins" content="1646220005" />
<link rel="image_src" href="imgs/252.png" />
<link type="text/css" rel="stylesheet" href="stylesheet.css" />
<title>False Knees</title>
<!-- Google Analytics -->
<script type="text/javascript">
var _gaq = _gaq || [];
var pluginUrl =
'//www.google-analytics.com/plugins/ga/inpage_linkid.js';
_gaq.push(['_require', 'inpage_linkid', pluginUrl]);
_gaq.push(['_setAccount', 'UA-37345913-1']);
_gaq.push(['_setDomainName', 'falseknees.com']);
_gaq.push(['_trackPageview']);
(function() {
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
</script>
</head>
<body>
<div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v2.0";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<!-- Title Image -->
<table align="center">
<tr>
<td><div id="title">
<a href="index.html"><img src="imgs/falseknees.png" width="800" /></a>
</div></td>
</tr>
</table>
<!-- New Button Placement -->
<div align="center">
<p>
<table>
<tr>
<td><a href="about.html" title=""><img src="imgs/aboutoff.png" height="50" alt="About" onmouseover="this.src='imgs/abouton.png'" onmouseout="this.src='imgs/aboutoff.png'" /></a></td>
<td><a title=""><img src="imgs/stara.png" height="50" alt="" /></a></td>
<td><a href="https://false-knees.myshopify.com/collections/comic-prints" title=""><img src="imgs/store.png" height="50" alt="Store" onmouseover="this.src='imgs/storeon.png'" onmouseout="this.src='imgs/store.png'" /></a></td>
<td><a title=""><img src="imgs/starb.png" height="50" alt="" /></a></td>
<td><a href="https://www.patreon.com/falseknees?ty=h"><img src="imgs/patron.png" height="50" onmouseover="this.src='imgs/patroff.png'" onmouseout="this.src='imgs/patron.png'"/></a></td>
<td><a title=""><img src="imgs/starc.png" height="50" alt="" /></a></td>
<td><a href="book.html" title=""><img src="imgs/book.png" height="40" alt="About" onmouseover="this.src='imgs/bookon.png'" onmouseout="this.src='imgs/book.png'" /></a></td>
</tr>
</table></p>
</div>
<!-- Comic -->
<div>
<img src="imgs/252.png" width="600" title="Spring is the fucking greatest shit" />
</div>
<!-- Descriptive Text Box -->
<!-- Descriptive Text Box -->
<div align="center">
</div>
<!-- Navigation Buttons -->
<div align="center">
<p>
<table>
<tr>
<td><a href="1.html" title=""><img src="imgs/first.png" height="60" alt="First" onmouseover="this.src='imgs/firston.png'" onmouseout="this.src='imgs/first.png'" /></a></td>
<td><a href="251.html" title=""><img src="imgs/previous.png" height="60" alt="Previous" onmouseover="this.src='imgs/previouson.png'" onmouseout="this.src='imgs/previous.png'" /></a></td>
<td><a href="archive.html" title=""><img src="imgs/archive.png" height="60" alt="Archive" onmouseover="this.src='imgs/archive2.png'" onmouseout="this.src='imgs/archive.png'" /></a></td>
<td><a href="253.html" title=""><img src="imgs/next.png" height="60" alt="Next" onmouseover="this.src='imgs/nexton.png'" onmouseout="this.src='imgs/next.png'" /></a></td>
<td><a href="index.html" title=""><img src="imgs/last.png" height="60" alt="Last" onmouseover="this.src='imgs/laston.png'" onmouseout="this.src='imgs/last.png'" /></a></td>
</tr>
</table></p>
</div>
<!-- Social Media -->
<table class="social" align="center">
<tr>
<td><a href="http://falseknees.tumblr.com/"><img src="imgs/TumblrButton.png" width="60" onmouseover="this.src='imgs/TumblrButtonOn.png'" onmouseout="this.src='imgs/TumblrButton.png'"/></a>
</td>
<td><a href="https://instagram.com/FalseKnees"><img src="imgs/instagram.png" width="60" onmouseover="this.src='imgs/instagramon.png'" onmouseout="this.src='imgs/instagram.png'"/></a>
</td>
<td><a href="https://www.facebook.com/FalseKnees?ref=hl"><img src="imgs/FacebookButton.png" width="60" onmouseover="this.src='imgs/FacebookButtonOn.png'" onmouseout="this.src='imgs/FacebookButton.png'"/></a>
</td>
<td><a href="http://www.webtoons.com/en/challenge/false-knees/list?title_no=79544"><img src="imgs/webtooff.png" width="60" onmouseover="this.src='imgs/webtoon.png'" onmouseout="this.src='imgs/webtooff.png'"/></a>
</td>
<td><a href="https://tapas.io/series/FalseKnees"><img src="imgs/tap.png" width="60" onmouseover="this.src='imgs/tapon.png'" onmouseout="this.src='imgs/tap.png'"/></a>
</td>
</tr>
</table>
<!-- Copyright -->
<div>
<p>False Knees &copy 2013-whenever Joshua Barkman</p>
</div>
</body>
</html>
`)
)

24
go.mod
View File

@ -1,18 +1,18 @@
module go.etztech.xyz/sedbot module git.jojodev.com/Minecraft/canopeas
go 1.14 go 1.16
require ( require (
github.com/bwmarrin/discordgo v0.22.0 git.jojodev.com/Minecraft/go-mcm v0.0.1
github.com/gorilla/websocket v1.4.2 // indirect git.jojodev.com/Minecraft/go-serverapi v0.0.1
gitea.com/jolheiser/gojang v0.0.7
gitea.com/jolheiser/xkcd v0.0.2
github.com/bwmarrin/discordgo v0.27.1
github.com/dghubble/go-twitter v0.0.0-20201011215211-4b180d0cc78d
github.com/dghubble/oauth1 v0.7.0
github.com/gorilla/websocket v1.5.0 // indirect
github.com/pelletier/go-toml v1.8.1 github.com/pelletier/go-toml v1.8.1
github.com/rs/zerolog v1.26.1
go.etcd.io/bbolt v1.3.4 go.etcd.io/bbolt v1.3.4
go.etztech.xyz/falseknees v0.0.1 golang.org/x/crypto v0.8.0 // indirect
go.etztech.xyz/go-mcm v1.3.1
go.etztech.xyz/inspiro v0.0.0-20200606185551-edfdf9da2359
go.jolheiser.com/beaver v1.0.2
go.jolheiser.com/gojang v0.0.2
go.jolheiser.com/xkcd v0.0.1
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect
golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5 // indirect
) )

115
go.sum
View File

@ -1,45 +1,96 @@
github.com/bwmarrin/discordgo v0.21.1 h1:UI2PWwzvn5IFuscYcDc6QB/duhs9MUIjQ4HclcIZisc= git.jojodev.com/Minecraft/go-mcm v0.0.1 h1:3nfjCz3wA4l44QWYMRC7DLwU4GneWC5e1CRub7Tt1S0=
github.com/bwmarrin/discordgo v0.21.1/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= git.jojodev.com/Minecraft/go-mcm v0.0.1/go.mod h1:0VAA1b5ZgM1leeYOqMhBnEfdonZccdMdeQrsF+50s04=
github.com/bwmarrin/discordgo v0.22.0 h1:uBxY1HmlVCsW1IuaPjpCGT6A2DBwRn0nvOguQIxDdFM= git.jojodev.com/Minecraft/go-serverapi v0.0.1 h1:sn594cScthq0W/ntLVhWfMfNcPXG9IyyqMatcEjcYIQ=
github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= git.jojodev.com/Minecraft/go-serverapi v0.0.1/go.mod h1:a3e4OnMNJnd2OzwRG62Fe/k70SelNDoAxYW9SYmkDf4=
gitea.com/jolheiser/gojang v0.0.7 h1:Q4cG7QYiKQsJtUWgXXiolAH9DCLRoaQ4olaO9OV628U=
gitea.com/jolheiser/gojang v0.0.7/go.mod h1:r9kj2wv/21Da7VpWz+qmxLexH85o2BAM4NMxeYgQlcY=
gitea.com/jolheiser/xkcd v0.0.2 h1:HJP83YwSKxSYcoNfpb1ZpAfBvkUAnN+YgeukraXtfrc=
gitea.com/jolheiser/xkcd v0.0.2/go.mod h1:aDa2vX54wLaX8Ra5CGN2GWBX13UWAGJKGGddzHl/hks=
github.com/bwmarrin/discordgo v0.27.1 h1:ib9AIc/dom1E/fSIulrBwnez0CToJE113ZGt4HoliGY=
github.com/bwmarrin/discordgo v0.27.1/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY=
github.com/cenkalti/backoff v2.1.1+incompatible h1:tKJnvO2kl0zmb/jA5UKAt4VoEVw1qxKWjE/Bpp46npY=
github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
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 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/dghubble/go-twitter v0.0.0-20201011215211-4b180d0cc78d h1:sBKr0A8iQ1qAOozedZ8Aox+Jpv+TeP1Qv7dcQyW8V+M=
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/dghubble/go-twitter v0.0.0-20201011215211-4b180d0cc78d/go.mod h1:xfg4uS5LEzOj8PgZV7SQYRHbG7jPUnelEiaAVJxmhJE=
github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/dghubble/oauth1 v0.7.0 h1:AlpZdbRiJM4XGHIlQ8BuJ/wlpGwFEJNnB4Mc+78tA/w=
github.com/dghubble/oauth1 v0.7.0/go.mod h1:8pFdfPkv/jr8mkChVbNVuJ0suiHe278BtWI4Tk1ujxk=
github.com/dghubble/sling v1.3.0 h1:pZHjCJq4zJvc6qVQ5wN1jo5oNZlNE0+8T/h0XeXBUKU=
github.com/dghubble/sling v1.3.0/go.mod h1:XXShWaBWKzNLhu2OxikSNFrlsvowtz4kyRuXUG7oQKY=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM= github.com/pelletier/go-toml v1.8.1 h1:1Nf83orprkJyknT6h7zbuEGUEjcyVlCxSUGTENmNCRM=
github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
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/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc=
github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg= go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
go.etztech.xyz/falseknees v0.0.1 h1:XjlBqMyBUH5b7e/9oedEwZ9pnz3sqMhXQv6vnQocxeM= go.jolheiser.com/gql v0.0.1 h1:y3LGHcJUZI9otTCcMn8TVdF3aEzNX0FW6m0YUamlLto=
go.etztech.xyz/falseknees v0.0.1/go.mod h1:Acn1AwrvAArQEqhMBDlak5BvCZ3jgV8vdL8Pe5ZldRE= go.jolheiser.com/gql v0.0.1/go.mod h1:74eYqVRIxsOFxtVl0RYGKNyYQgJYQaxOCgar7LP71Hw=
go.etztech.xyz/go-mcm v1.3.1 h1:RLdOQrMgw0eP7bsfRRbXLW8c5/RaJ5Mg7i/ESFaUwvY=
go.etztech.xyz/go-mcm v1.3.1/go.mod h1:Hz2YULB3sN/aQA8cPSm2d6LM3E3qTMspzfRCIAD/1dc=
go.etztech.xyz/inspiro v0.0.0-20200606185551-edfdf9da2359 h1:j/ZeoAj185wHfCSYD52Kt/69i3Bzk1MXN4Qh1yP6+P4=
go.etztech.xyz/inspiro v0.0.0-20200606185551-edfdf9da2359/go.mod h1:+fC1WzJm/oS4UEgqr1jPouWerxBys52lTTDA94/5bf8=
go.jolheiser.com/beaver v1.0.2 h1:KA2D6iO8MQhZi1nZYi/Chak/f1Cxfrs6b1XO623+Khk=
go.jolheiser.com/beaver v1.0.2/go.mod h1:7X4F5+XOGSC3LejTShoBdqtRCnPWcnRgmYGmG3EKW8g=
go.jolheiser.com/gojang v0.0.2 h1:CvQETKT9sFfvuDeYVUkiR0Jh7xIs7Cayi0rZuDrXoZg=
go.jolheiser.com/gojang v0.0.2/go.mod h1:hUBULFDoampNM97E1IaYUhkLBJ30sb7iGsoFOdDU76I=
go.jolheiser.com/xkcd v0.0.1 h1:pRNY2BXxUS+NMtKlm/ENumOr7g3k4VWY/QoDri9YSNU=
go.jolheiser.com/xkcd v0.0.1/go.mod h1:AzWPrZToCLfpazsZBkeu/nPuIvurMqfCOptiydz7Dvk=
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-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2api+jEfxLoykJVice/E= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/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-20190215142949-d0b11bdaac8a/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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5 h1:LfCXLvNmTYH9kEmVgqbnsWfruoXZIrh4YBgqVHtDvw0=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5 h1:iCaAy5bMeEvwANu3YnJfWwI0kWAGkEa2RXPdweI/ysk= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

View File

@ -6,10 +6,6 @@ import (
"net/http" "net/http"
) )
// TODO Make a client for this in a separate module
var Images []*Image
type Response struct { type Response struct {
Images []*Image `json:"data"` Images []*Image `json:"data"`
Success bool `json:"success"` Success bool `json:"success"`
@ -33,23 +29,19 @@ type Image struct {
Link string `json:"link"` Link string `json:"link"`
} }
func Init(clientID string) error { func Get(clientID, albumID string) ([]*Image, error) {
req, err := http.NewRequest(http.MethodGet, fmt.Sprintf("https://api.imgur.com/3/album/%s/images", albumID), nil)
req, err := http.NewRequest(http.MethodGet, "https://api.imgur.com/3/album/TaJVIdQ/images", nil)
if err != nil { if err != nil {
return err return nil, err
} }
req.Header.Set("Authorization", fmt.Sprintf("Client-ID %s", clientID)) req.Header.Set("Authorization", fmt.Sprintf("Client-ID %s", clientID))
resp, err := http.DefaultClient.Do(req) resp, err := http.DefaultClient.Do(req)
if err != nil { if err != nil {
return err return nil, err
} }
defer resp.Body.Close()
var imgurResp Response var imgurResp Response
if err := json.NewDecoder(resp.Body).Decode(&imgurResp); err != nil { return imgurResp.Images, json.NewDecoder(resp.Body).Decode(&imgurResp)
return err
}
Images = imgurResp.Images
return resp.Body.Close()
} }

23
inspiro/inspiro.go 100644
View File

@ -0,0 +1,23 @@
package inspiro
import (
"io/ioutil"
"net/http"
)
const api = "https://inspirobot.me/api?generate=true"
func Generate() (string, error) {
resp, err := http.Get(api)
if err != nil {
return "", err
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return "", err
}
defer resp.Body.Close()
return string(body), nil
}

View File

@ -0,0 +1,17 @@
package inspiro
import (
"os"
"testing"
)
func TestMain(m *testing.M) {
os.Exit(m.Run())
}
func TestGenerate(t *testing.T) {
if _, err := Generate(); err != nil {
t.Logf("could not generate image: %v", err)
t.Fail()
}
}

35
main.go
View File

@ -1,5 +1,3 @@
//go:generate go run sedbot.example.go
package main package main
import ( import (
@ -8,54 +6,49 @@ import (
"os/signal" "os/signal"
"syscall" "syscall"
"go.etztech.xyz/sedbot/config" "github.com/rs/zerolog"
"go.etztech.xyz/sedbot/database" "github.com/rs/zerolog/log"
"go.etztech.xyz/sedbot/discord"
"go.jolheiser.com/beaver" "git.jojodev.com/Minecraft/canopeas/config"
"git.jojodev.com/Minecraft/canopeas/database"
"git.jojodev.com/Minecraft/canopeas/discord"
) )
var configFlag string var configFlag string
func main() { func main() {
flag.StringVar(&configFlag, "config", "sedbot.toml", "Set config path") log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
flag.Parse()
beaver.Console.Format = beaver.FormatOptions{ flag.StringVar(&configFlag, "config", "canopeas.toml", "Set config path")
TimePrefix: true, flag.Parse()
StackPrefix: true,
StackLimit: 15,
LevelPrefix: true,
LevelColor: true,
}
cfg, err := config.Load(configFlag) cfg, err := config.Load(configFlag)
if err != nil { if err != nil {
beaver.Fatalf("could not load config: %v", err) log.Fatal().Msgf("could not load config: %v", err)
} }
db, err := database.Load(cfg.DBPath) db, err := database.Load(cfg.DBPath)
if err != nil { if err != nil {
beaver.Fatalf("could not load database: %v", err) log.Fatal().Msgf("could not load database: %v", err)
} }
bot, err := discord.Bot(cfg, db) bot, err := discord.Bot(cfg, db)
if err != nil { if err != nil {
beaver.Fatalf("could not start Discord bot: %v", err) log.Fatal().Msgf("could not start Discord bot: %v", err)
} }
go func() { go func() {
if err := bot.Open(); err != nil { if err := bot.Open(); err != nil {
beaver.Errorf("error running Discord bot: %v", err) log.Error().Msgf("error running Discord bot: %v", err)
} }
}() }()
beaver.Info("Bot is now running. Press CTRL-C to exit.") log.Info().Msg("Bot is now running. Press CTRL-C to exit.")
sc := make(chan os.Signal, 1) sc := make(chan os.Signal, 1)
signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill) signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt, os.Kill)
<-sc <-sc
if err := bot.Close(); err != nil { if err := bot.Close(); err != nil {
beaver.Errorf("error closing Discord bot: %v", err) log.Error().Msgf("error closing Discord bot: %v", err)
} }
} }

View File

@ -1,35 +0,0 @@
// +build ignore
package main
import (
"fmt"
"io/ioutil"
"os"
)
const (
exampleFile = "sedbot.example.toml"
writeFile = "config/config_default.go"
tmpl = `package config
func init() {
defaultConfig = []byte(` + "`" + `%s` + "`" + `)
}
`
)
func main() {
bytes, err := ioutil.ReadFile(exampleFile)
if err != nil {
fmt.Printf("Could not read from %s. Are you in the root directory of the project?", exampleFile)
os.Exit(1)
}
data := fmt.Sprintf(tmpl, string(bytes))
if err := ioutil.WriteFile(writeFile, []byte(data), os.ModePerm); err != nil {
fmt.Printf("Could not write to %s.", writeFile)
os.Exit(1)
}
}

View File

@ -1,75 +0,0 @@
# token is the Discord token for the bot
token = ""
# prefix is the bot command prefix
prefix = "!"
# db_path is the path to the database (default is next to binary)
db_path = "sedbot.db"
# mc_path is the path to the root directory of the minecraft server
mc_path = "/home/minecraft/server/"
# fired_role is to check how many time Carolyn has been fired
fired_role = "0"
# register_role is the role to assign to a user after registering
register_role = "0"
# registered_channel is the channel to message to welcome the newly registered user
registered_channel = "0"
# leave_channel is the channel to post leave messages to
leave_channel = "0"
# staff_roles are for staff commands
staff_roles = []
# meme_rate is the rate limit for memes
meme_rate = "0"
# Imgur Client ID
imgur_client_id = ""
# Server options
[server]
# connection address
address = ""
# connection port
port = 25565
# MCM options
[mcm]
# the token for the MCM API
token = ""
# the base URL to the MCM API
url = ""
# insults
# <args>, your <target> looks like <comparison>, you <adjective> <noun>
[insult]
targets = []
comparisons = []
adjectives = []
nouns = []
# compliments
# <args>, I would <verb> my <noun> just to <minor thing>.
[compliment]
verbs = []
nouns = []
minor_things = []
# echoes are any basic command -> message
[[echoes]]
name = "discord"
aliases = ["invite", "gib"]
message = "<https://birbmc.com/discord>"
help = "Get the invite link"
# message_roles are for messages that should toggle a role when a user selects it
[[message_roles]]
channel_id = "0"
message_id = "0"
role_id = "0"
emoji = "👍"