diff options
| author |  kim <grufwub@gmail.com> | 2025-11-03 21:16:42 +0100 |
|---|---|---|
| committer |  tobi <tobi.smethurst@protonmail.com> | 2025-11-17 14:12:22 +0100 |
| commit | 29547ce8aba63454e84d277b0597fb2764e8cb23 (patch) | |
| tree | e80d0d74eea123dbc6dd1dcffadff0cb11f82faa /internal/processing/admin | |
| parent | [bugfix] Fix invalid period parameter when generating the TOTP URL (#4536) (diff) | |
| download | gotosocial-29547ce8aba63454e84d277b0597fb2764e8cb23.tar.xz | |
[bugfix] more RSS validation issues (#4517)
Fixes some validation issues relating to author information often expected to be valid email addresses, which our @displayname@username is not. There's still a few more validation issues, but honestly if we're going have better support I think it might be worth dropping gorilla/feeds for our own tagged XML / JSON structs.
Also does a bunch of housekeeping in the typeutils package removing error returns where never used / only ever logged, removing unused contexts etc.
Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4517
Co-authored-by: kim <grufwub@gmail.com>
Co-committed-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/processing/admin')
| -rw-r--r-- | internal/processing/admin/emoji.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/internal/processing/admin/emoji.go b/internal/processing/admin/emoji.go index 5c391bf82..8d568b9a8 100644 --- a/internal/processing/admin/emoji.go +++ b/internal/processing/admin/emoji.go @@ -32,6 +32,7 @@ import ( "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "code.superseriousbusiness.org/gotosocial/internal/id" "code.superseriousbusiness.org/gotosocial/internal/media" + "code.superseriousbusiness.org/gotosocial/internal/typeutils" "code.superseriousbusiness.org/gotosocial/internal/util" "codeberg.org/gruf/go-iotools" ) @@ -262,11 +263,7 @@ func (p *Processor) EmojiCategoriesGet( apiCategories := make([]*apimodel.EmojiCategory, 0, len(categories)) for _, category := range categories { - apiCategory, err := p.converter.EmojiCategoryToAPIEmojiCategory(ctx, category) - if err != nil { - err := gtserror.Newf("error converting emoji category to api emoji category: %w", err) - return nil, gtserror.NewErrorInternalError(err) - } + apiCategory := typeutils.EmojiCategoryToAPIEmojiCategory(category) apiCategories = append(apiCategories, apiCategory) } |