idanoo/go-mastodon-stats
1
0
Fork 0
mirror of https://github.com/idanoo/go-mastodon-stats synced 2025-07-01 22:02:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add difference

Browse source
This commit is contained in:
idanoo 2023-01-30 13:23:05 +13:00
parent f1066d74d7
commit e4a20af1c3
Signed by: idanoo
GPG key ID: 387387CDBC02F132
2 changed files with 54 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/gomastodonstats/consts.go
View file

@ -45,7 +45,7 @@ var (
// Mastodon
MASTODON_DB_SCHEMA string
MASTODON_USER_QUERY = "SELECT count(*) FROM users WHERE disabled = False;"
MASTODON_USER_QUERY = "SELECT count(*) FROM users WHERE disabled = False AND confirmed_at IS NOT NULL AND approved = True;"
MASTODON_IDENTIFIER = "mastodon"
// Mobilizon

73
internal/gomastodonstats/metrics.go
View file

@ -8,10 +8,11 @@ import (
// Stores out metric/row data
type metric struct {
Service string `json:"service"`
MetricName string `json:"metric_name"`
MetricTime time.Time `json:"metric_time"`
MetricValue int `json:"metric_value"`
Service string `json:"service"`
MetricName string `json:"metric_name"`
MetricTime time.Time `json:"metric_time"`
MetricValue int `json:"metric_value"`
PreviousMetricValue int `json:"-"`
}
// persistMetrics - return any updated
@ -41,9 +42,10 @@ func getUserCounts() ([]metric, error) {
log.Println(err)
} else {
m := metric{
Service: PIXELFED_IDENTIFIER,
MetricName: METRICNAME_USERCOUNT,
MetricValue: userCount,
Service: PIXELFED_IDENTIFIER,
MetricName: METRICNAME_USERCOUNT,
MetricValue: userCount,
PreviousMetricValue: getLastMetric(PIXELFED_IDENTIFIER),
}
log.Printf("%s user count: %d", PIXELFED_IDENTIFIER, userCount)
metrics = append(metrics, m)
@ -56,9 +58,10 @@ func getUserCounts() ([]metric, error) {
log.Println(err)
} else {
m := metric{
Service: MATRIX_IDENTIFIDER,
MetricName: METRICNAME_USERCOUNT,
MetricValue: userCount,
Service: MATRIX_IDENTIFIDER,
MetricName: METRICNAME_USERCOUNT,
MetricValue: userCount,
PreviousMetricValue: getLastMetric(MATRIX_IDENTIFIDER),
}
log.Printf("%s user count: %d", MATRIX_IDENTIFIDER, userCount)
metrics = append(metrics, m)
@ -71,9 +74,10 @@ func getUserCounts() ([]metric, error) {
log.Println(err)
} else {
m := metric{
Service: MASTODON_IDENTIFIER,
MetricName: METRICNAME_USERCOUNT,
MetricValue: userCount,
Service: MASTODON_IDENTIFIER,
MetricName: METRICNAME_USERCOUNT,
MetricValue: userCount,
PreviousMetricValue: getLastMetric(MASTODON_IDENTIFIER),
}
log.Printf("%s user count: %d", MASTODON_IDENTIFIER, userCount)
metrics = append(metrics, m)
@ -86,9 +90,10 @@ func getUserCounts() ([]metric, error) {
log.Println(err)
} else {
m := metric{
Service: MOBILIZON_IDENTIFIER,
MetricName: METRICNAME_USERCOUNT,
MetricValue: userCount,
Service: MOBILIZON_IDENTIFIER,
MetricName: METRICNAME_USERCOUNT,
MetricValue: userCount,
PreviousMetricValue: getLastMetric(MOBILIZON_IDENTIFIER),
}
log.Printf("%s user count: %d", MOBILIZON_IDENTIFIER, userCount)
metrics = append(metrics, m)
@ -101,9 +106,10 @@ func getUserCounts() ([]metric, error) {
log.Println(err)
} else {
m := metric{
Service: PEERTUBE_IDENTIFIER,
MetricName: METRICNAME_USERCOUNT,
MetricValue: userCount,
Service: PEERTUBE_IDENTIFIER,
MetricName: METRICNAME_USERCOUNT,
MetricValue: userCount,
PreviousMetricValue: getLastMetric(PEERTUBE_IDENTIFIER),
}
log.Printf("%s user count: %d", PEERTUBE_IDENTIFIER, userCount)
metrics = append(metrics, m)
@ -114,5 +120,32 @@ func getUserCounts() ([]metric, error) {
}
func getPrintableString(m metric) string {
return fmt.Sprintf("%s: %d", SERVICE_LINKS[m.Service], m.MetricValue)
output := fmt.Sprintf("%s: %d", SERVICE_LINKS[m.Service], m.MetricValue)
diff := m.MetricValue - m.PreviousMetricValue
if diff < 0 {
output = fmt.Sprintf("%s (%d)", output, diff)
} else if diff > 0 {
output = fmt.Sprintf("%s (+%d)", output, diff)
}
return output
}
func getLastMetric(serviceName string) int {
val, err := runIntQuery(
POSTGRESQL_STATS_DB,
fmt.Sprintf(
"SELECT metric_value FROM %s WHERE metric_name = '%s' AND service = '%s' ORDER BY metric_time DESC LIMIT 1",
POSTGRESQL_STATS_TABLE,
METRICNAME_USERCOUNT,
serviceName,
),
)
if err != nil {
log.Println(err)
return 0
}
return val
}