Skip to content
This repository was archived by the owner on Dec 17, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
github.com/nicklaw5/helix v1.25.0
github.com/prometheus/client_golang v1.12.2
github.com/seventv/common v0.0.0-20220717080931-d0a5974fbcd3
github.com/seventv/image-processor/go v0.0.0-20220712225504-0d39b09d2a87
github.com/seventv/image-processor/go v0.0.0-20220717125033-bf54c62116c2
github.com/seventv/message-queue/go v0.0.0-20220623223012-800919900c0d
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.12.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -403,12 +403,12 @@ github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d h1:Q+gqLBOPkFGHyCJx
github.com/savsgio/gotils v0.0.0-20220530130905-52f3993e8d6d/go.mod h1:Gy+0tqhJvgGlqnTF8CVGP0AaGRjwBtXs/a5PA0Y3+A4=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/seventv/common v0.0.0-20220716123220-374cdb3888ee h1:7STVGGFQmgKOQ6AbgJCNpxUNXEg5TMrffjL6iEM2dWA=
github.com/seventv/common v0.0.0-20220716123220-374cdb3888ee/go.mod h1:OkdKTP7KfHIveCqdDkD9CmMVn6pysV0qn6azfY8BiP0=
github.com/seventv/common v0.0.0-20220717080931-d0a5974fbcd3 h1:oPEgRViDT/2BzUD7hpjixegtE5ShUNEE02XiktzEvxU=
github.com/seventv/common v0.0.0-20220717080931-d0a5974fbcd3/go.mod h1:OkdKTP7KfHIveCqdDkD9CmMVn6pysV0qn6azfY8BiP0=
github.com/seventv/image-processor/go v0.0.0-20220712225504-0d39b09d2a87 h1:P6te/LP1tXJimUWsaFmDch6Hx8UJOhJ+QybWIFtREVM=
github.com/seventv/image-processor/go v0.0.0-20220712225504-0d39b09d2a87/go.mod h1:CM/CucY8KjNSBTJ00/x4xzzbgAvbDgiZcZjM/gxDHRQ=
github.com/seventv/image-processor/go v0.0.0-20220717125033-bf54c62116c2 h1:yRuIABJ6SQCLYmRSyP20Vq/J9ak3lDxhPE6gYXBh2As=
github.com/seventv/image-processor/go v0.0.0-20220717125033-bf54c62116c2/go.mod h1:CM/CucY8KjNSBTJ00/x4xzzbgAvbDgiZcZjM/gxDHRQ=
github.com/seventv/message-queue/go v0.0.0-20220623223012-800919900c0d h1:A3LaacuowEN3oKAkQZakz4eK90bafCSurxMSp4zUnHk=
github.com/seventv/message-queue/go v0.0.0-20220623223012-800919900c0d/go.mod h1:L1iYDSmltUnxlVGX9RayCoVi3e8aNtFrrLJL6Jv+mrM=
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
Expand Down
9 changes: 5 additions & 4 deletions internal/rest/v3/routes/emotes/emotes.create.go
Original file line number Diff line number Diff line change
Expand Up @@ -276,10 +276,11 @@ func (r *create) Handler(ctx *rest.Ctx) rest.APIError {
Key: filekey,
},
Output: task.TaskOutput{
Prefix: r.Ctx.Inst().S3.ComposeKey("emote", id.Hex()),
Bucket: r.Ctx.Config().S3.PublicBucket,
ACL: *s3.AclPublicRead,
CacheControl: *s3.DefaultCacheControl,
Prefix: r.Ctx.Inst().S3.ComposeKey("emote", id.Hex()),
Bucket: r.Ctx.Config().S3.PublicBucket,
ACL: *s3.AclPublicRead,
CacheControl: *s3.DefaultCacheControl,
ExcludeFileExtension: true,
},
SmallestMaxWidth: 96,
SmallestMaxHeight: 32,
Expand Down