From e82baa3d0262e8c01658935453aee6a2d96d8311 Mon Sep 17 00:00:00 2001 From: Max Magorsch Date: Tue, 23 Jun 2020 15:47:11 +0200 Subject: Speed up loading the messages for a list Signed-off-by: Max Magorsch --- pkg/app/list/messages.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkg/app/list/messages.go b/pkg/app/list/messages.go index 7a78811..a9564a8 100644 --- a/pkg/app/list/messages.go +++ b/pkg/app/list/messages.go @@ -3,7 +3,6 @@ package list import ( "archives/pkg/database" "archives/pkg/models" - "github.com/go-pg/pg/v10/orm" "math" "net/http" "strconv" @@ -35,18 +34,7 @@ func Messages(w http.ResponseWriter, r *http.Request) { query := database.DBCon.Model(&messages). Column("id", "subject", "from", "date"). Where("to_char(date, 'YYYY-MM') = ?", combinedDate). - WhereGroup(func(q *orm.Query) (*orm.Query, error) { - q = q.WhereOr(`subject LIKE '[` + listName + `]%'`). - WhereOr(`subject LIKE 'Re: [` + listName + `]%'`) - return q, nil - }). - //WhereGroup(func(q *orm.Query) (*orm.Query, error) { - // q = q.WhereOr(`headers::jsonb->>'To' LIKE '%` + listName + `@lists.gentoo.org%'`). - // WhereOr(`headers::jsonb->>'Cc' LIKE '%` + listName + `@lists.gentoo.org%'`). - // WhereOr(`headers::jsonb->>'To' LIKE '%` + listName + `@gentoo.org%'`). - // WhereOr(`headers::jsonb->>'Cc' LIKE '%` + listName + `@gentoo.org%'`) - // return q, nil - //}). + Where("list = ?", listName). Order("date DESC") messagesCount, _ := query.Count() -- cgit v1.2.3-65-gdbad