Mikescher/SimpleCloudNotifier
1
0
Fork 0
Code Pull Requests Actions Releases Activity

Tests[SearchMessageFTSSimple]

Browse Source
This commit is contained in:
Mike Schwörer
2022-12-11 02:47:23 +01:00
parent 3692b915f3
commit 26cd1533b4
9 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/api/handler/api.go
View File

@@ -1184,6 +1184,10 @@ func (h APIHandler) ListMessages(g *gin.Context) ginresp.HTTPResponse {
ConfirmedSubscriptionBy: langext.Ptr(userid),
}
if q.Filter != nil && strings.TrimSpace(*q.Filter) != "" {
filter.SearchString = langext.Ptr([]string{strings.TrimSpace(*q.Filter)})
}
messages, npt, err := h.database.ListMessages(ctx, filter, pageSize, tok)
if err != nil {
return ginresp.APIError(g, 500, apierr.DATABASE_ERROR, "Failed to query messages", err)

2
server/api/handler/compat.go
View File

@@ -201,7 +201,7 @@ func (h CompatHandler) Info(g *gin.Context) ginresp.HTTPResponse {
return ginresp.CompatAPIError(0, "Failed to query clients")
}
fcmSet := langext.ArrAny(clients, func(i int) bool { return clients[i].FCMToken != nil })
fcmSet := langext.ArrAny(clients, func(c models.Client) bool { return c.FCMToken != nil })
return ctx.FinishSuccess(ginresp.JSON(http.StatusOK, response{
Success: true,