cws
/
catbase
mirror of https://github.com/velour/catbase.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Compare commits

base: cws:defeb9b3b19f73d7c09f472721a12d1a1526e02a
Branches Tags
cws:main
cws:dockerscratch
cws:dependabot/go_modules/golang.org/x/image-0.18.0
cws:supercount64
cws:dependabot/go_modules/github.com/a-h/templ-0.2.707
cws:dependabot/go_modules/github.com/ggicci/httpin-0.19.0
cws:dependabot/go_modules/github.com/cenkalti/backoff/v4-4.3.0
cws:dependabot/go_modules/github.com/stretchr/testify-1.9.0
cws:dependabot/go_modules/github.com/mmcdole/gofeed-1.3.0
cws:catbasic
cws:ImpossibleGame
cws:ItIsJustAGameFocker
..
compare: cws:332d992d05ecbe0868d2d8f45627aec43936e07c
Branches Tags
cws:main
cws:dockerscratch
cws:dependabot/go_modules/golang.org/x/image-0.18.0
cws:supercount64
cws:dependabot/go_modules/github.com/a-h/templ-0.2.707
cws:dependabot/go_modules/github.com/ggicci/httpin-0.19.0
cws:dependabot/go_modules/github.com/cenkalti/backoff/v4-4.3.0
cws:dependabot/go_modules/github.com/stretchr/testify-1.9.0
cws:dependabot/go_modules/github.com/mmcdole/gofeed-1.3.0
cws:catbasic
cws:ImpossibleGame
cws:ItIsJustAGameFocker

No commits in common. "defeb9b3b19f73d7c09f472721a12d1a1526e02a" and "332d992d05ecbe0868d2d8f45627aec43936e07c" have entirely different histories.
defeb9b3b1 ... 332d992d05

3 changed files with 133 additions and 187 deletions
Show Stats Expand all files Collapse all files

1
connectors/discord/discord.go
View File

@ -170,7 +170,6 @@ func (d *Discord) convertUser(u *discordgo.User) *user.User {
ID: u.ID,
Name: u.Username,
Admin: false,
Icon: d.client.State.User.AvatarURL("64"),
IconImg: img,
}
}

281
plugins/meme/meme.go
View File

