SQuiz/worker
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix var imgs
Some checks failed
Deploy / CreateImage (push) Successful in 2m55s
Details
Deploy / ValidateConfig (push) Successful in 27s
Details
Deploy / MigrateDatabase (push) Failing after 57s
Details
Deploy / DeployService (push) Has been skipped
Details

Browse Source
This commit is contained in:
pasha1coil 2025-06-29 18:08:11 +03:00
parent 011e63dfa1
commit e46acea3f1
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/senders/common.go
View File

@ -30,7 +30,7 @@ type TemplateData struct {
AllAnswers []model.ResultAnswer AllAnswers []model.ResultAnswer
QuestionsMap map[uint64]string QuestionsMap map[uint64]string
AnswerTime string AnswerTime string
QuizID int64 QuizID int64
} }
func generateTextFromTemplate(data TemplateData, tpl string) (string, error) { func generateTextFromTemplate(data TemplateData, tpl string) (string, error) {
@ -65,7 +65,7 @@ func RenderImage(content string) template.HTML {
contents := strings.Split(content, "`,`") contents := strings.Split(content, "`,`")
var builder strings.Builder var builder strings.Builder
content = strings.ReplaceAll(content, "\n","<br>") content = strings.ReplaceAll(content, "\n", "<br>")
for i, cnt := range contents { for i, cnt := range contents {
if i == 0 { if i == 0 {
cnt = strings.TrimPrefix(cnt, "`") cnt = strings.TrimPrefix(cnt, "`")
@ -79,7 +79,15 @@ func RenderImage(content string) template.HTML {
if err != nil { if err != nil {
return SplitContent(content) return SplitContent(content)
} else { } else {
builder.WriteString(fmt.Sprintf("<td>%s<br><img class=\"image\" style=\"width:100%%; max-width:250px; max-height:250px\" src=\"%s\"/></td>", res.Description, strings.Replace(res.Image, "http", "https", 1))) imgURL := res.Image
if strings.HasPrefix(imgURL, "http://") {
imgURL = strings.Replace(imgURL, "http://", "https://", 1)
}
builder.WriteString(
fmt.Sprintf(`<td style="color:#9a9aaf;font-size:20px;font-style:normal;font-weight:400;line-height:normal">
%s<br> <img class="image" style="width:100%%; max-width:250px; max-height:250px;" src="%s" alt="%s"/></td>`,
res.Description, imgURL, res.Description))
} }
} }

6
tests/smtp_test.go
View File

@ -62,10 +62,10 @@ func TestProcessMessageToSMTP(t *testing.T) {
Messenger: "test_messenger", Messenger: "test_messenger",
}, },
AllAnswers: []model.ResultAnswer{ AllAnswers: []model.ResultAnswer{
{AnswerID: 1, QuestionID: 1, Content: "https://www.google.com/search?sca_esv=c51a80de1a7d45f0&sxsrf=ACQVn08xG-a0eH1Vds246-fONoSvvjzVMw:1707762485524&q=ku,n&tbm=isch&source=lnms&sa=X&ved=2ahUKEwi7ub2Ct6aEAxVVb_UHHQIQBVoQ0pQJegQIDRAB&biw=1536&bih=703&dpr=1.25#imgrc=0PWwTuuH2uBQ3M|html", CreatedAt: time.Now()}, {AnswerID: 1, QuestionID: 1, Content: "`{\"Image\":\"https://s3.timeweb.cloud/3c580be9-cf31f296-d055-49cf-b39e-30c7959dc17b/squizimages/e0927ded-5c4c-4d45-a5ba-c2e938362ffa/co0sejfg4n3c73d5umd0\",\"Description\":\"Да\"}`", CreatedAt: time.Now()},
{AnswerID: 2, QuestionID: 2, Content: "From a friend", CreatedAt: time.Now()}, {AnswerID: 2, QuestionID: 2, Content: "`ыв`,`вв`", CreatedAt: time.Now()},
{AnswerID: 3, QuestionID: 3, Content: "From a friend", CreatedAt: time.Now()}, {AnswerID: 3, QuestionID: 3, Content: "From a friend", CreatedAt: time.Now()},
{AnswerID: 4, QuestionID: 4, Content: `{"Image":"https://letsenhance.io/static/8f5e523ee6b2479e26ecc91b9c25261e/1015f/MainAfter.jpg","Description":"Gekon"}`, CreatedAt: time.Now()}, {AnswerID: 4, QuestionID: 4, Content: `{"Image":"static.tildacdn.com/tild6335-6331-4539-a664-376366653534/_problembocom.jpg","Description":"Gekon"}`, CreatedAt: time.Now()},
}, },
QuestionsMap: map[uint64]string{ QuestionsMap: map[uint64]string{
1: "?", 1: "?",