plugins/meme/meme.go

@@ -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)

plugins/meme/web.go

@@ -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 })
-					axios.delete('/meme/rm', { data: this.editConfig })
+					.then(resp => {
-						.then(resp => {
+						this.editConfig = null;
-							this.editConfig = null;
+						this.refresh();
-							this.refresh();
+					})
-						})
+					.catch(err => this.err = err);
-						.catch(err => this.err = err);
-				}
 			}
         }
     })

plugins/meme/webHandlers.go

@@ -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)