From f7ccda23e117c50b241cb8b93b62f62296c4ff51 Mon Sep 17 00:00:00 2001 From: Maddie Zhan Date: Thu, 5 Mar 2020 22:10:24 +0800 Subject: [PATCH] Draw processed string in share PNG when ISP info is not available --- results/telemetry.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/results/telemetry.go b/results/telemetry.go index 750844a..7835c16 100644 --- a/results/telemetry.go +++ b/results/telemetry.go @@ -321,12 +321,16 @@ func DrawPNG(w http.ResponseWriter, r *http.Request) { drawer.Face = orgFace drawer.Src = colorISP drawer.Dot = freetype.Pt(6, canvasHeight-ctx.PointToFixed(14).Round()-15) - removeRegexp := regexp.MustCompile(`AS\d+\s`) - org := removeRegexp.ReplaceAllString(result.RawISPInfo.Organization, "") - if result.RawISPInfo.Country != "" { - org += ", " + result.RawISPInfo.Country + if result.RawISPInfo.Organization != "" { + removeRegexp := regexp.MustCompile(`AS\d+\s`) + org := removeRegexp.ReplaceAllString(result.RawISPInfo.Organization, "") + if result.RawISPInfo.Country != "" { + org += ", " + result.RawISPInfo.Country + } + drawer.DrawString(org) + } else { + drawer.DrawString(result.ProcessedString) } - drawer.DrawString(org) w.Header().Set("Content-Disposition", "inline; filename="+uuid+".png") w.Header().Set("Content-Type", "image/png")