mirror of https://github.com/velour/catbase.git
Compare commits
2 Commits
b1cec209fe
...
09cc6f75c3
Author | SHA1 | Date |
---|---|---|
|
09cc6f75c3 | |
|
bffc1589c2 |
|
@ -207,12 +207,12 @@ func InvertEmojyList(emojy map[string]string) map[string]string {
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *EmojyPlugin) allCounts() (map[string][]EmojyCount, error) {
|
func (p *EmojyPlugin) allCounts(threshold int) (map[string][]EmojyCount, error) {
|
||||||
out := map[string][]EmojyCount{}
|
out := map[string][]EmojyCount{}
|
||||||
onServerList := InvertEmojyList(p.b.GetEmojiList(true))
|
onServerList := InvertEmojyList(p.b.GetEmojiList(true))
|
||||||
q := `select emojy, count(observed) as count from emojyLog group by emojy order by count desc`
|
q := `select emojy, count(observed) as count from emojyLog group by emojy having count(observed) > ? order by count desc`
|
||||||
result := []EmojyCount{}
|
result := []EmojyCount{}
|
||||||
err := p.db.Select(&result, q)
|
err := p.db.Select(&result, q, threshold)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,10 +43,9 @@
|
||||||
{{ err }}
|
{{ err }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<ul>
|
<ul style="list-style-type: none;">
|
||||||
<li v-for="(category, name) in results" key="name">
|
<li v-for="category in results">
|
||||||
{{name}}:
|
<ul v-if="category" style="list-style-type: none;">
|
||||||
<ul>
|
|
||||||
<li v-for="emojy in category" key="emojy">
|
<li v-for="emojy in category" key="emojy">
|
||||||
{{emojy.count}} -
|
{{emojy.count}} -
|
||||||
<span v-if="name != 'emoji'">
|
<span v-if="name != 'emoji'">
|
||||||
|
@ -96,7 +95,7 @@
|
||||||
refresh: function () {
|
refresh: function () {
|
||||||
axios.get('/emojy/all')
|
axios.get('/emojy/all')
|
||||||
.then(resp => {
|
.then(resp => {
|
||||||
this.results = resp.data
|
this.results = [resp.data["emojy"], resp.data["unknown"], resp.data["emoji"]]
|
||||||
this.err = ''
|
this.err = ''
|
||||||
})
|
})
|
||||||
.catch(err => (this.err = err))
|
.catch(err => (this.err = err))
|
||||||
|
|
|
@ -44,7 +44,8 @@ func (p *EmojyPlugin) handlePage(file string) func(w http.ResponseWriter, r *htt
|
||||||
}
|
}
|
||||||
|
|
||||||
func (p *EmojyPlugin) handleAll(w http.ResponseWriter, r *http.Request) {
|
func (p *EmojyPlugin) handleAll(w http.ResponseWriter, r *http.Request) {
|
||||||
emojy, err := p.allCounts()
|
threshold := p.c.GetInt("emojy.statthreshold", 1)
|
||||||
|
emojy, err := p.allCounts(threshold)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
w.WriteHeader(500)
|
w.WriteHeader(500)
|
||||||
log.Error().Err(err).Msgf("handleAll")
|
log.Error().Err(err).Msgf("handleAll")
|
||||||
|
|
Loading…
Reference in New Issue