From 0734c66fca03e231c941319eea468c5e130c4630 Mon Sep 17 00:00:00 2001 From: Umputun Date: Wed, 2 May 2018 02:27:47 -0500 Subject: [PATCH] pass dataservice to importer/exporter --- app/main.go | 6 +++--- app/rest/api/admin.go | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/main.go b/app/main.go index fc927ab7..40db0c83 100644 --- a/app/main.go +++ b/app/main.go @@ -82,7 +82,7 @@ func main() { return sess }() - exporter := migrator.Remark{CommentFinder: dataStore} + exporter := migrator.Remark{CommentFinder: &dataService} cache := rest.NewLoadingCache(4*time.Hour, 15*time.Minute, postFlushFn) activateBackup(&exporter) @@ -90,8 +90,8 @@ func main() { importSrv := api.Import{ Version: revision, Cache: cache, - NativeImporter: &migrator.Remark{CommentCreator: dataStore}, - DisqusImporter: &migrator.Disqus{CommentCreator: dataStore}, + NativeImporter: &migrator.Remark{CommentCreator: &dataService}, + DisqusImporter: &migrator.Disqus{CommentCreator: &dataService}, } go importSrv.Run(opts.Port + 1) diff --git a/app/rest/api/admin.go b/app/rest/api/admin.go index 3ed95a8f..4f4c93f6 100644 --- a/app/rest/api/admin.go +++ b/app/rest/api/admin.go @@ -136,11 +136,6 @@ func (a *admin) alterComments(comments []store.Comment, r *http.Request) (res [] c.Deleted = true } - // set default avatar - if c.User.Picture == "" { - c.User.Picture = a.defAvatarURL - } - // hide info from non-admins if !isAdmin { c.User.IP = ""