Refactor & fix storing struct-values in redis keyvalue

pkg/metrics/active_users.go

@@ -91,12 +91,8 @@ func SetUserActive(a web.Auth) (err error) {
 
 // getActiveUsers returns the active users from redis
 func getActiveUsers() (users activeUsersMap, err error) {
-	u, _, err := keyvalue.Get(ActiveUsersKey)
-	if err != nil {
-		return nil, err
-	}
-
-	users = u.(activeUsersMap)
+	users = activeUsersMap{}
+	_, err = keyvalue.GetWithValue(ActiveUsersKey, &users)
 	return
 }
 

pkg/metrics/metrics.go

@@ -17,6 +17,8 @@
 package metrics
 
 import (
+	"strconv"
+
 	"code.vikunja.io/api/pkg/log"
 	"code.vikunja.io/api/pkg/modules/keyvalue"
 	"github.com/prometheus/client_golang/prometheus"
@@ -132,7 +134,11 @@ func GetCount(key string) (count int64, err error) {
 		return 0, nil
 	}
 
-	count = cnt.(int64)
+	if s, is := cnt.(string); is {
+		count, err = strconv.ParseInt(s, 10, 64)
+	} else {
+		count = cnt.(int64)
+	}
 
 	return
 }