diff options
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 | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/internal/processing/filters/v1/create.go b/internal/processing/filters/v1/create.go index 4d8ffc3e1..18367dfce 100644 --- a/internal/processing/filters/v1/create.go +++ b/internal/processing/filters/v1/create.go @@ -71,7 +71,7 @@ func (p *Processor) Create(ctx context.Context, account *gtsmodel.Account, form FilterID: filter.ID, Filter: filter, Keyword: form.Phrase, - WholeWord: util.Ptr(util.PtrValueOr(form.WholeWord, false)), + WholeWord: util.Ptr(util.PtrOrValue(form.WholeWord, false)), } filter.Keywords = []*gtsmodel.FilterKeyword{filterKeyword} diff --git a/internal/processing/filters/v1/update.go b/internal/processing/filters/v1/update.go index 2c2fe5574..81340b4be 100644 --- a/internal/processing/filters/v1/update.go +++ b/internal/processing/filters/v1/update.go @@ -108,11 +108,11 @@ func (p *Processor) Update( if expiresAt != filter.ExpiresAt { forbiddenFields = append(forbiddenFields, "expires_in") } - if contextHome != util.PtrValueOr(filter.ContextHome, false) || - contextNotifications != util.PtrValueOr(filter.ContextNotifications, false) || - contextPublic != util.PtrValueOr(filter.ContextPublic, false) || - contextThread != util.PtrValueOr(filter.ContextThread, false) || - contextAccount != util.PtrValueOr(filter.ContextAccount, false) { + if contextHome != util.PtrOrValue(filter.ContextHome, false) || + contextNotifications != util.PtrOrValue(filter.ContextNotifications, false) || + contextPublic != util.PtrOrValue(filter.ContextPublic, false) || + contextThread != util.PtrOrValue(filter.ContextThread, false) || + contextAccount != util.PtrOrValue(filter.ContextAccount, false) { forbiddenFields = append(forbiddenFields, "context") } if len(forbiddenFields) > 0 { @@ -132,7 +132,7 @@ func (p *Processor) Update( filter.ContextThread = &contextThread filter.ContextAccount = &contextAccount filterKeyword.Keyword = form.Phrase - filterKeyword.WholeWord = util.Ptr(util.PtrValueOr(form.WholeWord, false)) + filterKeyword.WholeWord = util.Ptr(util.PtrOrValue(form.WholeWord, false)) // We only want to update the relevant filter keyword. filter.Keywords = []*gtsmodel.FilterKeyword{filterKeyword} |