Skip to content

Commit a4a1f4d

Browse files
committed
fix: modpack logos work properly
1 parent 8592e38 commit a4a1f4d

1 file changed

Lines changed: 17 additions & 10 deletions

File tree

gql/resolver_modpacks.go

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,21 +129,15 @@ func (r *mutationResolver) CreateModpack(ctx context.Context, newModpack generat
129129
}
130130
}
131131

132-
return err
133-
}, nil); err != nil {
134-
return nil, err
135-
}
136-
137-
// Handle logo upload
138-
if newModpack.Logo != nil {
132+
if newModpack.Logo != nil {
139133
file, err := io.ReadAll(newModpack.Logo.File)
140134
if err != nil {
141-
return nil, fmt.Errorf("failed to read logo file: %w", err)
135+
return fmt.Errorf("failed to read logo file: %w", err)
142136
}
143137

144138
logoData, thumbHash, err := converter.ConvertAnyImageToWebp(ctx, file)
145139
if err != nil {
146-
return nil, fmt.Errorf("failed to convert logo file: %w", err)
140+
return fmt.Errorf("failed to convert logo file: %w", err)
147141
}
148142

149143
logoKey, err := storage.UploadModpackLogo(ctx, resultModpack.ID, bytes.NewReader(logoData))
@@ -153,11 +147,16 @@ func (r *mutationResolver) CreateModpack(ctx context.Context, newModpack generat
153147
SetLogoThumbhash(thumbHash).
154148
Save(ctx)
155149
if err != nil {
156-
return nil, err
150+
return err
157151
}
158152
}
159153
}
160154

155+
return err
156+
}, nil); err != nil {
157+
return nil, err
158+
}
159+
161160
// Get the modpack again with all relationships
162161
resultModpack, err = db.From(ctx).Modpack.Query().
163162
WithTags().
@@ -203,17 +202,25 @@ func (r *mutationResolver) UpdateModpack(ctx context.Context, modpackID string,
203202
}
204203

205204
if updatedModpack.Logo != nil {
205+
println("Updating logo for modpack", resultModpack.ID)
206206
file, err := io.ReadAll(updatedModpack.Logo.File)
207207
if err != nil {
208208
return nil, fmt.Errorf("failed to read logo file: %w", err)
209209
}
210210

211+
println("Read logo file, size:", len(file))
212+
211213
logoData, thumbHash, err := converter.ConvertAnyImageToWebp(ctx, file)
212214
if err != nil {
213215
return nil, fmt.Errorf("failed to convert logo file: %w", err)
214216
}
215217

218+
println("Converted logo to webp, size:", len(logoData))
219+
216220
logoKey, err := storage.UploadModpackLogo(ctx, resultModpack.ID, bytes.NewReader(logoData))
221+
222+
println("Uploaded logo, key:", logoKey, "error:", err)
223+
217224
if err == nil {
218225
resultModpack, err = resultModpack.Update().
219226
SetLogo(storage.GenerateDownloadLink(ctx, logoKey)).

0 commit comments

Comments
 (0)