diff options
| author |  Vyr Cossont <VyrCossont@users.noreply.github.com> | 2024-11-26 08:23:00 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-11-26 08:23:00 -0800 |
| commit | 6a8af426474acd1ffd5cb3265a2372003977326a (patch) | |
| tree | 9f22c7d3eabc784728da22d60f0ec05ed93ac6ac /internal/processing/filters/v1 | |
| parent | [chore] Sign the bloody thing, fix the other bloody thing (#3572) (diff) | |
| download | gotosocial-6a8af426474acd1ffd5cb3265a2372003977326a.tar.xz | |
[bugfix] Allow unsetting filter expiration dates (#3560)
* Regression tests for #3497 (v1 and v2)
* use Nullable type for v2 form.expires_in
---------
Co-authored-by: tobi <tobi.smethurst@protonmail.com>
Diffstat (limited to 'internal/processing/filters/v1')
| -rw-r--r-- | internal/processing/filters/v1/create.go | 2 | ||||
| -rw-r--r-- | internal/processing/filters/v1/update.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/internal/processing/filters/v1/create.go b/internal/processing/filters/v1/create.go index 18367dfce..86019d2a6 100644 --- a/internal/processing/filters/v1/create.go +++ b/internal/processing/filters/v1/create.go @@ -43,7 +43,7 @@ func (p *Processor) Create(ctx context.Context, account *gtsmodel.Account, form if *form.Irreversible { filter.Action = gtsmodel.FilterActionHide } - if form.ExpiresIn != nil { + if form.ExpiresIn != nil && *form.ExpiresIn != 0 { filter.ExpiresAt = time.Now().Add(time.Second * time.Duration(*form.ExpiresIn)) } for _, context := range form.Context { diff --git a/internal/processing/filters/v1/update.go b/internal/processing/filters/v1/update.go index 81340b4be..15c5de365 100644 --- a/internal/processing/filters/v1/update.go +++ b/internal/processing/filters/v1/update.go @@ -67,7 +67,7 @@ func (p *Processor) Update( action = gtsmodel.FilterActionHide } expiresAt := time.Time{} - if form.ExpiresIn != nil { + if form.ExpiresIn != nil && *form.ExpiresIn != 0 { expiresAt = time.Now().Add(time.Second * time.Duration(*form.ExpiresIn)) } contextHome := false |