mirror of
https://github.com/Eggbertx/gochan.git
synced 2025-08-02 15:06:23 -07:00
Fix front page thumbnails
This commit is contained in:
parent
0db91f277c
commit
a33a5a80c7
2 changed files with 10 additions and 5 deletions
|
@ -18,6 +18,7 @@ import (
|
||||||
"github.com/gochan-org/gochan/pkg/gcsql"
|
"github.com/gochan-org/gochan/pkg/gcsql"
|
||||||
"github.com/gochan-org/gochan/pkg/gctemplates"
|
"github.com/gochan-org/gochan/pkg/gctemplates"
|
||||||
"github.com/gochan-org/gochan/pkg/gcutil"
|
"github.com/gochan-org/gochan/pkg/gcutil"
|
||||||
|
"github.com/gochan-org/gochan/pkg/posting/uploads"
|
||||||
"github.com/gochan-org/gochan/pkg/server/serverutil"
|
"github.com/gochan-org/gochan/pkg/server/serverutil"
|
||||||
"github.com/rs/zerolog"
|
"github.com/rs/zerolog"
|
||||||
)
|
)
|
||||||
|
@ -117,6 +118,10 @@ func getFrontPagePosts(errEv *zerolog.Event) ([]frontPagePost, error) {
|
||||||
ThumbnailHeight: boardConfig.ThumbHeightReply,
|
ThumbnailHeight: boardConfig.ThumbHeightReply,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
if !strings.HasPrefix(post.Filename, "embed:") {
|
||||||
|
thumbnailFilename, _ := uploads.GetThumbnailFilenames(post.Filename)
|
||||||
|
post.ThumbURL = config.WebPath(post.Board, "thumb", thumbnailFilename)
|
||||||
|
}
|
||||||
|
|
||||||
if post.HasEmbed() {
|
if post.HasEmbed() {
|
||||||
if err = post.GetEmbedThumbURL(boardDir); err != nil {
|
if err = post.GetEmbedThumbURL(boardDir); err != nil {
|
||||||
|
|
|
@ -170,12 +170,12 @@ func doFrontBuildingTest(t *testing.T, mock sqlmock.Sqlmock) {
|
||||||
|
|
||||||
mockSetupBoards(mock)
|
mockSetupBoards(mock)
|
||||||
|
|
||||||
mock.ExpectPrepare(`SELECT id, message_raw, dir, filename, op_id FROM v_front_page_posts_with_file ORDER BY id DESC LIMIT 15`).ExpectQuery().WillReturnRows(
|
mock.ExpectPrepare(`SELECT id, message_raw, dir, filename, original_filename, op_id FROM v_front_page_posts_with_file ORDER BY id DESC LIMIT 15`).ExpectQuery().WillReturnRows(
|
||||||
sqlmock.NewRows([]string{"posts.id", "posts.message_raw", "dir", "filename", "op.id"}).
|
sqlmock.NewRows([]string{"posts.id", "posts.message_raw", "dir", "filename", "original_filename", "op.id"}).
|
||||||
AddRows(
|
AddRows(
|
||||||
[]driver.Value{1, "message_raw 1", "test", "filename.png", 1},
|
[]driver.Value{1, "message_raw 1", "test", "filename.png", "12345.png", 1},
|
||||||
[]driver.Value{2, "message_raw 2", "test", "", 1},
|
[]driver.Value{2, "message_raw 2", "test", "", "", 1},
|
||||||
[]driver.Value{3, "message_raw 3", "test", "deleted", 1},
|
[]driver.Value{3, "message_raw 4", "test", "deleted", "deleted", 1},
|
||||||
))
|
))
|
||||||
|
|
||||||
err := BuildFrontPage()
|
err := BuildFrontPage()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue