mirror of https://github.com/velour/catbase.git
Compare commits
No commits in common. "ba47710b4620532dcf2880ac08dd4e17d1d29dc9" and "1acb78bb5acccb80bf7d4e3628a84abf8772cf01" have entirely different histories.
ba47710b46
...
1acb78bb5a
|
@ -41,7 +41,7 @@ type cachedImage struct {
|
|||
type memeText struct {
|
||||
XPerc float64 `json:"x"`
|
||||
YPerc float64 `json:"y"`
|
||||
Text string `json:"t",omitempty`
|
||||
Text string `json:"t"`
|
||||
Caps bool `json:"c"`
|
||||
}
|
||||
|
||||
|
@ -335,11 +335,6 @@ func defaultFormatConfig() []memeText {
|
|||
}
|
||||
}
|
||||
|
||||
func defaultFormatConfigJSON() string {
|
||||
c, _ := json.Marshal(defaultFormatConfig())
|
||||
return string(c)
|
||||
}
|
||||
|
||||
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)
|
||||
|
|
|
@ -200,14 +200,12 @@ var memeIndex = `
|
|||
evt.preventDefault();
|
||||
evt.stopPropagation();
|
||||
}
|
||||
if (confirm("Are you sure you want to delete this meme?")) {
|
||||
axios.delete('/meme/rm', { data: this.editConfig })
|
||||
.then(resp => {
|
||||
this.editConfig = null;
|
||||
this.refresh();
|
||||
})
|
||||
.catch(err => this.err = err);
|
||||
}
|
||||
axios.delete('/meme/rm', { data: this.editConfig })
|
||||
.then(resp => {
|
||||
this.editConfig = null;
|
||||
this.refresh();
|
||||
})
|
||||
.catch(err => this.err = err);
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
@ -122,10 +122,6 @@ func (p *MemePlugin) addMeme(w http.ResponseWriter, r *http.Request) {
|
|||
formats[values.Name] = values.URL
|
||||
err = p.c.SetMap("meme.memes", formats)
|
||||
checkError(err)
|
||||
|
||||
if values.Config == "" {
|
||||
values.Config = defaultFormatConfigJSON()
|
||||
}
|
||||
configs := p.c.GetMap("meme.memeconfigs", map[string]string{})
|
||||
configs[values.Name] = values.Config
|
||||
err = p.c.SetMap("meme.memeconfigs", configs)
|
||||
|
|
Loading…
Reference in New Issue