mirror of https://github.com/velour/catbase.git
Compare commits
No commits in common. "22658949a87105db14d066b89c9025622420132d" and "1d30a252770b6d00a303df01c9153cd454d958dd" have entirely different histories.
22658949a8
...
1d30a25277
|
|
@ -118,11 +118,7 @@ func New(config *config.Config, connector Connector) Bot {
|
|||
|
||||
log.Debug().Msgf("created web router")
|
||||
|
||||
// Make the http logger optional
|
||||
// It has never served a purpose in production and with the emojy page, can make a rather noisy log
|
||||
if bot.Config().GetInt("bot.useLogger", 0) == 1 {
|
||||
bot.router.Use(middleware.Logger)
|
||||
}
|
||||
bot.router.Use(middleware.StripSlashes)
|
||||
|
||||
bot.router.HandleFunc("/", bot.serveRoot)
|
||||
|
|
|
|||
|
|
@ -12,19 +12,12 @@ import (
|
|||
type Cowboy struct {
|
||||
b bot.Bot
|
||||
c *config.Config
|
||||
|
||||
emojyPath string
|
||||
baseEmojyURL string
|
||||
}
|
||||
|
||||
func New(b bot.Bot) *Cowboy {
|
||||
emojyPath := b.Config().Get("emojy.path", "emojy")
|
||||
baseURL := b.Config().Get("emojy.baseURL", "/emojy/file")
|
||||
c := Cowboy{
|
||||
b: b,
|
||||
c: b.Config(),
|
||||
emojyPath: emojyPath,
|
||||
baseEmojyURL: baseURL,
|
||||
}
|
||||
c.register()
|
||||
c.registerWeb()
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import (
|
|||
"image"
|
||||
"image/draw"
|
||||
"image/png"
|
||||
"math"
|
||||
"os"
|
||||
"path"
|
||||
|
||||
|
|
@ -15,8 +14,8 @@ import (
|
|||
"github.com/velour/catbase/plugins/emojy"
|
||||
)
|
||||
|
||||
func getEmojy(emojyPath, baseEmojyURL, name string) (image.Image, error) {
|
||||
files, _, err := emojy.AllFiles(emojyPath, baseEmojyURL)
|
||||
func getEmojy(c *config.Config, name string) (image.Image, error) {
|
||||
files, _, err := emojy.AllFiles(c)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
@ -35,7 +34,8 @@ func getEmojy(emojyPath, baseEmojyURL, name string) (image.Image, error) {
|
|||
return img, nil
|
||||
}
|
||||
|
||||
func getCowboyHat(c *config.Config, emojyPath string) (image.Image, error) {
|
||||
func getCowboyHat(c *config.Config) (image.Image, error) {
|
||||
emojyPath := c.Get("emojy.path", "emojy")
|
||||
p := path.Join(emojyPath, c.Get("cowboy.hatname", "hat.png"))
|
||||
p = path.Clean(p)
|
||||
f, err := os.Open(p)
|
||||
|
|
@ -49,28 +49,28 @@ func getCowboyHat(c *config.Config, emojyPath string) (image.Image, error) {
|
|||
return img, nil
|
||||
}
|
||||
|
||||
func cowboyifyImage(c *config.Config, emojyPath string, input image.Image) (image.Image, error) {
|
||||
hat, err := getCowboyHat(c, emojyPath)
|
||||
func cowboyifyImage(c *config.Config, input image.Image) (image.Image, error) {
|
||||
hat, err := getCowboyHat(c)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
inputW, inputH := float64(input.Bounds().Max.X), float64(input.Bounds().Max.Y)
|
||||
targetW := uint(c.GetInt("cowboy.targetw", 64))
|
||||
hatW, hatH := float64(hat.Bounds().Max.X), float64(hat.Bounds().Max.Y)
|
||||
targetSZ := math.Max(inputW, inputH)
|
||||
dst := image.NewRGBA(image.Rect(0, 0, int(targetSZ), int(targetSZ)))
|
||||
newH := uint(targetSZ / hatW * hatH)
|
||||
hat = resize.Resize(uint(targetSZ), newH, hat, resize.Lanczos3)
|
||||
newH := uint(float64(targetW) / hatW * hatH)
|
||||
hat = resize.Resize(targetW, newH, hat, resize.MitchellNetravali)
|
||||
input = resize.Resize(targetW, targetW, input, resize.MitchellNetravali)
|
||||
dst := image.NewRGBA(image.Rect(0, 0, 64, 64))
|
||||
draw.Draw(dst, input.Bounds(), input, image.Point{}, draw.Src)
|
||||
draw.Draw(dst, hat.Bounds(), hat, image.Point{}, draw.Over)
|
||||
return dst, nil
|
||||
}
|
||||
|
||||
func cowboy(c *config.Config, emojyPath, baseEmojyURL, name string) ([]byte, error) {
|
||||
emojy, err := getEmojy(emojyPath, baseEmojyURL, name)
|
||||
func cowboy(c *config.Config, name string) ([]byte, error) {
|
||||
emojy, err := getEmojy(c, name)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
img, err := cowboyifyImage(c, emojyPath, emojy)
|
||||
img, err := cowboyifyImage(c, emojy)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ func (p *Cowboy) registerWeb() {
|
|||
|
||||
func (p *Cowboy) handleImage(w http.ResponseWriter, r *http.Request) {
|
||||
what := chi.URLParam(r, "what")
|
||||
img, err := cowboy(p.c, p.emojyPath, p.baseEmojyURL, what)
|
||||
img, err := cowboy(p.c, what)
|
||||
if err != nil {
|
||||
w.WriteHeader(500)
|
||||
fmt.Fprintf(w, "Error: %s", err)
|
||||
|
|
|
|||
|
|
@ -26,23 +26,16 @@ type EmojyPlugin struct {
|
|||
b bot.Bot
|
||||
c *config.Config
|
||||
db *sqlx.DB
|
||||
|
||||
emojyPath string
|
||||
baseURL string
|
||||
}
|
||||
|
||||
const maxLen = 32
|
||||
|
||||
func New(b bot.Bot) *EmojyPlugin {
|
||||
log.Debug().Msgf("emojy.New")
|
||||
emojyPath := b.Config().Get("emojy.path", "emojy")
|
||||
baseURL := b.Config().Get("emojy.baseURL", "/emojy/file")
|
||||
p := &EmojyPlugin{
|
||||
b: b,
|
||||
c: b.Config(),
|
||||
db: b.DB(),
|
||||
emojyPath: emojyPath,
|
||||
baseURL: baseURL,
|
||||
}
|
||||
p.setupDB()
|
||||
p.register()
|
||||
|
|
@ -200,9 +193,11 @@ func (p *EmojyPlugin) allCounts() (map[string][]EmojyCount, error) {
|
|||
return out, nil
|
||||
}
|
||||
|
||||
func AllFiles(emojyPath, baseURL string) (map[string]string, map[string]string, error) {
|
||||
func AllFiles(c *config.Config) (map[string]string, map[string]string, error) {
|
||||
files := map[string]string{}
|
||||
urls := map[string]string{}
|
||||
emojyPath := c.Get("emojy.path", "emojy")
|
||||
baseURL := c.Get("emojy.baseURL", "/emojy/file")
|
||||
entries, err := os.ReadDir(emojyPath)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
|
|
@ -219,7 +214,7 @@ func AllFiles(emojyPath, baseURL string) (map[string]string, map[string]string,
|
|||
}
|
||||
|
||||
func (p *EmojyPlugin) isKnownEmojy(name string) (bool, string, string, error) {
|
||||
allFiles, allURLs, err := AllFiles(p.emojyPath, p.baseURL)
|
||||
allFiles, allURLs, err := AllFiles(p.c)
|
||||
if err != nil {
|
||||
return false, "", "", err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,8 @@
|
|||
<!-- Load Vue followed by BootstrapVue -->
|
||||
<script src="//unpkg.com/vue@^2/dist/vue.min.js"></script>
|
||||
<script src="//unpkg.com/bootstrap-vue@^2/dist/bootstrap-vue.min.js"></script>
|
||||
<script src="//unpkg.com/axios/dist/axios.min.js"></script>
|
||||
<script src="https://unpkg.com/vue-router@^2"></script>
|
||||
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
|
||||
<meta charset="UTF-8">
|
||||
<title>Memes</title>
|
||||
</head>
|
||||
|
|
@ -29,9 +30,9 @@
|
|||
|
||||
<b-navbar>
|
||||
<b-navbar-nav>
|
||||
<b-nav-item href="/emojy/stats">Stats</b-nav-item>
|
||||
<b-nav-item href="/emojy/list">List</b-nav-item>
|
||||
<b-nav-item active href="/emojy/new">Upload</b-nav-item>
|
||||
<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>
|
||||
|
||||
|
|
@ -43,7 +44,7 @@
|
|||
{{ err }}
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<div class="container" v-if="view == 'upload'">
|
||||
<label>Passphrase</label>
|
||||
<b-input v-model="password"></b-input>
|
||||
<label>File
|
||||
|
|
@ -52,11 +53,42 @@
|
|||
<br>
|
||||
<button @click="submitFile()">Submit</button>
|
||||
</div>
|
||||
|
||||
<ul v-if="view == 'stats'">
|
||||
<li v-for="(category, name) in results" key="name">
|
||||
{{name}}:
|
||||
<ul>
|
||||
<li v-for="emojy in category" key="emojy">
|
||||
{{emojy.count}} -
|
||||
<span v-if="name != 'emoji'">
|
||||
<span v-if="emojy.onServer">✅</span>
|
||||
<span v-else>❎</span>
|
||||
-
|
||||
</span>
|
||||
<img v-if="emojy.url" :src="emojy.url" :alt="emojy.name" class="img-thumbnail"
|
||||
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>
|
||||
var router = new VueRouter({
|
||||
mode: 'history',
|
||||
routes: []
|
||||
});
|
||||
var app = new Vue({
|
||||
el: '#app',
|
||||
router,
|
||||
data: function () {
|
||||
return {
|
||||
err: '',
|
||||
|
|
@ -112,7 +144,7 @@
|
|||
})
|
||||
.then(() => {
|
||||
console.log('SUCCESS!!');
|
||||
window.location.href = '/emojy/list';
|
||||
this.view = 'list';
|
||||
})
|
||||
.catch(e => {
|
||||
console.log('FAILURE!!' + e);
|
||||
|
|
@ -1,102 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<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-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>
|
||||
|
||||
<!-- Load Vue followed by BootstrapVue -->
|
||||
<script src="//unpkg.com/vue@^2/dist/vue.min.js"></script>
|
||||
<script src="//unpkg.com/bootstrap-vue@^2/dist/bootstrap-vue.min.js"></script>
|
||||
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
|
||||
<meta charset="UTF-8">
|
||||
<title>Memes</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div id="app">
|
||||
<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>
|
||||
</b-navbar-nav>
|
||||
</b-navbar>
|
||||
|
||||
<b-navbar>
|
||||
<b-navbar-nav>
|
||||
<b-nav-item href="/emojy/stats">Stats</b-nav-item>
|
||||
<b-nav-item active href="/emojy/list">List</b-nav-item>
|
||||
<b-nav-item href="/emojy/new">Upload</b-nav-item>
|
||||
</b-navbar-nav>
|
||||
</b-navbar>
|
||||
|
||||
<div
|
||||
style="background-color:red;"
|
||||
variant="error"
|
||||
v-if="err != ''"
|
||||
@click="err = ''">
|
||||
{{ err }}
|
||||
</div>
|
||||
|
||||
<div class="row row-cols-5">
|
||||
<div class="card text-center" v-for="(path, name) in fileList" key="name">
|
||||
<img :src="path" class="card-img-top mx-auto d-block" :alt="name" style="max-width: 100px">
|
||||
<div class="card-body">
|
||||
<h5 class="card-title">{{name}}</h5>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
var app = new Vue({
|
||||
el: '#app',
|
||||
data: function () {
|
||||
return {
|
||||
err: '',
|
||||
view: '',
|
||||
nav: [],
|
||||
results: [],
|
||||
fileList: {},
|
||||
image: null,
|
||||
password: ''
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
view(newView, oldView) {
|
||||
this.err = '';
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
axios.get('/nav')
|
||||
.then(resp => {
|
||||
this.nav = resp.data;
|
||||
})
|
||||
.catch(err => console.log(err))
|
||||
this.refresh();
|
||||
},
|
||||
methods: {
|
||||
refresh: function () {
|
||||
axios.get('/emojy/all')
|
||||
.then(resp => {
|
||||
this.results = resp.data
|
||||
this.err = ''
|
||||
})
|
||||
.catch(err => (this.err = err))
|
||||
axios.get('/emojy/allFiles')
|
||||
.then(resp => {
|
||||
this.fileList = resp.data
|
||||
this.err = ''
|
||||
})
|
||||
.catch(err => (this.err = err))
|
||||
},
|
||||
}
|
||||
})
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,112 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<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-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>
|
||||
|
||||
<!-- Load Vue followed by BootstrapVue -->
|
||||
<script src="//unpkg.com/vue@^2/dist/vue.min.js"></script>
|
||||
<script src="//unpkg.com/bootstrap-vue@^2/dist/bootstrap-vue.min.js"></script>
|
||||
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
|
||||
<meta charset="UTF-8">
|
||||
<title>Memes</title>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div id="app">
|
||||
<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>
|
||||
</b-navbar-nav>
|
||||
</b-navbar>
|
||||
|
||||
<b-navbar>
|
||||
<b-navbar-nav>
|
||||
<b-nav-item active href="/emojy/stats">Stats</b-nav-item>
|
||||
<b-nav-item href="/emojy/list">List</b-nav-item>
|
||||
<b-nav-item href="/emojy/new">Upload</b-nav-item>
|
||||
</b-navbar-nav>
|
||||
</b-navbar>
|
||||
|
||||
<div
|
||||
style="background-color:red;"
|
||||
variant="error"
|
||||
v-if="err != ''"
|
||||
@click="err = ''">
|
||||
{{ err }}
|
||||
</div>
|
||||
|
||||
<ul>
|
||||
<li v-for="(category, name) in results" key="name">
|
||||
{{name}}:
|
||||
<ul>
|
||||
<li v-for="emojy in category" key="emojy">
|
||||
{{emojy.count}} -
|
||||
<span v-if="name != 'emoji'">
|
||||
<span v-if="emojy.onServer">✅</span>
|
||||
<span v-else>❎</span>
|
||||
-
|
||||
</span>
|
||||
<img v-if="emojy.url" :src="emojy.url" :alt="emojy.name" class="img-thumbnail"
|
||||
style="max-width: 64px; max-height: 64px"/> {{emojy.name}}
|
||||
<span v-else>{{emojy.emojy}}</span>
|
||||
</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
var app = new Vue({
|
||||
el: '#app',
|
||||
data: function () {
|
||||
return {
|
||||
err: '',
|
||||
view: '',
|
||||
nav: [],
|
||||
results: [],
|
||||
fileList: {},
|
||||
image: null,
|
||||
password: ''
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
view(newView, oldView) {
|
||||
this.err = '';
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
axios.get('/nav')
|
||||
.then(resp => {
|
||||
this.nav = resp.data;
|
||||
})
|
||||
.catch(err => console.log(err))
|
||||
this.refresh();
|
||||
},
|
||||
methods: {
|
||||
refresh: function () {
|
||||
axios.get('/emojy/all')
|
||||
.then(resp => {
|
||||
this.results = resp.data
|
||||
this.err = ''
|
||||
})
|
||||
.catch(err => (this.err = err))
|
||||
axios.get('/emojy/allFiles')
|
||||
.then(resp => {
|
||||
this.fileList = resp.data
|
||||
this.err = ''
|
||||
})
|
||||
.catch(err => (this.err = err))
|
||||
},
|
||||
}
|
||||
})
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -25,23 +25,14 @@ func (p *EmojyPlugin) registerWeb() {
|
|||
r.HandleFunc("/allFiles", p.handleAllFiles)
|
||||
r.HandleFunc("/upload", p.handleUpload)
|
||||
r.HandleFunc("/file/{name}", p.handleEmojy)
|
||||
r.HandleFunc("/stats", p.handlePage("stats.html"))
|
||||
r.HandleFunc("/list", p.handlePage("list.html"))
|
||||
r.HandleFunc("/new", p.handlePage("upload.html"))
|
||||
r.HandleFunc("/", p.handleIndex)
|
||||
p.b.RegisterWebName(r, "/emojy", "Emojys")
|
||||
}
|
||||
|
||||
func (p *EmojyPlugin) handleIndex(w http.ResponseWriter, r *http.Request) {
|
||||
http.Redirect(w, r, "/emojy/stats", http.StatusPermanentRedirect)
|
||||
}
|
||||
|
||||
func (p *EmojyPlugin) handlePage(file string) func(w http.ResponseWriter, r *http.Request) {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
index, _ := embeddedFS.ReadFile(file)
|
||||
index, _ := embeddedFS.ReadFile("index.html")
|
||||
w.Write(index)
|
||||
}
|
||||
}
|
||||
|
||||
func (p *EmojyPlugin) handleAll(w http.ResponseWriter, r *http.Request) {
|
||||
emojy, err := p.allCounts()
|
||||
|
|
@ -56,7 +47,7 @@ func (p *EmojyPlugin) handleAll(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
|
||||
func (p *EmojyPlugin) handleAllFiles(w http.ResponseWriter, r *http.Request) {
|
||||
_, urlMap, err := AllFiles(p.emojyPath, p.baseURL)
|
||||
_, urlMap, err := AllFiles(p.c)
|
||||
if err != nil {
|
||||
w.WriteHeader(500)
|
||||
out, _ := json.Marshal(struct{ err error }{err})
|
||||
|
|
@ -116,12 +107,13 @@ func (p *EmojyPlugin) FileSave(r *http.Request) (string, error) {
|
|||
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(p.emojyPath, emojyFileName))
|
||||
_ = os.MkdirAll(p.emojyPath, os.ModePerm)
|
||||
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 {
|
||||
|
|
@ -140,7 +132,8 @@ func (p *EmojyPlugin) FileSave(r *http.Request) (string, error) {
|
|||
|
||||
func (p *EmojyPlugin) handleEmojy(w http.ResponseWriter, r *http.Request) {
|
||||
fname := chi.URLParam(r, "name")
|
||||
contents, err := ioutil.ReadFile(path.Join(p.emojyPath, fname))
|
||||
emojyPath := p.c.Get("emojy.path", "emojy")
|
||||
contents, err := ioutil.ReadFile(path.Join(emojyPath, fname))
|
||||
if err != nil {
|
||||
w.WriteHeader(404)
|
||||
out, _ := json.Marshal(struct{ err error }{err})
|
||||
|
|
|
|||
Loading…
Reference in New Issue