From 4e2895aa2dea449a4783e3d96af3bb6d70d3d751 Mon Sep 17 00:00:00 2001 From: Umputun Date: Mon, 13 Aug 2018 21:47:39 -0500 Subject: [PATCH] simplify wp converter, no need in special struct --- backend/app/migrator/wordpress.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/backend/app/migrator/wordpress.go b/backend/app/migrator/wordpress.go index 5b2913b8..4596d603 100644 --- a/backend/app/migrator/wordpress.go +++ b/backend/app/migrator/wordpress.go @@ -52,10 +52,8 @@ func (w *wpTime) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { return err } -// wpCommentConverter implements store.CommentConverter -type wpCommentConverter struct{} - -func (wpCommentConverter) Convert(text string) string { +// Convert satisfies formatter.CommentConverter +func (w *WordPress) Convert(text string) string { return html.UnescapeString(text) // sanitize remains on comment create } @@ -99,8 +97,7 @@ func (w *WordPress) convert(r io.Reader, siteID string) chan store.Comment { rejectedComments int // not approved }{} - commentConverter := new(wpCommentConverter) - commentFormatter := store.NewCommentFormatter(commentConverter) + commentFormatter := store.NewCommentFormatter(w) go func() { for {