Fix incorrect 'get subscriber' calls
This commit is contained in:
parent
e90fb1d88d
commit
97b78aa695
|
@ -118,15 +118,14 @@ func handleViewCampaignMessage(c echo.Context) error {
|
|||
}
|
||||
|
||||
// Get the subscriber.
|
||||
var sub models.Subscriber
|
||||
if err := app.queries.GetSubscriber.Get(&sub, 0, subUUID); err != nil {
|
||||
sub, err := getSubscriber(0, subUUID, "", app)
|
||||
if err != nil {
|
||||
if err == sql.ErrNoRows {
|
||||
return c.Render(http.StatusNotFound, tplMessage,
|
||||
makeMsgTpl(app.i18n.T("public.notFoundTitle"), "",
|
||||
app.i18n.T("public.errorFetchingEmail")))
|
||||
}
|
||||
|
||||
app.log.Printf("error fetching campaign subscriber: %v", err)
|
||||
return c.Render(http.StatusInternalServerError, tplMessage,
|
||||
makeMsgTpl(app.i18n.T("public.errorTitle"), "",
|
||||
app.i18n.Ts("public.errorFetchingCampaign")))
|
||||
|
|
|
@ -338,7 +338,6 @@ func handleSubscriberSendOptin(c echo.Context) error {
|
|||
var (
|
||||
app = c.Get("app").(*App)
|
||||
id, _ = strconv.Atoi(c.Param("id"))
|
||||
out models.Subscribers
|
||||
)
|
||||
|
||||
if id < 1 {
|
||||
|
@ -346,19 +345,15 @@ func handleSubscriberSendOptin(c echo.Context) error {
|
|||
}
|
||||
|
||||
// Fetch the subscriber.
|
||||
err := app.queries.GetSubscriber.Select(&out, id, nil)
|
||||
out, err := getSubscriber(id, "", "", app)
|
||||
if err != nil {
|
||||
app.log.Printf("error fetching subscriber: %v", err)
|
||||
return echo.NewHTTPError(http.StatusInternalServerError,
|
||||
app.i18n.Ts("globals.messages.errorFetching",
|
||||
"name", "{globals.terms.subscribers}", "error", pqErrMsg(err)))
|
||||
}
|
||||
if len(out) == 0 {
|
||||
return echo.NewHTTPError(http.StatusBadRequest,
|
||||
app.i18n.Ts("globals.messages.notFound", "name", "{globals.terms.subscriber}"))
|
||||
}
|
||||
|
||||
if _, err := sendOptinConfirmation(out[0], nil, app); err != nil {
|
||||
if _, err := sendOptinConfirmation(out, nil, app); err != nil {
|
||||
return echo.NewHTTPError(http.StatusInternalServerError,
|
||||
app.i18n.T("subscribers.errorSendingOptin"))
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue