Merge branch 'master' of gogs.bullercodeworks.com:brian/statbot

assets/js/levelup_main.js

@@ -1,31 +1,55 @@
+var sortMode = "ALPHA";
+
 document.addEventListener("DOMContentLoaded", function(event) {
-  sortByAlpha();
+  sortMode = docCookies.getItem("levelup-sort")
-  buildList();
+  updateScreen();
   B('#btnAlphaSort').on('click', function() {
     if(sortMode == "ALPHA") {
       sortMode = "ALPHA-REV";
-      B('#btnAlphaSort>i').removeClass('fa-sort-asc').addClass('fa-sort-desc');
     } else {
       sortMode = "ALPHA";
-      B('#btnAlphaSort>i').removeClass('fa-sort-desc').addClass('fa-sort-asc');
     }
-    sortUsers();
+    docCookies.setItem("levelup-sort", sortMode);
-    buildList();
+    updateScreen();
   });
   B('#btnXpSort').on('click', function() {
     if(sortMode == "XP") {
       sortMode = "XP-REV";
-      B('#btnXpSort>i').removeClass('fa-sort-desc').addClass('fa-sort-asc');
     } else {
       sortMode = "XP";
-      B('#btnXpSort>i').removeClass('fa-sort-asc').addClass('fa-sort-desc');
     }
-    sortUsers();
+    docCookies.setItem("levelup-sort", sortMode);
-    buildList();
+    updateScreen();
   });
-})
+});
 
-var sortMode = "ALPHA";
+function updateScreen() {
+  sortUsers();
+  styleButtons();
+  buildList();
+}
+
+function styleButtons() {
+  var alphaBtn = B('#btnAlphaSort>i'),
+      xpBtn = B('#btnXpSort>i');
+  alphaBtn.removeClass('fa-sort-asc').removeClass('fa-sort-desc');
+  xpBtn.removeClass('fa-sort-asc').removeClass('fa-sort-desc');
+  switch(sortMode) {
+    case "ALPHA":
+      alphaBtn.addClass('fa-sort-desc');
+      break;
+    case "ALPHA-REV":
+      alphaBtn.addClass('fa-sort-asc');
+      break;
+    case "XP":
+      xpBtn.addClass('fa-sort-desc');
+      break;
+    default: 
+      sortMode = "XP-REV";
+      xpBtn.addClass('fa-sort-asc');
+      break;
+  }
+}
 
 function clearList() {
   B(".levelup-user").remove();

processor_levelupachieve.go

@@ -1,10 +1,6 @@
 package main
 
-import (
+import "net/http"
-	"net/http"
-
-	"github.com/gorilla/mux"
-)
 
 type levelUpAchieveStatProcessor struct {
 	Achievements []levelUpAchievement
@@ -38,15 +34,14 @@ func (p *levelUpAchieveStatProcessor) ProcessMessage(m *Message) {
 	}
 	var u *User
 	var err error
-	vars := mux.Vars(req)
 	if u, err = getUserInfo(m.User); err != nil {
 		return
 	}
 
-	p := UserLevelUpStats{Name: u.Name}
+	userStat := UserLevelUpStats{Name: u.Name}
-	p.Xp, _ = getUserStat(u.ID, "levelup-xp")
+	userStat.Xp, _ = getUserStat(u.ID, "levelup-xp")
-	p.ChannelStats = getAllLevelUpChannelXp(u.ID)
+	userStat.ChannelStats = getAllLevelUpChannelXp(u.ID)
-	p.OtherStats = getAllNonLevelUpStats(u.ID)
+	userStat.OtherStats = getAllNonLevelUpStats(u.ID)
 
 }
 func (p *levelUpAchieveStatProcessor) ProcessAdminMessage(m *Message) {}

statbot.go

@@ -65,7 +65,7 @@ func statBotMain(slack *Slack) {
 	registerStatProcessor(new(levelUpStatProcessor))
 	registerStatProcessor(new(generalStatProcessor))
 
-	levelUpAchievements := new(levelUpAchieveStatProcessor)
+	//levelUpAchievements := new(levelUpAchieveStatProcessor)
 	// Register Achievements
 
 	registerMessageProcessor(new(generalProcessor))

statbotweb.go

@@ -93,6 +93,7 @@ func initRequest(w http.ResponseWriter, req *http.Request) {
 	site.Scripts = append(site.Scripts, "/assets/js/highcharts.js")
 	site.Scripts = append(site.Scripts, "/assets/js/B.js")
 	site.Scripts = append(site.Scripts, "/assets/js/B_purecss.js")
+	site.Scripts = append(site.Scripts, "/assets/js/B_cookies.js")
 
 	site.InlineScript = ""