@ -16,6 +16,7 @@ import (
"time"
"github.com/fogleman/gg"
"github.com/google/uuid"
"github.com/nfnt/resize"
"github.com/rs/zerolog/log"
@ -44,23 +45,6 @@ type memeText struct {
Caps bool `json:"c"`
}
type specification struct {
ImageURL string
StampURL string
Configs []memeText
}
func (s specification) toJSON() string {
out, _ := json.Marshal(s)
return string(out)
}
func SpecFromJSON(input []byte) (specification, error) {
out := specification{}
err := json.Unmarshal(input, &out)
return out, err
}
var horizon = 24 * 7
type cachedImages map[string]*cachedImage
@ -112,13 +96,13 @@ func (p *MemePlugin) help(c bot.Connector, kind bot.Kind, message msg.Message, a
return true
}
func (p *MemePlugin) stamp(c bot.Connector, format, id string) string {
iconURL := ""
func (p *MemePlugin) bully(c bot.Connector, format, id string) (image.Image, string) {
bullyIcon := ""
for _, bully := range p.c.GetArray("meme.bully", []string{}) {
if format == bully {
if u, err := c.Profile(bully); err == nil {
iconURL = u.Icon
bullyIcon = u.Icon
} else {
log.Debug().Err(err).Msgf("could not get profile for %s", format)
}
@ -129,11 +113,22 @@ func (p *MemePlugin) stamp(c bot.Connector, format, id string) string {
}
}
if u, err := c.Profile(id); iconURL == "" && err == nil {
iconURL = u.Icon
if u, err := c.Profile(id); bullyIcon == "" && err == nil {
if u.IconImg != nil {
return u.IconImg, format
}
bullyIcon = u.Icon
}
return iconURL
u, err := url.Parse(bullyIcon)
if err != nil {
log.Error().Err(err).Msg("error with bully URL")
}
bullyImg, err := DownloadTemplate(u)
if err != nil {
log.Error().Err(err).Msg("error downloading bully icon")
}
return bullyImg, format
}
func (p *MemePlugin) sendMeme(c bot.Connector, channel, channelName, msgID string, from *user.User, text string) {
@ -148,103 +143,88 @@ func (p *MemePlugin) sendMeme(c bot.Connector, channel, channelName, msgID strin
log.Debug().Strs("parts", parts).Msgf("Meme:\n%+v", text)
var config []memeText
go func() {
var config []memeText
message = strings.TrimPrefix(message, "`")
message = strings.TrimSuffix(message, "`")
message = strings.TrimPrefix(message, "`")
message = strings.TrimSuffix(message, "`")
err := json.Unmarshal([]byte(message), &config)
if err == nil {
message = ""
for _, c := range config {
message += c.Text + "\n"
}
} else {
if strings.Contains(message, "||") {
parts = strings.Split(message, "||")
err := json.Unmarshal([]byte(message), &config)
if err == nil {
message = ""
for _, c := range config {
message += c.Text + "\n"
}
} else {
parts = strings.Split(message, "\n")
}
if strings.Contains(message, "||") {
parts = strings.Split(message, "||")
} else {
parts = strings.Split(message, "\n")
}
allConfigs := p.c.GetMap("meme.memeconfigs", map[string]string{})
configtxt, ok := allConfigs[format]
if !ok {
config = defaultFormatConfig()
log.Debug().Msgf("Did not find %s in %+v", format, allConfigs)
} else {
err = json.Unmarshal([]byte(configtxt), &config)
if err != nil {
log.Error().Err(err).Msgf("Could not parse config for %s:\n%s", format, configtxt)
allConfigs := p.c.GetMap("meme.memeconfigs", map[string]string{})
configtxt, ok := allConfigs[format]
if !ok {
config = defaultFormatConfig()
}
}
j := 0
for i := range config {
if len(parts) > i {
if parts[j] != "_" {
config[i].Text = parts[j]
log.Debug().Msgf("Did not find %s in %+v", format, allConfigs)
} else {
err = json.Unmarshal([]byte(configtxt), &config)
if err != nil {
log.Error().Err(err).Msgf("Could not parse config for %s:\n%s", format, configtxt)
config = defaultFormatConfig()
}
}
j := 0
for i := range config {
if len(parts) > i {
if parts[j] != "_" {
config[i].Text = parts[j]
}
j++
}
j++
}
}
}
formats := p.c.GetMap("meme.memes", defaultFormats)
imgURL, ok := formats[format]
if !ok {
imgURL = format
}
bullyImg, format := p.bully(c, format, from.ID)
stampURL := p.stamp(c, format, from.ID)
id, w, h, err := p.genMeme(format, bullyImg, config)
if err != nil {
msg := fmt.Sprintf("Hey %v, I couldn't download that image you asked for.", from.Name)
p.bot.Send(c, bot.Ephemeral, channel, from.ID, msg)
return
}
baseURL := p.c.Get("BaseURL", ``)
u, _ := url.Parse(baseURL)
u.Path = path.Join(u.Path, "meme", "img", id)
spec := specification{
ImageURL: imgURL,
StampURL: stampURL,
Configs: config,
}
log.Debug().Msgf("image is at %s", u.String())
_, err = p.bot.Send(c, bot.Message, channel, "", bot.ImageAttachment{
URL: u.String(),
AltTxt: fmt.Sprintf("%s: %s", from.Name, message),
Width: w,
Height: h,
})
encodedSpec, _ := json.Marshal(spec)
if err == nil && msgID != "" {
p.bot.Send(c, bot.Delete, channel, msgID)
}
w, h, err := p.checkMeme(imgURL)
if err != nil {
msg := fmt.Sprintf("Hey %v, I couldn't download that image you asked for.", from.Name)
p.bot.Send(c, bot.Ephemeral, channel, from.ID, msg)
return
}
baseURL := p.c.Get("BaseURL", ``)
u, _ := url.Parse(baseURL)
u.Path = path.Join(u.Path, "meme", "img")
q := u.Query()
q.Add("spec", string(encodedSpec))
u.RawQuery = q.Encode()
m := msg.Message{
User: &user.User{
ID: from.ID,
Name: from.Name,
Admin: false,
},
Channel: channel,
ChannelName: channelName,
Body: message,
Command: isCmd,
Time: time.Now(),
}
log.Debug().Msgf("image is at %s", u.String())
_, err = p.bot.Send(c, bot.Message, channel, "", bot.ImageAttachment{
URL: u.String(),
AltTxt: fmt.Sprintf("%s: %s", from.Name, message),
Width: w,
Height: h,
})
if err == nil && msgID != "" {
p.bot.Send(c, bot.Delete, channel, msgID)
}
m := msg.Message{
User: &user.User{
ID: from.ID,
Name: from.Name,
Admin: false,
},
Channel: channel,
ChannelName: channelName,
Body: message,
Command: isCmd,
Time: time.Now(),
}
p.bot.Receive(c, bot.Message, m)
p.bot.Receive(c, bot.Message, m)
}()
}
@ -294,13 +274,13 @@ func DownloadTemplate(u *url.URL) (image.Image, error) {
}
var defaultFormats = map[string]string{
"fry": "https://imgflip.com/s/meme/Futurama-Fry.jpg",
"aliens": "https://imgflip.com/s/meme/Ancient-Aliens.jpg",
"doge": "https://imgflip.com/s/meme/Doge.jpg",
"simply": "https://imgflip.com/s/meme/One-Does-Not-Simply.jpg",
"wonka": "https://imgflip.com/s/meme/Creepy-Condescending-Wonka.jpg",
"grumpy": "https://imgflip.com/s/meme/Grumpy-Cat.jpg",
"raptor": "https://imgflip.com/s/meme/Philosoraptor.jpg",
"fry": "Futurama-Fry.jpg",
"aliens": "Ancient-Aliens.jpg",
"doge": "Doge.jpg",
"simply": "One-Does-Not-Simply.jpg",
"wonka": "Creepy-Condescending-Wonka.jpg",
"grumpy": "Grumpy-Cat.jpg",
"raptor": "Philosoraptor.jpg",
}
func (p *MemePlugin) findFontSize(config []memeText, w, h int, sizes []float64) float64 {
@ -353,31 +333,23 @@ func defaultFormatConfigJSON() string {
return string(c)
}
func (p *MemePlugin) checkMeme(imgURL string) (int, int, error) {
u, err := url.Parse(imgURL)
if err != nil || u.Scheme == "" {
log.Debug().Err(err).Str("imgName", imgURL).Msgf("url not detected")
return 0, 0, fmt.Errorf("URL not valid (%s): %w", imgURL, err)
}
img, err := DownloadTemplate(u)
return img.Bounds().Dx(), img.Bounds().Dy(), err
}
func (p *MemePlugin) genMeme(spec specification) ([]byte, error) {
func (p *MemePlugin) genMeme(meme string, bully image.Image, config []memeText) (string, int, int, error) {
fontSizes := []float64{48, 36, 24, 16, 12}
formats := p.c.GetMap("meme.memes", defaultFormats)
jsonSpec := spec.toJSON()
if cached, ok := p.images[jsonSpec]; ok {
log.Debug().Msgf("Returning cached image for %s", jsonSpec)
return cached.repr, nil
path := uuid.New().String()
imgName, ok := formats[meme]
if !ok {
imgName = meme
}
u, err := url.Parse(spec.ImageURL)
u, err := url.Parse(imgName)
if err != nil || u.Scheme == "" {
log.Debug().Err(err).Str("imgName", spec.ImageURL).Msgf("url not detected")
return nil, fmt.Errorf("Error with meme URL: %w", err)
log.Debug().Err(err).Str("imgName", imgName).Msgf("url not detected")
if u, err = url.Parse("https://imgflip.com/s/meme/" + imgName); err != nil {
return "", 0, 0, err
}
}
log.Debug().Msgf("Attempting to download url: %s", u.String())
@ -385,13 +357,15 @@ func (p *MemePlugin) genMeme(spec specification) ([]byte, error) {
img, err := DownloadTemplate(u)
if err != nil {
log.Debug().Msgf("failed to download image: %s", err)
return nil, err
return "", 0, 0, err
}
r := img.Bounds()
w := r.Dx()
h := r.Dy()
// /meme2 5guys [{"x": 0.1, "y": 0.1, "t": "test"}]
maxSz := p.c.GetFloat64("maxImgSz", 750.0)
if w > h {
@ -411,24 +385,18 @@ func (p *MemePlugin) genMeme(spec specification) ([]byte, error) {
h = r.Dy()
log.Debug().Msgf("resized to %v, %v", w, h)
if spec.StampURL != "" {
img, err = p.applyStamp(img, spec.StampURL)
if err != nil {
log.Error().
Err(err).
Interface("spec", spec).
Msg("could not apply stamp")
}
if bully != nil {
img = p.applyBully(img, bully)
}
m := gg.NewContext(w, h)
m.DrawImage(img, 0, 0)
fontLocation := p.c.Get("meme.font", "impact.ttf")
m.LoadFontFace(fontLocation, p.findFontSize(spec.Configs, w, h, fontSizes))
m.LoadFontFace(fontLocation, p.findFontSize(config, w, h, fontSizes))
for i, c := range spec.Configs {
for i, c := range config {
if c.Caps {
spec.Configs[i].Text = strings.ToUpper(c.Text)
config[i].Text = strings.ToUpper(c.Text)
}
}
@ -441,7 +409,7 @@ func (p *MemePlugin) genMeme(spec specification) ([]byte, error) {
if dx*dx+dy*dy >= strokeSize*strokeSize {
continue
}
for _, c := range spec.Configs {
for _, c := range config {
x := float64(w)*c.XPerc + float64(dx)
y := float64(h)*c.YPerc + float64(dy)
m.DrawStringAnchored(c.Text, x, y, 0.5, 0.5)
@ -451,7 +419,7 @@ func (p *MemePlugin) genMeme(spec specification) ([]byte, error) {
// Apply white fill
m.SetHexColor("#FFF")
for _, c := range spec.Configs {
for _, c := range config {
x := float64(w) * c.XPerc
y := float64(h) * c.YPerc
m.DrawStringAnchored(c.Text, x, y, 0.5, 0.5)
@ -459,23 +427,18 @@ func (p *MemePlugin) genMeme(spec specification) ([]byte, error) {
i := bytes.Buffer{}
png.Encode(&i, m.Image())
p.images[jsonSpec] = &cachedImage{time.Now(), i.Bytes()}
p.images[path] = &cachedImage{time.Now(), i.Bytes()}
log.Debug().Msgf("Saved to %s\n", jsonSpec)
log.Debug().Msgf("Saved to %s\n", path)
return p.images[jsonSpec].repr, nil
return path, w, h, nil
}
func (p *MemePlugin) applyStamp(img image.Image, bullyURL string) (image.Image, error) {
u, _ := url.Parse(bullyURL)
bullyImg, err := DownloadTemplate(u)
if err != nil {
return nil, err
}
func (p *MemePlugin) applyBully(img, bullyImg image.Image) image.Image {
dst := image.NewRGBA(img.Bounds())
scaleFactor := p.c.GetFloat64("meme.stampScale", 0.1)
position := p.c.GetString("meme.stampPosition", "botright")
scaleFactor := p.c.GetFloat64("meme.bullyScale", 0.1)
position := p.c.GetString("meme.bullyPosition", "botright")
scaleFactor = float64(img.Bounds().Max.X) * scaleFactor / float64(bullyImg.Bounds().Max.X)
@ -501,7 +464,7 @@ func (p *MemePlugin) applyStamp(img image.Image, bullyURL string) (image.Image,
rect := image.Rect(pt.X, pt.Y, srcSz.X, srcSz.Y)
draw.DrawMask(dst, rect, bullyImg, image.Point{}, &circle{image.Point{w / 2, h / 2}, w / 2}, image.Point{}, draw.Over)
return dst, nil
return dst
}
// the following is ripped off of https://blog.golang.org/image-draw

38
plugins/meme/webHandlers.go
View File

@ -5,6 +5,7 @@ import (
"fmt"
"net/http"
"net/url"
"path"
"sort"
"github.com/rs/zerolog/log"
@ -50,9 +51,12 @@ func (p *MemePlugin) all(w http.ResponseWriter, r *http.Request) {
}
realURL, err := url.Parse(u)
if err != nil || realURL.Scheme == "" {
values = append(values, webResp{n, "404.png", config})
log.Error().Err(err).Msgf("invalid URL")
continue
realURL, err = url.Parse("https://imgflip.com/s/meme/" + u)
if err != nil {
values = append(values, webResp{n, "404.png", config})
log.Error().Err(err).Msgf("invalid URL")
continue
}
}
values = append(values, webResp{n, realURL.String(), config})
}
@ -133,31 +137,11 @@ func (p *MemePlugin) webRoot(w http.ResponseWriter, r *http.Request) {
}
func (p *MemePlugin) img(w http.ResponseWriter, r *http.Request) {
q := r.URL.Query()
spec := q.Get("spec")
if spec == "" {
log.Debug().Msgf("No spec found for img")
w.WriteHeader(404)
w.Write([]byte{})
return
}
s, err := SpecFromJSON([]byte(spec))
if err != nil {
w.WriteHeader(400)
w.Write([]byte(err.Error()))
return
}
img, err := p.genMeme(s)
if err == nil {
w.Write(img)
_, file := path.Split(r.URL.Path)
id := file
if img, ok := p.images[id]; ok {
w.Write(img.repr)
} else {
log.Error().
Err(err).
Interface("spec", s).
Msg("Unable to generate meme image")
w.WriteHeader(404)
w.Write([]byte("not found"))
}