fix: unset elevated until if in the past

Author: jmattheis

api/client.go

@@ -185,6 +185,12 @@ func (a *ClientAPI) GetClients(ctx *gin.Context) {
 	if success := successOrAbort(ctx, 500, err); !success {
 		return
 	}
+	now := time.Now()
+	for _, client := range clients {
+		if client.ElevatedUntil != nil && !now.Before(*client.ElevatedUntil) {
+			client.ElevatedUntil = nil
+		}
+	}
 	ctx.JSON(200, clients)
 }
 

api/user.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gotify/server/v2/auth"
@@ -138,7 +139,9 @@ func (a *UserAPI) GetCurrentUser(ctx *gin.Context) {
 	client := auth.GetClient(ctx)
 	if client != nil {
 		result.ClientID = client.ID
-		result.ElevatedUntil = client.ElevatedUntil
+		if client.ElevatedUntil != nil && time.Now().Before(*client.ElevatedUntil) {
+			result.ElevatedUntil = client.ElevatedUntil
+		}
 	}
 	ctx.JSON(200, result)
 }