From da941c00706dec632c25fd65aeb6c6ad2a240bc5 Mon Sep 17 00:00:00 2001 From: Dionysos <75300347+ice-dionysos@users.noreply.github.com> Date: Fri, 6 Feb 2026 16:02:56 +0100 Subject: [PATCH 1/3] validator: update rules --- validation/validate.go | 1 + 1 file changed, 1 insertion(+) diff --git a/validation/validate.go b/validation/validate.go index 0d5e2584..c87c0b0d 100644 --- a/validation/validate.go +++ b/validation/validate.go @@ -236,6 +236,7 @@ var ( "tx_amount", ). Optional("p"). + Optional("k", "token_symbol"). // TODO: Make required later. Forbidden("expiration"). ContentEmpty(). Validate(validateInternalTopicTC). From 21e221ba56769a588f0012e14231a0310a73dafe Mon Sep 17 00:00:00 2001 From: Dionysos <75300347+ice-dionysos@users.noreply.github.com> Date: Wed, 4 Feb 2026 16:50:12 +0100 Subject: [PATCH 2/3] database: fix index usage --- database/query/query.go | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/database/query/query.go b/database/query/query.go index c6f38f53..1178759d 100644 --- a/database/query/query.go +++ b/database/query/query.go @@ -1362,19 +1362,24 @@ func (db *dbClient) deleteExpiredEvents(ctx context.Context) (err error) { events WHERE expiration <= :cutoff + and hidden = false + and deleted = false + ORDER BY lookup_created_at ASC LIMIT :batch_size FOR UPDATE SKIP LOCKED ) - DELETE FROM events - WHERE id IN (SELECT id FROM expired_events) + DELETE FROM events AS de + USING expired_events AS ee + WHERE + de.id = ee.id RETURNING - kind, - created_at, - id, - pubkey, - sig, - content, - tags` + de.kind, + de.created_at, + de.id, + de.pubkey, + de.sig, + de.content, + de.tags` params := map[string]any{ "batch_size": batchSize, "cutoff": time.Now().UnixNano(), @@ -1393,7 +1398,7 @@ func (db *dbClient) deleteExpiredEvents(ctx context.Context) (err error) { } } - if len(events) < batchSize { + if len(events) < batchSize || ctx.Err() != nil { break } From 863eef65e853c90a164b46bd74b2fdedf16235c0 Mon Sep 17 00:00:00 2001 From: Dionysos <75300347+ice-dionysos@users.noreply.github.com> Date: Fri, 6 Feb 2026 16:04:20 +0100 Subject: [PATCH 3/3] go: update modules --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e6b563a9..5803012e 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/davidbyttow/govips/v2 v2.16.0 github.com/dchenk/go-render-quill v0.0.0-20211110010230-f51106477162 github.com/docker/go-connections v0.6.0 - github.com/dundee/gdu/v5 v5.32.1-0.20260119094913-d7f79fbbf366 + github.com/dundee/gdu/v5 v5.32.1-0.20260204201143-0aad7bef5cac github.com/forPelevin/gomoji v1.4.1 github.com/fsnotify/fsnotify v1.9.0 github.com/georgysavva/scany/v2 v2.1.4 diff --git a/go.sum b/go.sum index 43f9e0d7..bdff3094 100644 --- a/go.sum +++ b/go.sum @@ -238,8 +238,8 @@ github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pM github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/dundee/gdu/v5 v5.32.1-0.20260119094913-d7f79fbbf366 h1:qgH1Xn1veDxQsvUbe3HIz2ishnLHI75cnTmYfnFmOKQ= -github.com/dundee/gdu/v5 v5.32.1-0.20260119094913-d7f79fbbf366/go.mod h1:ERJWB673cEpklxhem67U/AfhyMsFUVzxb81P8VSiJ/4= +github.com/dundee/gdu/v5 v5.32.1-0.20260204201143-0aad7bef5cac h1:YuF92xeKZq0CT1gaevnjnwCk4aJe3cjHfQpb6d0S0OI= +github.com/dundee/gdu/v5 v5.32.1-0.20260204201143-0aad7bef5cac/go.mod h1:2vMckWa9UrPI/nXamn4rWS2pJ/0vSsGsbJxdR3CQ0eQ= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/ebitengine/purego v0.9.1 h1:a/k2f2HQU3Pi399RPW1MOaZyhKJL9w/xFpKAg4q1s0A=