summaryrefslogtreecommitdiff
path: root/internal/gtserror/withcode.go
diff options
context:
space:
mode:
authorLibravatar kim <grufwub@gmail.com>2025-06-24 17:24:34 +0200
committerLibravatar tobi <kipvandenbos@noreply.codeberg.org>2025-06-24 17:24:34 +0200
commit996da6e0291b158093d917ca76933584f464d668 (patch)
tree38c12b20f76076f08ef5c8b8715ba3d8629fa0fb /internal/gtserror/withcode.go
parent[bugfix] update the default configuration to not set a db type or address, to... (diff)
downloadgotosocial-996da6e0291b158093d917ca76933584f464d668.tar.xz
[performance] filter model and database table improvements (#4277)
- removes unnecessary fields / columns (created_at, updated_at) - replaces filter.context_* columns with singular filter.contexts bit field which should save both struct memory and database space - replaces filter.action string with integer enum type which should save both struct memory and database space - adds links from filter to filter_* tables with Filter{}.KeywordIDs and Filter{}.StatusIDs fields (this also means we now have those ID slices cached, which reduces some lookups) - removes account_id fields from filter_* tables, since there's a more direct connection between filter and filter_* tables, and filter.account_id already exists - refactors a bunch of the filter processor logic to save on code repetition, factor in the above changes, fix a few bugs with missed error returns and bring it more in-line with some of our newer code Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4277 Co-authored-by: kim <grufwub@gmail.com> Co-committed-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/gtserror/withcode.go')
-rw-r--r--internal/gtserror/withcode.go20
1 files changed, 10 insertions, 10 deletions
diff --git a/internal/gtserror/withcode.go b/internal/gtserror/withcode.go
index e2059474d..8f25d0754 100644
--- a/internal/gtserror/withcode.go
+++ b/internal/gtserror/withcode.go
@@ -118,7 +118,7 @@ func WrapWithCode(code int, err error) WithCode {
// NewErrorBadRequest returns an ErrorWithCode 400 with the given original error and optional help text.
func NewErrorBadRequest(original error, helpText ...string) WithCode {
safe := http.StatusText(http.StatusBadRequest)
- if helpText != nil {
+ if len(helpText) > 0 {
safe = safe + ": " + strings.Join(helpText, ": ")
}
return &withCode{
@@ -131,7 +131,7 @@ func NewErrorBadRequest(original error, helpText ...string) WithCode {
// NewErrorUnauthorized returns an ErrorWithCode 401 with the given original error and optional help text.
func NewErrorUnauthorized(original error, helpText ...string) WithCode {
safe := http.StatusText(http.StatusUnauthorized)
- if helpText != nil {
+ if len(helpText) > 0 {
safe = safe + ": " + strings.Join(helpText, ": ")
}
return &withCode{
@@ -144,7 +144,7 @@ func NewErrorUnauthorized(original error, helpText ...string) WithCode {
// NewErrorForbidden returns an ErrorWithCode 403 with the given original error and optional help text.
func NewErrorForbidden(original error, helpText ...string) WithCode {
safe := http.StatusText(http.StatusForbidden)
- if helpText != nil {
+ if len(helpText) > 0 {
safe = safe + ": " + strings.Join(helpText, ": ")
}
return &withCode{
@@ -157,7 +157,7 @@ func NewErrorForbidden(original error, helpText ...string) WithCode {
// NewErrorNotFound returns an ErrorWithCode 404 with the given original error and optional help text.
func NewErrorNotFound(original error, helpText ...string) WithCode {
safe := http.StatusText(http.StatusNotFound)
- if helpText != nil {
+ if len(helpText) > 0 {
safe = safe + ": " + strings.Join(helpText, ": ")
}
return &withCode{
@@ -170,7 +170,7 @@ func NewErrorNotFound(original error, helpText ...string) WithCode {
// NewErrorInternalError returns an ErrorWithCode 500 with the given original error and optional help text.
func NewErrorInternalError(original error, helpText ...string) WithCode {
safe := http.StatusText(http.StatusInternalServerError)
- if helpText != nil {
+ if len(helpText) > 0 {
safe = safe + ": " + strings.Join(helpText, ": ")
}
return &withCode{
@@ -183,7 +183,7 @@ func NewErrorInternalError(original error, helpText ...string) WithCode {
// NewErrorConflict returns an ErrorWithCode 409 with the given original error and optional help text.
func NewErrorConflict(original error, helpText ...string) WithCode {
safe := http.StatusText(http.StatusConflict)
- if helpText != nil {
+ if len(helpText) > 0 {
safe = safe + ": " + strings.Join(helpText, ": ")
}
return &withCode{
@@ -196,7 +196,7 @@ func NewErrorConflict(original error, helpText ...string) WithCode {
// NewErrorNotAcceptable returns an ErrorWithCode 406 with the given original error and optional help text.
func NewErrorNotAcceptable(original error, helpText ...string) WithCode {
safe := http.StatusText(http.StatusNotAcceptable)
- if helpText != nil {
+ if len(helpText) > 0 {
safe = safe + ": " + strings.Join(helpText, ": ")
}
return &withCode{
@@ -209,7 +209,7 @@ func NewErrorNotAcceptable(original error, helpText ...string) WithCode {
// NewErrorUnprocessableEntity returns an ErrorWithCode 422 with the given original error and optional help text.
func NewErrorUnprocessableEntity(original error, helpText ...string) WithCode {
safe := http.StatusText(http.StatusUnprocessableEntity)
- if helpText != nil {
+ if len(helpText) > 0 {
safe = safe + ": " + strings.Join(helpText, ": ")
}
return &withCode{
@@ -222,7 +222,7 @@ func NewErrorUnprocessableEntity(original error, helpText ...string) WithCode {
// NewErrorGone returns an ErrorWithCode 410 with the given original error and optional help text.
func NewErrorGone(original error, helpText ...string) WithCode {
safe := http.StatusText(http.StatusGone)
- if helpText != nil {
+ if len(helpText) > 0 {
safe = safe + ": " + strings.Join(helpText, ": ")
}
return &withCode{
@@ -235,7 +235,7 @@ func NewErrorGone(original error, helpText ...string) WithCode {
// NewErrorNotImplemented returns an ErrorWithCode 501 with the given original error and optional help text.
func NewErrorNotImplemented(original error, helpText ...string) WithCode {
safe := http.StatusText(http.StatusNotImplemented)
- if helpText != nil {
+ if len(helpText) > 0 {
safe = safe + ": " + strings.Join(helpText, ": ")
}
return &withCode{