Compare commits

..

No commits in common. "09cc6f75c34648b197034399c4ec81ed7cc9edcf" and "b1cec209fe151292bf69e0833e6fbee12979c223" have entirely different histories.

3 changed files with 9 additions and 9 deletions

View File

@ -207,12 +207,12 @@ func InvertEmojyList(emojy map[string]string) map[string]string {
return out return out
} }
func (p *EmojyPlugin) allCounts(threshold int) (map[string][]EmojyCount, error) { func (p *EmojyPlugin) allCounts() (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 having count(observed) > ? order by count desc` q := `select emojy, count(observed) as count from emojyLog group by emojy order by count desc`
result := []EmojyCount{} result := []EmojyCount{}
err := p.db.Select(&result, q, threshold) err := p.db.Select(&result, q)
if err != nil { if err != nil {
return nil, err return nil, err
} }

View File

@ -43,9 +43,10 @@
{{ err }} {{ err }}
</div> </div>
<ul style="list-style-type: none;"> <ul>
<li v-for="category in results"> <li v-for="(category, name) in results" key="name">
<ul v-if="category" style="list-style-type: none;"> {{name}}:
<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'">
@ -95,7 +96,7 @@
refresh: function () { refresh: function () {
axios.get('/emojy/all') axios.get('/emojy/all')
.then(resp => { .then(resp => {
this.results = [resp.data["emojy"], resp.data["unknown"], resp.data["emoji"]] this.results = resp.data
this.err = '' this.err = ''
}) })
.catch(err => (this.err = err)) .catch(err => (this.err = err))

View File

@ -44,8 +44,7 @@ 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) {
threshold := p.c.GetInt("emojy.statthreshold", 1) emojy, err := p.allCounts()
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")