bot/handlers.go

@@ -91,8 +91,8 @@ func (b *bot) Send(conn Connector, kind Kind, args ...any) (string, error) {
 	return conn.Send(kind, args...)
 }
 
-func (b *bot) GetEmojiList(force bool) map[string]string {
+func (b *bot) GetEmojiList() map[string]string {
-	return b.conn.GetEmojiList(force)
+	return b.conn.GetEmojiList()
 }
 
 // Checks to see if the user is asking for help, returns true if so and handles the situation.

bot/interfaces.go

@@ -129,7 +129,7 @@ type Bot interface {
 	CheckAdmin(string) bool
 
 	// GetEmojiList returns known emoji
-	GetEmojiList(bool) map[string]string
+	GetEmojiList() map[string]string
 
 	// RegisterFilter creates a filter function for message processing
 	RegisterFilter(string, func(string) string)
@@ -186,7 +186,7 @@ type Connector interface {
 	Send(Kind, ...any) (string, error)
 
 	// GetEmojiList returns a connector's known custom emoji
-	GetEmojiList(bool) map[string]string
+	GetEmojiList() map[string]string
 
 	// Serve starts a connector's connection routine
 	Serve() error
@@ -203,12 +203,6 @@ type Connector interface {
 	// Emojy translates emojy to/from services
 	Emojy(string) string
 
-	// UploadEmojy creates a new emojy on the server related to the file at path
-	UploadEmojy(emojy, path string) error
-
-	// DeleteEmojy removes the specified emojy from the server
-	DeleteEmojy(emojy string) error
-
 	// GetChannelName returns the human-friendly name for an ID (if possible)
 	GetChannelName(id string) string
 

bot/mock.go

@@ -103,9 +103,7 @@ func (mb *MockBot) edit(c Connector, channel, newMessage, identifier string) (st
 	return "", nil
 }
 
-func (mb *MockBot) GetEmojiList(bool) map[string]string            { return make(map[string]string) }
+func (mb *MockBot) GetEmojiList() map[string]string                { return make(map[string]string) }
-func (mb *MockBot) DeleteEmojy(name string) error                  { return nil }
-func (mb *MockBot) UploadEmojy(emojy, path string) error           { return nil }
 func (mb *MockBot) RegisterFilter(s string, f func(string) string) {}
 
 func NewMockBot() *MockBot {

connectors/discord/discord.go

@@ -134,8 +134,8 @@ func (d *Discord) sendMessage(channel, message string, meMessage bool, args ...a
 	return st.ID, err
 }
 
-func (d *Discord) GetEmojiList(force bool) map[string]string {
+func (d *Discord) GetEmojiList() map[string]string {
-	if d.emojiCache != nil && !force {
+	if d.emojiCache != nil {
 		return d.emojiCache
 	}
 	guildID := d.config.Get("discord.guildid", "")
@@ -155,16 +155,6 @@ func (d *Discord) GetEmojiList(force bool) map[string]string {
 	return emojis
 }
 
-func (d *Discord) GetEmojySnowflake(name string) string {
-	list := d.GetEmojiList(true)
-	for k, v := range list {
-		if name == v {
-			return k
-		}
-	}
-	return name
-}
-
 // Who gets the users in the guild
 // Note that the channel ID does not matter in this particular case
 func (d *Discord) Who(id string) []string {
@@ -308,22 +298,6 @@ func (d *Discord) Emojy(name string) string {
 	return name
 }
 
-func (d *Discord) UploadEmojy(emojy, path string) error {
-	guildID := d.config.Get("discord.guildid", "")
-	defaultRoles := d.config.GetArray("discord.emojyRoles", []string{})
-	_, err := d.client.GuildEmojiCreate(guildID, emojy, path, defaultRoles)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (d *Discord) DeleteEmojy(emojy string) error {
-	guildID := d.config.Get("discord.guildid", "")
-	emojyID := d.GetEmojySnowflake(emojy)
-	return d.client.GuildEmojiDelete(guildID, emojyID)
-}
-
 func (d *Discord) URLFormat(title, url string) string {
 	return fmt.Sprintf("%s (%s)", title, url)
 }

connectors/irc/irc.go

@@ -129,7 +129,7 @@ func (i *Irc) sendAction(channel, message string, args ...any) (string, error) {
 	return i.sendMessage(channel, message, args...)
 }
 
-func (i *Irc) GetEmojiList(force bool) map[string]string {
+func (i *Irc) GetEmojiList() map[string]string {
 	//we're not going to do anything because it's IRC
 	return make(map[string]string)
 }
@@ -334,14 +334,6 @@ func (i Irc) Emojy(name string) string {
 	return name
 }
 
-func (i Irc) UploadEmojy(emojy, path string) error {
-	return fmt.Errorf("unimplemented")
-}
-
-func (d Irc) DeleteEmojy(emojy string) error {
-	return fmt.Errorf("unimplemented")
-}
-
 // GetChannelName returns the channel ID for a human-friendly name (if possible)
 func (i Irc) GetChannelID(name string) string {
 	return name

connectors/slackapp/slackApp.go

@@ -396,10 +396,7 @@ func (s *SlackApp) edit(channel, newMessage, identifier string) (string, error)
 	return ts, err
 }
 
-func (s *SlackApp) GetEmojiList(force bool) map[string]string {
+func (s *SlackApp) GetEmojiList() map[string]string {
-	if force {
-		s.populateEmojiList()
-	}
 	return s.emoji
 }
 
@@ -730,14 +727,6 @@ func (s *SlackApp) Emojy(name string) string {
 	return name
 }
 
-func (s *SlackApp) UploadEmojy(emojy, path string) error {
-	return fmt.Errorf("unimplemented")
-}
-
-func (s *SlackApp) DeleteEmojy(emojy string) error {
-	return fmt.Errorf("unimplemented")
-}
-
 func (s *SlackApp) URLFormat(title, url string) string {
 	return fmt.Sprintf("<%s|%s>", url, title)
 }

go.mod

@@ -12,7 +12,6 @@ require (
 	github.com/chrissexton/sentiment v0.0.0-20190927141846-d69c422ba035
 	github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90
 	github.com/forPelevin/gomoji v1.1.4
-	github.com/gabriel-vasile/mimetype v1.4.0
 	github.com/go-chi/chi/v5 v5.0.7
 	github.com/gocolly/colly v1.2.0
 	github.com/google/uuid v1.3.0

go.sum

@@ -48,8 +48,6 @@ github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90 h1:WXb3TSNmHp2vHoCro
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/forPelevin/gomoji v1.1.4 h1:mlxsZQgTO7v1qnpUUoS8kk0Lf/rEvxZYgYxuVUX7edg=
 github.com/forPelevin/gomoji v1.1.4/go.mod h1:ypB7Kz3Fsp+LVR7KoT7mEFOioYBuTuAtaAT4RGl+ASY=
-github.com/gabriel-vasile/mimetype v1.4.0 h1:Cn9dkdYsMIu56tGho+fqzh7XmvY2YyGU0FnbhiOsEro=
-github.com/gabriel-vasile/mimetype v1.4.0/go.mod h1:fA8fi6KUiG7MgQQ+mEWotXoEOvmxRtOJlERCzSmRvr8=
 github.com/garyburd/go-oauth v0.0.0-20180319155456-bca2e7f09a17 h1:GOfMz6cRgTJ9jWV0qAezv642OhPnKEG7gtUjJSdStHE=
 github.com/garyburd/go-oauth v0.0.0-20180319155456-bca2e7f09a17/go.mod h1:HfkOCN6fkKKaPSAeNq/er3xObxTW4VLeY6UUK895gLQ=
 github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
@@ -199,7 +197,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/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-20210505024714-0287a6fb4125/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4 h1:DZshvxDdVoeKIbudAdFEKi+f70l51luSy/7b76ibTY0=

plugins/cli/cli.go

@@ -122,15 +122,13 @@ func (p *CliPlugin) Send(kind bot.Kind, args ...any) (string, error) {
 	p.counter++
 	return id, nil
 }
-func (p *CliPlugin) GetEmojiList(bool) map[string]string { return nil }
+func (p *CliPlugin) GetEmojiList() map[string]string { return nil }
 func (p *CliPlugin) Serve() error                    { return nil }
 func (p *CliPlugin) Who(s string) []string           { return nil }
 func (p *CliPlugin) Profile(name string) (user.User, error) {
 	return user.User{}, fmt.Errorf("unimplemented")
 }
 func (p *CliPlugin) Emojy(name string) string { return name }
-func (p *CliPlugin) DeleteEmojy(name string) error        { return nil }
-func (p *CliPlugin) UploadEmojy(emojy, path string) error { return nil }
 func (p *CliPlugin) URLFormat(title, url string) string {
 	return fmt.Sprintf("%s (%s)", title, url)
 }

plugins/emojifyme/emojifyme.go

@@ -63,7 +63,7 @@ func (p *EmojifyMePlugin) message(r bot.Request) bool {
 	message := r.Msg
 	if !p.GotBotEmoji {
 		p.GotBotEmoji = true
-		emojiMap := p.Bot.GetEmojiList(false)
+		emojiMap := p.Bot.GetEmojiList()
 		for e := range emojiMap {
 			p.Emoji[e] = e
 		}

plugins/emojy/emojy.go

@@ -1,24 +1,16 @@
 package emojy
 
 import (
-	"bytes"
-	"encoding/base64"
-	"fmt"
-	"github.com/fogleman/gg"
-	"github.com/gabriel-vasile/mimetype"
-	"math"
-	"os"
-	"path"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"time"
-
 	"github.com/forPelevin/gomoji"
 	"github.com/jmoiron/sqlx"
 	"github.com/rs/zerolog/log"
 	"github.com/velour/catbase/bot"
 	"github.com/velour/catbase/config"
+	"os"
+	"path"
+	"regexp"
+	"strings"
+	"time"
 )
 
 type EmojyPlugin struct {
@@ -27,8 +19,6 @@ type EmojyPlugin struct {
 	db *sqlx.DB
 }
 
-const maxLen = 32
-
 func New(b bot.Bot) *EmojyPlugin {
 	log.Debug().Msgf("emojy.New")
 	p := &EmojyPlugin{
@@ -74,71 +64,10 @@ func (p *EmojyPlugin) register() {
 				return false
 			},
 		},
-		{
-			Kind: bot.Message, IsCmd: true,
-			Regex: regexp.MustCompile(`(?i)^swapemojy (?P<old>.+) (?P<new>.+)$`),
-			Handler: func(r bot.Request) bool {
-				old := sanitizeName(r.Values["old"])
-				new := sanitizeName(r.Values["new"])
-				p.rmEmojy(r, old)
-				p.addEmojy(r, new)
-				return true
-			},
-		},
-		{
-			Kind: bot.Message, IsCmd: true,
-			Regex: regexp.MustCompile(`(?i)^addemojy (?P<name>.+)$`),
-			Handler: func(r bot.Request) bool {
-				name := sanitizeName(r.Values["name"])
-				return p.addEmojy(r, name)
-			},
-		},
-		{
-			Kind: bot.Message, IsCmd: true,
-			Regex: regexp.MustCompile(`(?i)^rmemojy (?P<name>.+)$`),
-			Handler: func(r bot.Request) bool {
-				name := sanitizeName(r.Values["name"])
-				return p.rmEmojy(r, name)
-			},
-		},
 	}
 	p.b.RegisterTable(p, ht)
 }
 
-func (p *EmojyPlugin) rmEmojy(r bot.Request, name string) bool {
-	onServerList := invertEmojyList(p.b.GetEmojiList(false))
-	if _, ok := onServerList[name]; !ok {
-		p.b.Send(r.Conn, bot.Message, r.Msg.Channel, "Emoji does not exist")
-		return true
-	}
-	if err := r.Conn.DeleteEmojy(name); err != nil {
-		p.b.Send(r.Conn, bot.Message, r.Msg.Channel, "error "+err.Error())
-		return true
-	}
-	p.b.Send(r.Conn, bot.Message, r.Msg.Channel, "removed emojy "+name)
-	return true
-}
-
-func (p *EmojyPlugin) addEmojy(r bot.Request, name string) bool {
-	onServerList := invertEmojyList(p.b.GetEmojiList(false))
-	if _, ok := onServerList[name]; ok {
-		p.b.Send(r.Conn, bot.Message, r.Msg.Channel, "Emoji already exists")
-		return true
-	}
-	if err := p.uploadEmojy(r.Conn, name); err != nil {
-		p.b.Send(r.Conn, bot.Message, r.Msg.Channel, fmt.Sprintf("error adding emojy: %v", err))
-		return true
-	}
-	list := r.Conn.GetEmojiList(true)
-	for k, v := range list {
-		if v == name {
-			p.b.Send(r.Conn, bot.Message, r.Msg.Channel, fmt.Sprintf("added emojy: %s <:%s:%s>", name, name, k))
-			break
-		}
-	}
-	return true
-}
-
 func (p *EmojyPlugin) recordReaction(emojy string) error {
 	q := `insert into emojyLog (emojy, observed) values (?, ?)`
 	_, err := p.db.Exec(q, emojy, time.Now())
@@ -171,7 +100,7 @@ func invertEmojyList(emojy map[string]string) map[string]string {
 
 func (p *EmojyPlugin) allCounts() (map[string][]EmojyCount, error) {
 	out := map[string][]EmojyCount{}
-	onServerList := invertEmojyList(p.b.GetEmojiList(true))
+	onServerList := invertEmojyList(p.b.DefaultConnector().GetEmojiList())
 	q := `select emojy, count(observed) as count from emojyLog group by emojy order by count desc`
 	result := []EmojyCount{}
 	err := p.db.Select(&result, q)
@@ -182,8 +111,8 @@ func (p *EmojyPlugin) allCounts() (map[string][]EmojyCount, error) {
 		_, e.OnServer = onServerList[e.Emojy]
 		if isEmoji(e.Emojy) {
 			out["emoji"] = append(out["emoji"], e)
-		} else if ok, _, eURL, _ := p.isKnownEmojy(e.Emojy); ok {
+		} else if ok, fname, _ := p.isKnownEmojy(e.Emojy); ok {
-			e.URL = eURL
+			e.URL = fname
 			out["emojy"] = append(out["emojy"], e)
 		} else {
 			out["unknown"] = append(out["unknown"], e)
@@ -192,74 +121,25 @@ func (p *EmojyPlugin) allCounts() (map[string][]EmojyCount, error) {
 	return out, nil
 }
 
-func (p *EmojyPlugin) allFiles() (map[string]string, map[string]string, error) {
+func (p *EmojyPlugin) isKnownEmojy(name string) (bool, string, error) {
-	files := map[string]string{}
-	urls := map[string]string{}
 	emojyPath := p.c.Get("emojy.path", "emojy")
 	baseURL := p.c.Get("emojy.baseURL", "/emojy/file")
 	entries, err := os.ReadDir(emojyPath)
 	if err != nil {
-		return nil, nil, err
+		return false, "", err
 	}
 	for _, e := range entries {
-		if !e.IsDir() {
+		if !e.IsDir() &&
-			baseName := strings.TrimSuffix(e.Name(), filepath.Ext(e.Name()))
+			(strings.HasPrefix(e.Name(), name) ||
+				strings.HasPrefix(e.Name(), strings.Replace(name, "-", "_", -1)) ||
+				strings.HasPrefix(e.Name(), strings.Trim(name, "-_"))) {
 			url := path.Join(baseURL, e.Name())
-			files[baseName] = path.Join(emojyPath, e.Name())
+			return true, url, nil
-			urls[baseName] = url
 		}
 	}
-	return files, urls, nil
+	return false, "", nil
-}
-
-func (p *EmojyPlugin) isKnownEmojy(name string) (bool, string, string, error) {
-	allFiles, allURLs, err := p.allFiles()
-	if err != nil {
-		return false, "", "", err
-	}
-	if _, ok := allURLs[name]; !ok {
-		return false, "", "", nil
-	}
-	return true, allFiles[name], allURLs[name], nil
 }
 
 func isEmoji(in string) bool {
 	return gomoji.ContainsEmoji(in)
 }
-
-func (p *EmojyPlugin) uploadEmojy(c bot.Connector, name string) error {
-	maxEmojySz := p.c.GetFloat64("emoji.maxsize", 128.0)
-	ok, fname, _, err := p.isKnownEmojy(name)
-	if !ok || err != nil {
-		u := p.c.Get("baseurl", "")
-		u = u + "/emojy"
-		return fmt.Errorf("error getting emojy, the known emojy list can be found at: %s", u)
-	}
-	i, err := gg.LoadImage(fname)
-	if err != nil {
-		return err
-	}
-	ctx := gg.NewContextForImage(i)
-	max := math.Max(float64(ctx.Width()), float64(ctx.Height()))
-	ctx.Scale(maxEmojySz/max, maxEmojySz/max)
-	w := bytes.NewBuffer([]byte{})
-	err = ctx.EncodePNG(w)
-	if err != nil {
-		return err
-	}
-	mtype := mimetype.Detect(w.Bytes())
-	base64Img := "data:" + mtype.String() + ";base64," + base64.StdEncoding.EncodeToString(w.Bytes())
-	if err := c.UploadEmojy(name, base64Img); err != nil {
-		return err
-	}
-	return nil
-}
-
-func sanitizeName(name string) string {
-	name = strings.ReplaceAll(name, "-", "_")
-	nameLen := len(name)
-	if nameLen > maxLen {
-		nameLen = maxLen
-	}
-	return name[:nameLen]
-}

plugins/emojy/index.html

@@ -2,8 +2,8 @@
 <html lang="en">
 <head>
     <!-- Load required Bootstrap and BootstrapVue CSS -->
-    <link type="text/css" rel="stylesheet" href="//unpkg.com/bootstrap/dist/css/bootstrap.min.css"/>
+    <link type="text/css" rel="stylesheet" href="//unpkg.com/bootstrap/dist/css/bootstrap.min.css" />
-    <link type="text/css" rel="stylesheet" href="//unpkg.com/bootstrap-vue@^2/dist/bootstrap-vue.min.css"/>
+    <link type="text/css" rel="stylesheet" href="//unpkg.com/bootstrap-vue@^2/dist/bootstrap-vue.min.css" />
 
     <!-- Load polyfills to support older browsers -->
     <script src="//polyfill.io/v3/polyfill.min.js?features=es2015%2CMutationObserver"></script>
@@ -22,39 +22,18 @@
     <b-navbar>
         <b-navbar-brand>Emojys</b-navbar-brand>
         <b-navbar-nav>
-            <b-nav-item v-for="item in nav" :href="item.url" :active="item.name === 'Meme'" :key="item.key">{{ item.name
+            <b-nav-item v-for="item in nav" :href="item.url" :active="item.name === 'Meme'" :key="item.key">{{ item.name }}</b-nav-item>
-                }}
-            </b-nav-item>
         </b-navbar-nav>
     </b-navbar>
-
+    <b-alert
-    <b-navbar>
+            dismissable
-        <b-navbar-nav>
-            <b-nav-item :active="view == 'stats'" @click="view = 'stats'">Stats</b-nav-item>
-            <b-nav-item :active="view == 'list'" @click="view = 'list'">List</b-nav-item>
-            <b-nav-item :active="view == 'upload'" @click="view = 'upload'">Upload</b-nav-item>
-        </b-navbar-nav>
-    </b-navbar>
-
-    <div
-            style="background-color:red;"
             variant="error"
-            v-if="err != ''"
+            :show="err != ''"
-            @click="err = ''">
+            @dismissed="err = ''">
         {{ err }}
-    </div>
+    </b-alert>
 
-    <div class="container" v-if="view == 'upload'">
+    <ul>
-        <label>Passphrase</label>
-        <b-input v-model="password"></b-input>
-        <label>File
-            <input type="file" @change="handleFileUpload( $event )"/>
-        </label>
-        <br>
-        <button @click="submitFile()">Submit</button>
-    </div>
-
-    <ul v-if="view == 'stats'">
         <li v-for="(category, name) in results" key="name">
             {{name}}:
             <ul>
@@ -65,20 +44,12 @@
                         <span v-else>❎</span>
                         -
                     </span>
-                    <img v-if="emojy.url" :src="emojy.url" :alt="emojy.name" class="img-thumbnail"
+                    <img v-if="emojy.url" :src="emojy.url" :alt="emojy.name" class="img-thumbnail" style="max-width: 64px; max-height: 64px" />
-                         style="max-width: 64px; max-height: 64px"/>
                     <span v-else>{{emojy.emojy}}</span>
                 </li>
             </ul>
         </li>
     </ul>
-
-    <ul v-if="view == 'list'">
-        <li v-for="(path, name) in fileList" key="name">
-            {{name}}:
-            <img :src="path" :alt="name" class="img-thumbnail" style="max-width: 64px; max-height: 64px"/>
-        </li>
-    </ul>
 </div>
 
 <script>
@@ -89,21 +60,10 @@
     var app = new Vue({
         el: '#app',
         router,
-        data: function () {
+        data: {
-            return {
             err: '',
-                view: '',
             nav: [],
             results: [],
-                fileList: {},
-                image: null,
-                password: ''
-            }
-        },
-        watch: {
-            view(newView, oldView) {
-                this.err = '';
-            }
         },
         mounted() {
             axios.get('/nav')
@@ -121,35 +81,6 @@
                         this.err = ''
                     })
                     .catch(err => (this.err = err))
-                axios.get('/emojy/allFiles')
-                    .then(resp => {
-                        this.fileList = resp.data
-                        this.err = ''
-                    })
-                    .catch(err => (this.err = err))
-            },
-            handleFileUpload(evt) {
-                this.file = evt.target.files[0];
-                console.log("added file data: " + this.file);
-            },
-            submitFile() {
-                let formData = new FormData();
-                formData.append('file', this.file);
-                formData.append('password', this.password)
-                console.log('trying to make/save form data: ' + formData)
-                axios.post('/emojy/upload',
-                    formData,
-                    {
-                        headers: {'Content-Type': 'multipart/form-data'}
-                    })
-                    .then(() => {
-                        console.log('SUCCESS!!');
-                        this.view = 'list';
-                    })
-                    .catch(e => {
-                        console.log('FAILURE!!' + e);
-                        this.err = 'Could not upload file.';
-                    });
             }
         }
     })

plugins/emojy/web.go

@@ -3,16 +3,11 @@ package emojy
 import (
 	"embed"
 	"encoding/json"
-	"fmt"
 	"github.com/go-chi/chi/v5"
 	"github.com/rs/zerolog/log"
-	"io"
 	"io/ioutil"
 	"net/http"
-	"os"
 	"path"
-	"path/filepath"
-	"strings"
 )
 
 //go:embed *.html
@@ -21,8 +16,6 @@ var embeddedFS embed.FS
 func (p *EmojyPlugin) registerWeb() {
 	r := chi.NewRouter()
 	r.HandleFunc("/all", p.handleAll)
-	r.HandleFunc("/allFiles", p.handleAllFiles)
-	r.HandleFunc("/upload", p.handleUpload)
 	r.HandleFunc("/file/{name}", p.handleEmojy)
 	r.HandleFunc("/", p.handleIndex)
 	p.b.RegisterWebName(r, "/emojy", "Emojys")
@@ -45,90 +38,6 @@ func (p *EmojyPlugin) handleAll(w http.ResponseWriter, r *http.Request) {
 	w.Write(out)
 }
 
-func (p *EmojyPlugin) handleAllFiles(w http.ResponseWriter, r *http.Request) {
-	_, urlMap, err := p.allFiles()
-	if err != nil {
-		w.WriteHeader(500)
-		out, _ := json.Marshal(struct{ err error }{err})
-		w.Write(out)
-		return
-	}
-	enc := json.NewEncoder(w)
-	err = enc.Encode(urlMap)
-	if err != nil {
-		w.WriteHeader(500)
-		out, _ := json.Marshal(struct{ err error }{err})
-		w.Write(out)
-	}
-}
-
-func (p *EmojyPlugin) handleUpload(w http.ResponseWriter, r *http.Request) {
-	enc := json.NewEncoder(w)
-	newFilePath, err := p.FileSave(r)
-	if err != nil {
-		log.Error().Err(err).Msgf("could not upload file")
-		w.WriteHeader(500)
-		enc.Encode(struct{ err error }{fmt.Errorf("file not saved: %s", err)})
-		return
-	}
-	log.Debug().Msgf("uploaded file to %s", newFilePath)
-	w.WriteHeader(200)
-	enc.Encode(struct{ file string }{newFilePath})
-
-}
-
-func (p *EmojyPlugin) FileSave(r *http.Request) (string, error) {
-	if err := r.ParseMultipartForm(32 << 20); err != nil {
-		if err != http.ErrNotMultipart {
-			return "", err
-		}
-		if err := r.ParseForm(); err != nil {
-			return "", err
-		}
-	}
-	if r.MultipartForm == nil || len(r.MultipartForm.File) == 0 {
-		return "", fmt.Errorf("no files")
-	}
-
-	password := r.Form.Get("password")
-	if password != p.b.GetPassword() {
-		return "", fmt.Errorf("incorrect password")
-	}
-
-	for _, fileHeaders := range r.MultipartForm.File {
-		for _, fileHeader := range fileHeaders {
-			body, err := fileHeader.Open()
-			if err != nil {
-				return "", fmt.Errorf("error opening part %q: %s", fileHeader.Filename, err)
-			}
-			emojyFileName := fileHeader.Filename
-			emojyName := strings.TrimSuffix(emojyFileName, filepath.Ext(emojyFileName))
-			if ok, _, _, _ := p.isKnownEmojy(emojyName); ok {
-				return "", fmt.Errorf("emojy already exists")
-			}
-			emojyPath := p.c.Get("emojy.path", "emojy")
-			contentType := fileHeader.Header.Get("Content-Type")
-			if !strings.HasPrefix(contentType, "image") {
-				return "", fmt.Errorf("incorrect mime type - given: %s", contentType)
-			}
-			fullPath := filepath.Clean(filepath.Join(emojyPath, emojyFileName))
-			_ = os.MkdirAll(emojyPath, os.ModePerm)
-			log.Debug().Msgf("trying to create/open file: %s", fullPath)
-			file, err := os.OpenFile(fullPath, os.O_WRONLY|os.O_CREATE, os.ModePerm)
-			if err != nil {
-				return "", err
-			}
-			defer file.Close()
-			_, err = io.Copy(file, body)
-			if err != nil {
-				return "", err
-			}
-			return emojyFileName, nil
-		}
-	}
-	return "", fmt.Errorf("did not find file")
-}
-
 func (p *EmojyPlugin) handleEmojy(w http.ResponseWriter, r *http.Request) {
 	fname := chi.URLParam(r, "name")
 	emojyPath := p.c.Get("emojy.path", "emojy")