diff --git a/api-activities.go b/api-activities.go index d6fdd60..305a66f 100644 --- a/api-activities.go +++ b/api-activities.go @@ -96,9 +96,12 @@ func (app *appContext) GetActivities(gc *gin.Context) { req := GetActivitiesDTO{} gc.BindJSON(&req) query := &badgerhold.Query{} - activityType := stringToActivityType(req.Type) - if activityType != ActivityUnknown { - query = badgerhold.Where("Type").Eq(activityType) + activityTypes := make([]interface{}, len(req.Type)) + for i, v := range req.Type { + activityTypes[i] = stringToActivityType(v) + } + if len(activityTypes) != 0 { + query = badgerhold.Where("Type").In(activityTypes...) } if req.Ascending { diff --git a/html/admin.html b/html/admin.html index 48818a9..6ea2dfb 100644 --- a/html/admin.html +++ b/html/admin.html @@ -475,6 +475,7 @@
+ | {{ .strings.username }} | + {{ if .jellyfinLogin }} +{{ .strings.accessJFA }} | + {{ end }} +{{ .strings.emailAddress }} | + {{ if .telegramEnabled }} +Telegram | + {{ end }} + {{ if .matrixEnabled }} +Matrix | + {{ end }} + {{ if .discordEnabled }} +Discord | + {{ end }} + {{ if .referralsEnabled }} +{{ .strings.referrals }} | + {{ end }} +{{ .strings.expiry }} | +{{ .strings.lastActiveTime }} | +
---|