diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2022-09-28 18:30:40 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-09-28 18:30:40 +0100 |
| commit | a156188b3eb5cb3da44aa1b7452265f5fa38a607 (patch) | |
| tree | 7097fa48d56fbabc7c2c8750b1f3bc9321d71c0f /internal/typeutils/defaulticons.go | |
| parent | [bugfix] Fix emphasis being added to emoji shortcodes with markdown parsing (... (diff) | |
| download | gotosocial-a156188b3eb5cb3da44aa1b7452265f5fa38a607.tar.xz | |
[chore] update dependencies, bump to Go 1.19.1 (#826)
* update dependencies, bump Go version to 1.19
* bump test image Go version
* update golangci-lint
* update gotosocial-drone-build
* sign
* linting, go fmt
* update swagger docs
* update swagger docs
* whitespace
* update contributing.md
* fuckin whoopsie doopsie
* linterino, linteroni
* fix followrequest test not starting processor
* fix other api/client tests not starting processor
* fix remaining tests where processor not started
* bump go-runners version
* don't check last-webfingered-at, processor may have updated this
* update swagger command
* update bun to latest version
* fix embed to work the same as before with new bun
Signed-off-by: kim <grufwub@gmail.com>
Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
Diffstat (limited to 'internal/typeutils/defaulticons.go')
| -rw-r--r-- | internal/typeutils/defaulticons.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/typeutils/defaulticons.go b/internal/typeutils/defaulticons.go index b2a9858af..3b0ce870c 100644 --- a/internal/typeutils/defaulticons.go +++ b/internal/typeutils/defaulticons.go @@ -19,8 +19,8 @@ package typeutils import ( - "io/ioutil" "math/rand" + "os" "path/filepath" "strings" @@ -45,7 +45,7 @@ func populateDefaultAvatars() (defaultAvatars []string) { } defaultAvatarsAbsFilePath := filepath.Join(webAssetsAbsFilePath, "default_avatars") - defaultAvatarFiles, err := ioutil.ReadDir(defaultAvatarsAbsFilePath) + defaultAvatarFiles, err := os.ReadDir(defaultAvatarsAbsFilePath) if err != nil { log.Warnf("populateDefaultAvatars: error reading default avatars at %s: %s", defaultAvatarsAbsFilePath, err) return @@ -58,7 +58,7 @@ func populateDefaultAvatars() (defaultAvatars []string) { } // ignore files bigger than 50kb - if f.Size() > 50000 { + if i, err := f.Info(); err != nil || i.Size() > 50000 { continue } |