knadh/listmonk
1
1
Fork 0
mirror of https://github.com/knadh/listmonk.git synced 2025-01-07 23:12:04 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix broken public link redirect.

Browse source
This commit is contained in:
Kailash Nadh 2022-05-05 18:05:13 +05:30
parent 5fd4d7b44b
commit b94da621d7
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/public.go
View file

@ -353,8 +353,8 @@ func handleLinkRedirect(c echo.Context) error {
subUUID = "" subUUID = ""
} }
var url string url, err := app.core.RegisterCampaignLinkClick(linkUUID, campUUID, subUUID)
if err := app.core.RegisterCampaignLinkClick(linkUUID, campUUID, subUUID); err != nil { if err != nil {
e := err.(*echo.HTTPError) e := err.(*echo.HTTPError)
return c.Render(e.Code, tplMessage, makeMsgTpl(app.i18n.T("public.errorTitle"), "", e.Error())) return c.Render(e.Code, tplMessage, makeMsgTpl(app.i18n.T("public.errorTitle"), "", e.Error()))
} }

12
internal/core/campaigns.go
View file

@ -329,14 +329,16 @@ func (c *Core) RegisterCampaignView(campUUID, subUUID string) error {
} }
// RegisterCampaignLinkClick registers a subscriber's link click on a campaign. // RegisterCampaignLinkClick registers a subscriber's link click on a campaign.
func (c *Core) RegisterCampaignLinkClick(linkUUID, campUUID, subUUID string) error { func (c *Core) RegisterCampaignLinkClick(linkUUID, campUUID, subUUID string) (string, error) {
if _, err := c.q.RegisterLinkClick.Exec(linkUUID, campUUID, subUUID); err != nil { var url string
if err := c.q.RegisterLinkClick.Get(&url, linkUUID, campUUID, subUUID); err != nil {
if pqErr, ok := err.(*pq.Error); ok && pqErr.Column == "link_id" { if pqErr, ok := err.(*pq.Error); ok && pqErr.Column == "link_id" {
return echo.NewHTTPError(http.StatusBadRequest, c.i18n.Ts("public.invalidLink")) return "", echo.NewHTTPError(http.StatusBadRequest, c.i18n.Ts("public.invalidLink"))
} }
c.log.Printf("error registering link click: %s", err) c.log.Printf("error registering link click: %s", err)
return echo.NewHTTPError(http.StatusInternalServerError, c.i18n.Ts("public.errorProcessingRequest")) return "", echo.NewHTTPError(http.StatusInternalServerError, c.i18n.Ts("public.errorProcessingRequest"))
} }
return nil
return url, nil
} }