diff options
Diffstat (limited to 'server/ui/controller')
| -rw-r--r-- | server/ui/controller/about.go | 4 | ||||
| -rw-r--r-- | server/ui/controller/category.go | 48 | ||||
| -rw-r--r-- | server/ui/controller/entry.go | 74 | ||||
| -rw-r--r-- | server/ui/controller/feed.go | 36 | ||||
| -rw-r--r-- | server/ui/controller/history.go | 10 | ||||
| -rw-r--r-- | server/ui/controller/icon.go | 6 | ||||
| -rw-r--r-- | server/ui/controller/login.go | 8 | ||||
| -rw-r--r-- | server/ui/controller/opml.go | 12 | ||||
| -rw-r--r-- | server/ui/controller/proxy.go | 8 | ||||
| -rw-r--r-- | server/ui/controller/session.go | 8 | ||||
| -rw-r--r-- | server/ui/controller/settings.go | 12 | ||||
| -rw-r--r-- | server/ui/controller/static.go | 2 | ||||
| -rw-r--r-- | server/ui/controller/subscription.go | 22 | ||||
| -rw-r--r-- | server/ui/controller/unread.go | 6 | ||||
| -rw-r--r-- | server/ui/controller/user.go | 50 |
15 files changed, 153 insertions, 153 deletions
diff --git a/server/ui/controller/about.go b/server/ui/controller/about.go index dcfe0d7a..5d9a2427 100644 --- a/server/ui/controller/about.go +++ b/server/ui/controller/about.go @@ -12,11 +12,11 @@ import ( func (c *Controller) AboutPage(ctx *core.Context, request *core.Request, response *core.Response) { args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("about", args.Merge(tplParams{ + response.HTML().Render("about", args.Merge(tplParams{ "version": version.Version, "build_date": version.BuildDate, "menu": "settings", diff --git a/server/ui/controller/category.go b/server/ui/controller/category.go index 6ac536bf..21e70fed 100644 --- a/server/ui/controller/category.go +++ b/server/ui/controller/category.go @@ -17,18 +17,18 @@ import ( func (c *Controller) ShowCategories(ctx *core.Context, request *core.Request, response *core.Response) { args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } user := ctx.GetLoggedUser() categories, err := c.store.GetCategoriesWithFeedCount(user.ID) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("categories", args.Merge(tplParams{ + response.HTML().Render("categories", args.Merge(tplParams{ "categories": categories, "total": len(categories), "menu": "categories", @@ -42,7 +42,7 @@ func (c *Controller) ShowCategoryEntries(ctx *core.Context, request *core.Reques args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -61,17 +61,17 @@ func (c *Controller) ShowCategoryEntries(ctx *core.Context, request *core.Reques entries, err := builder.GetEntries() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } count, err := builder.CountEntries() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("category_entries", args.Merge(tplParams{ + response.HTML().Render("category_entries", args.Merge(tplParams{ "category": category, "entries": entries, "total": count, @@ -84,11 +84,11 @@ func (c *Controller) ShowCategoryEntries(ctx *core.Context, request *core.Reques func (c *Controller) CreateCategory(ctx *core.Context, request *core.Request, response *core.Response) { args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("create_category", args.Merge(tplParams{ + response.HTML().Render("create_category", args.Merge(tplParams{ "menu": "categories", })) } @@ -98,13 +98,13 @@ func (c *Controller) SaveCategory(ctx *core.Context, request *core.Request, resp user := ctx.GetLoggedUser() args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } categoryForm := form.NewCategoryForm(request.Request()) if err := categoryForm.Validate(); err != nil { - response.Html().Render("create_category", args.Merge(tplParams{ + response.HTML().Render("create_category", args.Merge(tplParams{ "errorMessage": err.Error(), })) return @@ -112,12 +112,12 @@ func (c *Controller) SaveCategory(ctx *core.Context, request *core.Request, resp duplicateCategory, err := c.store.GetCategoryByTitle(user.ID, categoryForm.Title) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } if duplicateCategory != nil { - response.Html().Render("create_category", args.Merge(tplParams{ + response.HTML().Render("create_category", args.Merge(tplParams{ "errorMessage": "This category already exists.", })) return @@ -127,7 +127,7 @@ func (c *Controller) SaveCategory(ctx *core.Context, request *core.Request, resp err = c.store.CreateCategory(&category) if err != nil { log.Println(err) - response.Html().Render("create_category", args.Merge(tplParams{ + response.HTML().Render("create_category", args.Merge(tplParams{ "errorMessage": "Unable to create this category.", })) return @@ -148,11 +148,11 @@ func (c *Controller) EditCategory(ctx *core.Context, request *core.Request, resp args, err := c.getCategoryFormTemplateArgs(ctx, user, category, nil) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("edit_category", args) + response.HTML().Render("edit_category", args) } // UpdateCategory validate and update a category. @@ -168,19 +168,19 @@ func (c *Controller) UpdateCategory(ctx *core.Context, request *core.Request, re categoryForm := form.NewCategoryForm(request.Request()) args, err := c.getCategoryFormTemplateArgs(ctx, user, category, categoryForm) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } if err := categoryForm.Validate(); err != nil { - response.Html().Render("edit_category", args.Merge(tplParams{ + response.HTML().Render("edit_category", args.Merge(tplParams{ "errorMessage": err.Error(), })) return } if c.store.AnotherCategoryExists(user.ID, category.ID, categoryForm.Title) { - response.Html().Render("edit_category", args.Merge(tplParams{ + response.HTML().Render("edit_category", args.Merge(tplParams{ "errorMessage": "This category already exists.", })) return @@ -189,7 +189,7 @@ func (c *Controller) UpdateCategory(ctx *core.Context, request *core.Request, re err = c.store.UpdateCategory(categoryForm.Merge(category)) if err != nil { log.Println(err) - response.Html().Render("edit_category", args.Merge(tplParams{ + response.HTML().Render("edit_category", args.Merge(tplParams{ "errorMessage": "Unable to update this category.", })) return @@ -208,7 +208,7 @@ func (c *Controller) RemoveCategory(ctx *core.Context, request *core.Request, re } if err := c.store.RemoveCategory(user.ID, category.ID); err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -218,19 +218,19 @@ func (c *Controller) RemoveCategory(ctx *core.Context, request *core.Request, re func (c *Controller) getCategoryFromURL(ctx *core.Context, request *core.Request, response *core.Response) (*model.Category, error) { categoryID, err := request.IntegerParam("categoryID") if err != nil { - response.Html().BadRequest(err) + response.HTML().BadRequest(err) return nil, err } user := ctx.GetLoggedUser() category, err := c.store.GetCategory(user.ID, categoryID) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return nil, err } if category == nil { - response.Html().NotFound() + response.HTML().NotFound() return nil, errors.New("Category not found") } diff --git a/server/ui/controller/entry.go b/server/ui/controller/entry.go index 17e73c02..1a55a1df 100644 --- a/server/ui/controller/entry.go +++ b/server/ui/controller/entry.go @@ -20,13 +20,13 @@ func (c *Controller) ShowFeedEntry(ctx *core.Context, request *core.Request, res entryID, err := request.IntegerParam("entryID") if err != nil { - response.Html().BadRequest(err) + response.HTML().BadRequest(err) return } feedID, err := request.IntegerParam("feedID") if err != nil { - response.Html().BadRequest(err) + response.HTML().BadRequest(err) return } @@ -37,18 +37,18 @@ func (c *Controller) ShowFeedEntry(ctx *core.Context, request *core.Request, res entry, err := builder.GetEntry() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } if entry == nil { - response.Html().NotFound() + response.HTML().NotFound() return } args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -61,7 +61,7 @@ func (c *Controller) ShowFeedEntry(ctx *core.Context, request *core.Request, res builder.WithDirection(model.DefaultSortingDirection) nextEntry, err := builder.GetEntry() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -74,7 +74,7 @@ func (c *Controller) ShowFeedEntry(ctx *core.Context, request *core.Request, res builder.WithDirection(model.GetOppositeDirection(sortingDirection)) prevEntry, err := builder.GetEntry() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -91,12 +91,12 @@ func (c *Controller) ShowFeedEntry(ctx *core.Context, request *core.Request, res if entry.Status == model.EntryStatusUnread { err = c.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } } - response.Html().Render("entry", args.Merge(tplParams{ + response.HTML().Render("entry", args.Merge(tplParams{ "entry": entry, "prevEntry": prevEntry, "nextEntry": nextEntry, @@ -113,13 +113,13 @@ func (c *Controller) ShowCategoryEntry(ctx *core.Context, request *core.Request, categoryID, err := request.IntegerParam("categoryID") if err != nil { - response.Html().BadRequest(err) + response.HTML().BadRequest(err) return } entryID, err := request.IntegerParam("entryID") if err != nil { - response.Html().BadRequest(err) + response.HTML().BadRequest(err) return } @@ -130,18 +130,18 @@ func (c *Controller) ShowCategoryEntry(ctx *core.Context, request *core.Request, entry, err := builder.GetEntry() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } if entry == nil { - response.Html().NotFound() + response.HTML().NotFound() return } args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -154,7 +154,7 @@ func (c *Controller) ShowCategoryEntry(ctx *core.Context, request *core.Request, builder.WithDirection(sortingDirection) nextEntry, err := builder.GetEntry() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -167,7 +167,7 @@ func (c *Controller) ShowCategoryEntry(ctx *core.Context, request *core.Request, builder.WithDirection(model.GetOppositeDirection(sortingDirection)) prevEntry, err := builder.GetEntry() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -185,12 +185,12 @@ func (c *Controller) ShowCategoryEntry(ctx *core.Context, request *core.Request, err = c.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead) if err != nil { log.Println(err) - response.Html().ServerError(nil) + response.HTML().ServerError(nil) return } } - response.Html().Render("entry", args.Merge(tplParams{ + response.HTML().Render("entry", args.Merge(tplParams{ "entry": entry, "prevEntry": prevEntry, "nextEntry": nextEntry, @@ -207,7 +207,7 @@ func (c *Controller) ShowUnreadEntry(ctx *core.Context, request *core.Request, r entryID, err := request.IntegerParam("entryID") if err != nil { - response.Html().BadRequest(err) + response.HTML().BadRequest(err) return } @@ -217,18 +217,18 @@ func (c *Controller) ShowUnreadEntry(ctx *core.Context, request *core.Request, r entry, err := builder.GetEntry() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } if entry == nil { - response.Html().NotFound() + response.HTML().NotFound() return } args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -241,7 +241,7 @@ func (c *Controller) ShowUnreadEntry(ctx *core.Context, request *core.Request, r builder.WithDirection(sortingDirection) nextEntry, err := builder.GetEntry() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -254,7 +254,7 @@ func (c *Controller) ShowUnreadEntry(ctx *core.Context, request *core.Request, r builder.WithDirection(model.GetOppositeDirection(sortingDirection)) prevEntry, err := builder.GetEntry() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -272,12 +272,12 @@ func (c *Controller) ShowUnreadEntry(ctx *core.Context, request *core.Request, r err = c.store.SetEntriesStatus(user.ID, []int64{entry.ID}, model.EntryStatusRead) if err != nil { log.Println(err) - response.Html().ServerError(nil) + response.HTML().ServerError(nil) return } } - response.Html().Render("entry", args.Merge(tplParams{ + response.HTML().Render("entry", args.Merge(tplParams{ "entry": entry, "prevEntry": prevEntry, "nextEntry": nextEntry, @@ -294,7 +294,7 @@ func (c *Controller) ShowReadEntry(ctx *core.Context, request *core.Request, res entryID, err := request.IntegerParam("entryID") if err != nil { - response.Html().BadRequest(err) + response.HTML().BadRequest(err) return } @@ -304,18 +304,18 @@ func (c *Controller) ShowReadEntry(ctx *core.Context, request *core.Request, res entry, err := builder.GetEntry() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } if entry == nil { - response.Html().NotFound() + response.HTML().NotFound() return } args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -328,7 +328,7 @@ func (c *Controller) ShowReadEntry(ctx *core.Context, request *core.Request, res builder.WithDirection(sortingDirection) nextEntry, err := builder.GetEntry() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -341,7 +341,7 @@ func (c *Controller) ShowReadEntry(ctx *core.Context, request *core.Request, res builder.WithDirection(model.GetOppositeDirection(sortingDirection)) prevEntry, err := builder.GetEntry() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -355,7 +355,7 @@ func (c *Controller) ShowReadEntry(ctx *core.Context, request *core.Request, res prevEntryRoute = ctx.GetRoute("readEntry", "entryID", prevEntry.ID) } - response.Html().Render("entry", args.Merge(tplParams{ + response.HTML().Render("entry", args.Merge(tplParams{ "entry": entry, "prevEntry": prevEntry, "nextEntry": nextEntry, @@ -372,21 +372,21 @@ func (c *Controller) UpdateEntriesStatus(ctx *core.Context, request *core.Reques entryIDs, status, err := payload.DecodeEntryStatusPayload(request.Body()) if err != nil { log.Println(err) - response.Json().BadRequest(nil) + response.JSON().BadRequest(nil) return } if len(entryIDs) == 0 { - response.Json().BadRequest(errors.New("The list of entryID is empty")) + response.JSON().BadRequest(errors.New("The list of entryID is empty")) return } err = c.store.SetEntriesStatus(user.ID, entryIDs, status) if err != nil { log.Println(err) - response.Json().ServerError(nil) + response.JSON().ServerError(nil) return } - response.Json().Standard("OK") + response.JSON().Standard("OK") } diff --git a/server/ui/controller/feed.go b/server/ui/controller/feed.go index ac850fd8..044c7166 100644 --- a/server/ui/controller/feed.go +++ b/server/ui/controller/feed.go @@ -19,17 +19,17 @@ func (c *Controller) ShowFeedsPage(ctx *core.Context, request *core.Request, res args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } feeds, err := c.store.GetFeeds(user.ID) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("feeds", args.Merge(tplParams{ + response.HTML().Render("feeds", args.Merge(tplParams{ "feeds": feeds, "total": len(feeds), "menu": "feeds", @@ -43,7 +43,7 @@ func (c *Controller) ShowFeedEntries(ctx *core.Context, request *core.Request, r args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -62,17 +62,17 @@ func (c *Controller) ShowFeedEntries(ctx *core.Context, request *core.Request, r entries, err := builder.GetEntries() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } count, err := builder.CountEntries() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("feed_entries", args.Merge(tplParams{ + response.HTML().Render("feed_entries", args.Merge(tplParams{ "feed": feed, "entries": entries, "total": count, @@ -92,11 +92,11 @@ func (c *Controller) EditFeed(ctx *core.Context, request *core.Request, response args, err := c.getFeedFormTemplateArgs(ctx, user, feed, nil) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("edit_feed", args) + response.HTML().Render("edit_feed", args) } // UpdateFeed update a subscription and redirect to the feed entries page. @@ -111,12 +111,12 @@ func (c *Controller) UpdateFeed(ctx *core.Context, request *core.Request, respon feedForm := form.NewFeedForm(request.Request()) args, err := c.getFeedFormTemplateArgs(ctx, user, feed, feedForm) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } if err := feedForm.ValidateModification(); err != nil { - response.Html().Render("edit_feed", args.Merge(tplParams{ + response.HTML().Render("edit_feed", args.Merge(tplParams{ "errorMessage": err.Error(), })) return @@ -125,7 +125,7 @@ func (c *Controller) UpdateFeed(ctx *core.Context, request *core.Request, respon err = c.store.UpdateFeed(feedForm.Merge(feed)) if err != nil { log.Println(err) - response.Html().Render("edit_feed", args.Merge(tplParams{ + response.HTML().Render("edit_feed", args.Merge(tplParams{ "errorMessage": "Unable to update this feed.", })) return @@ -138,13 +138,13 @@ func (c *Controller) UpdateFeed(ctx *core.Context, request *core.Request, respon func (c *Controller) RemoveFeed(ctx *core.Context, request *core.Request, response *core.Response) { feedID, err := request.IntegerParam("feedID") if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } user := ctx.GetLoggedUser() if err := c.store.RemoveFeed(user.ID, feedID); err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -155,7 +155,7 @@ func (c *Controller) RemoveFeed(ctx *core.Context, request *core.Request, respon func (c *Controller) RefreshFeed(ctx *core.Context, request *core.Request, response *core.Response) { feedID, err := request.IntegerParam("feedID") if err != nil { - response.Html().BadRequest(err) + response.HTML().BadRequest(err) return } @@ -170,18 +170,18 @@ func (c *Controller) RefreshFeed(ctx *core.Context, request *core.Request, respo func (c *Controller) getFeedFromURL(request *core.Request, response *core.Response, user *model.User) (*model.Feed, error) { feedID, err := request.IntegerParam("feedID") if err != nil { - response.Html().BadRequest(err) + response.HTML().BadRequest(err) return nil, err } feed, err := c.store.GetFeedById(user.ID, feedID) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return nil, err } if feed == nil { - response.Html().NotFound() + response.HTML().NotFound() return nil, errors.New("Feed not found") } diff --git a/server/ui/controller/history.go b/server/ui/controller/history.go index 8f130745..dff78be1 100644 --- a/server/ui/controller/history.go +++ b/server/ui/controller/history.go @@ -16,7 +16,7 @@ func (c *Controller) ShowHistoryPage(ctx *core.Context, request *core.Request, r args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -29,17 +29,17 @@ func (c *Controller) ShowHistoryPage(ctx *core.Context, request *core.Request, r entries, err := builder.GetEntries() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } count, err := builder.CountEntries() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("history", args.Merge(tplParams{ + response.HTML().Render("history", args.Merge(tplParams{ "entries": entries, "total": count, "pagination": c.getPagination(ctx.GetRoute("history"), count, offset), @@ -53,7 +53,7 @@ func (c *Controller) FlushHistory(ctx *core.Context, request *core.Request, resp err := c.store.FlushHistory(user.ID) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } diff --git a/server/ui/controller/icon.go b/server/ui/controller/icon.go index 36e08b28..0fd85caf 100644 --- a/server/ui/controller/icon.go +++ b/server/ui/controller/icon.go @@ -12,18 +12,18 @@ import ( func (c *Controller) ShowIcon(ctx *core.Context, request *core.Request, response *core.Response) { iconID, err := request.IntegerParam("iconID") if err != nil { - response.Html().BadRequest(err) + response.HTML().BadRequest(err) return } icon, err := c.store.GetIconByID(iconID) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } if icon == nil { - response.Html().NotFound() + response.HTML().NotFound() return } diff --git a/server/ui/controller/login.go b/server/ui/controller/login.go index 2cb0c500..3bdb3209 100644 --- a/server/ui/controller/login.go +++ b/server/ui/controller/login.go @@ -20,7 +20,7 @@ func (c *Controller) ShowLoginPage(ctx *core.Context, request *core.Request, res return } - response.Html().Render("login", tplParams{ + response.HTML().Render("login", tplParams{ "csrf": ctx.GetCsrfToken(), }) } @@ -34,13 +34,13 @@ func (c *Controller) CheckLogin(ctx *core.Context, request *core.Request, respon if err := authForm.Validate(); err != nil { log.Println(err) - response.Html().Render("login", tplParams) + response.HTML().Render("login", tplParams) return } if err := c.store.CheckPassword(authForm.Username, authForm.Password); err != nil { log.Println(err) - response.Html().Render("login", tplParams) + response.HTML().Render("login", tplParams) return } @@ -50,7 +50,7 @@ func (c *Controller) CheckLogin(ctx *core.Context, request *core.Request, respon realip.RealIP(request.Request()), ) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } diff --git a/server/ui/controller/opml.go b/server/ui/controller/opml.go index 9801ec19..60e27679 100644 --- a/server/ui/controller/opml.go +++ b/server/ui/controller/opml.go @@ -14,21 +14,21 @@ func (c *Controller) Export(ctx *core.Context, request *core.Request, response * user := ctx.GetLoggedUser() opml, err := c.opmlHandler.Export(user.ID) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Xml().Download("feeds.opml", opml) + response.XML().Download("feeds.opml", opml) } func (c *Controller) Import(ctx *core.Context, request *core.Request, response *core.Response) { args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("import", args.Merge(tplParams{ + response.HTML().Render("import", args.Merge(tplParams{ "menu": "feeds", })) } @@ -48,11 +48,11 @@ func (c *Controller) UploadOPML(ctx *core.Context, request *core.Request, respon if impErr := c.opmlHandler.Import(user.ID, file); impErr != nil { args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("import", args.Merge(tplParams{ + response.HTML().Render("import", args.Merge(tplParams{ "errorMessage": impErr, "menu": "feeds", })) diff --git a/server/ui/controller/proxy.go b/server/ui/controller/proxy.go index 95e039a4..19a64366 100644 --- a/server/ui/controller/proxy.go +++ b/server/ui/controller/proxy.go @@ -18,26 +18,26 @@ import ( func (c *Controller) ImageProxy(ctx *core.Context, request *core.Request, response *core.Response) { encodedURL := request.StringParam("encodedURL", "") if encodedURL == "" { - response.Html().BadRequest(errors.New("No URL provided")) + response.HTML().BadRequest(errors.New("No URL provided")) return } decodedURL, err := base64.StdEncoding.DecodeString(encodedURL) if err != nil { - response.Html().BadRequest(errors.New("Unable to decode this URL")) + response.HTML().BadRequest(errors.New("Unable to decode this URL")) return } resp, err := http.Get(string(decodedURL)) if err != nil { log.Println(err) - response.Html().NotFound() + response.HTML().NotFound() return } defer resp.Body.Close() if resp.StatusCode != http.StatusOK { - response.Html().NotFound() + response.HTML().NotFound() return } diff --git a/server/ui/controller/session.go b/server/ui/controller/session.go index 385ee36d..9ec35066 100644 --- a/server/ui/controller/session.go +++ b/server/ui/controller/session.go @@ -13,18 +13,18 @@ func (c *Controller) ShowSessions(ctx *core.Context, request *core.Request, resp user := ctx.GetLoggedUser() args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } sessions, err := c.store.GetSessions(user.ID) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } sessionCookie := request.Cookie("sessionID") - response.Html().Render("sessions", args.Merge(tplParams{ + response.HTML().Render("sessions", args.Merge(tplParams{ "sessions": sessions, "currentSessionToken": sessionCookie, "menu": "settings", @@ -36,7 +36,7 @@ func (c *Controller) RemoveSession(ctx *core.Context, request *core.Request, res sessionID, err := request.IntegerParam("sessionID") if err != nil { - response.Html().BadRequest(err) + response.HTML().BadRequest(err) return } diff --git a/server/ui/controller/settings.go b/server/ui/controller/settings.go index 66c992c2..3e3b6b38 100644 --- a/server/ui/controller/settings.go +++ b/server/ui/controller/settings.go @@ -17,11 +17,11 @@ func (c *Controller) ShowSettings(ctx *core.Context, request *core.Request, resp args, err := c.getSettingsFormTemplateArgs(ctx, user, nil) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("settings", args) + response.HTML().Render("settings", args) } func (c *Controller) UpdateSettings(ctx *core.Context, request *core.Request, response *core.Response) { @@ -30,12 +30,12 @@ func (c *Controller) UpdateSettings(ctx *core.Context, request *core.Request, re settingsForm := form.NewSettingsForm(request.Request()) args, err := c.getSettingsFormTemplateArgs(ctx, user, settingsForm) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } if err := settingsForm.Validate(); err != nil { - response.Html().Render("settings", args.Merge(tplParams{ + response.HTML().Render("settings", args.Merge(tplParams{ "form": settingsForm, "errorMessage": err.Error(), })) @@ -43,7 +43,7 @@ func (c *Controller) UpdateSettings(ctx *core.Context, request *core.Request, re } if c.store.AnotherUserExists(user.ID, settingsForm.Username) { - response.Html().Render("settings", args.Merge(tplParams{ + response.HTML().Render("settings", args.Merge(tplParams{ "form": settingsForm, "errorMessage": "This user already exists.", })) @@ -53,7 +53,7 @@ func (c *Controller) UpdateSettings(ctx *core.Context, request *core.Request, re err = c.store.UpdateUser(settingsForm.Merge(user)) if err != nil { log.Println(err) - response.Html().Render("settings", args.Merge(tplParams{ + response.HTML().Render("settings", args.Merge(tplParams{ "form": settingsForm, "errorMessage": "Unable to update this user.", })) diff --git a/server/ui/controller/static.go b/server/ui/controller/static.go index a8513501..822118a3 100644 --- a/server/ui/controller/static.go +++ b/server/ui/controller/static.go @@ -33,7 +33,7 @@ func (c *Controller) Favicon(ctx *core.Context, request *core.Request, response blob, err := base64.StdEncoding.DecodeString(static.Binaries["favicon.ico"]) if err != nil { log.Println(err) - response.Html().NotFound() + response.HTML().NotFound() return } diff --git a/server/ui/controller/subscription.go b/server/ui/controller/subscription.go index 88fa077a..a9473bdc 100644 --- a/server/ui/controller/subscription.go +++ b/server/ui/controller/subscription.go @@ -17,11 +17,11 @@ func (c *Controller) AddSubscription(ctx *core.Context, request *core.Request, r args, err := c.getSubscriptionFormTemplateArgs(ctx, user) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("add_subscription", args) + response.HTML().Render("add_subscription", args) } func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request, response *core.Response) { @@ -29,13 +29,13 @@ func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request args, err := c.getSubscriptionFormTemplateArgs(ctx, user) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } subscriptionForm := form.NewSubscriptionForm(request.Request()) if err := subscriptionForm.Validate(); err != nil { - response.Html().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err.Error(), })) @@ -45,7 +45,7 @@ func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request subscriptions, err := subscription.FindSubscriptions(subscriptionForm.URL) if err != nil { log.Println(err) - response.Html().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err, })) @@ -57,14 +57,14 @@ func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request n := len(subscriptions) switch { case n == 0: - response.Html().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": "Unable to find any subscription.", })) case n == 1: feed, err := c.feedHandler.CreateFeed(user.ID, subscriptionForm.CategoryID, subscriptions[0].URL) if err != nil { - response.Html().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err, })) @@ -73,7 +73,7 @@ func (c *Controller) SubmitSubscription(ctx *core.Context, request *core.Request response.Redirect(ctx.GetRoute("feedEntries", "feedID", feed.ID)) case n > 1: - response.Html().Render("choose_subscription", args.Merge(tplParams{ + response.HTML().Render("choose_subscription", args.Merge(tplParams{ "categoryID": subscriptionForm.CategoryID, "subscriptions": subscriptions, })) @@ -85,13 +85,13 @@ func (c *Controller) ChooseSubscription(ctx *core.Context, request *core.Request args, err := c.getSubscriptionFormTemplateArgs(ctx, user) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } subscriptionForm := form.NewSubscriptionForm(request.Request()) if err := subscriptionForm.Validate(); err != nil { - response.Html().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err.Error(), })) @@ -100,7 +100,7 @@ func (c *Controller) ChooseSubscription(ctx *core.Context, request *core.Request feed, err := c.feedHandler.CreateFeed(user.ID, subscriptionForm.CategoryID, subscriptionForm.URL) if err != nil { - response.Html().Render("add_subscription", args.Merge(tplParams{ + response.HTML().Render("add_subscription", args.Merge(tplParams{ "form": subscriptionForm, "errorMessage": err, })) diff --git a/server/ui/controller/unread.go b/server/ui/controller/unread.go index 59bd9dd5..8457cf44 100644 --- a/server/ui/controller/unread.go +++ b/server/ui/controller/unread.go @@ -23,17 +23,17 @@ func (c *Controller) ShowUnreadPage(ctx *core.Context, request *core.Request, re entries, err := builder.GetEntries() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } countUnread, err := builder.CountEntries() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("unread", tplParams{ + response.HTML().Render("unread", tplParams{ "user": user, "countUnread": countUnread, "entries": entries, diff --git a/server/ui/controller/user.go b/server/ui/controller/user.go index ad6f68f9..01c786ff 100644 --- a/server/ui/controller/user.go +++ b/server/ui/controller/user.go @@ -16,23 +16,23 @@ func (c *Controller) ShowUsers(ctx *core.Context, request *core.Request, respons user := ctx.GetLoggedUser() if !user.IsAdmin { - response.Html().Forbidden() + response.HTML().Forbidden() return } args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } users, err := c.store.GetUsers() if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("users", args.Merge(tplParams{ + response.HTML().Render("users", args.Merge(tplParams{ "users": users, "menu": "settings", })) @@ -42,17 +42,17 @@ func (c *Controller) CreateUser(ctx *core.Context, request *core.Request, respon user := ctx.GetLoggedUser() if !user.IsAdmin { - response.Html().Forbidden() + response.HTML().Forbidden() return } args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } - response.Html().Render("create_user", args.Merge(tplParams{ + response.HTML().Render("create_user", args.Merge(tplParams{ "menu": "settings", "form": &form.UserForm{}, })) @@ -62,19 +62,19 @@ func (c *Controller) SaveUser(ctx *core.Context, request *core.Request, response user := ctx.GetLoggedUser() if !user.IsAdmin { - response.Html().Forbidden() + response.HTML().Forbidden() return } args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } userForm := form.NewUserForm(request.Request()) if err := userForm.ValidateCreation(); err != nil { - response.Html().Render("create_user", args.Merge(tplParams{ + response.HTML().Render("create_user", args.Merge(tplParams{ "menu": "settings", "form": userForm, "errorMessage": err.Error(), @@ -83,7 +83,7 @@ func (c *Controller) SaveUser(ctx *core.Context, request *core.Request, response } if c.store.UserExists(userForm.Username) { - response.Html().Render("create_user", args.Merge(tplParams{ + response.HTML().Render("create_user", args.Merge(tplParams{ "menu": "settings", "form": userForm, "errorMessage": "This user already exists.", @@ -94,7 +94,7 @@ func (c *Controller) SaveUser(ctx *core.Context, request *core.Request, response newUser := userForm.ToUser() if err := c.store.CreateUser(newUser); err != nil { log.Println(err) - response.Html().Render("edit_user", args.Merge(tplParams{ + response.HTML().Render("edit_user", args.Merge(tplParams{ "menu": "settings", "form": userForm, "errorMessage": "Unable to create this user.", @@ -109,13 +109,13 @@ func (c *Controller) EditUser(ctx *core.Context, request *core.Request, response user := ctx.GetLoggedUser() if !user.IsAdmin { - response.Html().Forbidden() + response.HTML().Forbidden() return } args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -124,7 +124,7 @@ func (c *Controller) EditUser(ctx *core.Context, request *core.Request, response return } - response.Html().Render("edit_user", args.Merge(tplParams{ + response.HTML().Render("edit_user", args.Merge(tplParams{ "menu": "settings", "selected_user": selectedUser, "form": &form.UserForm{ @@ -138,13 +138,13 @@ func (c *Controller) UpdateUser(ctx *core.Context, request *core.Request, respon user := ctx.GetLoggedUser() if !user.IsAdmin { - response.Html().Forbidden() + response.HTML().Forbidden() return } args, err := c.getCommonTemplateArgs(ctx) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -155,7 +155,7 @@ func (c *Controller) UpdateUser(ctx *core.Context, request *core.Request, respon userForm := form.NewUserForm(request.Request()) if err := userForm.ValidateModification(); err != nil { - response.Html().Render("edit_user", args.Merge(tplParams{ + response.HTML().Render("edit_user", args.Merge(tplParams{ "menu": "settings", "selected_user": selectedUser, "form": userForm, @@ -165,7 +165,7 @@ func (c *Controller) UpdateUser(ctx *core.Context, request *core.Request, respon } if c.store.AnotherUserExists(selectedUser.ID, userForm.Username) { - response.Html().Render("edit_user", args.Merge(tplParams{ + response.HTML().Render("edit_user", args.Merge(tplParams{ "menu": "settings", "selected_user": selectedUser, "form": userForm, @@ -177,7 +177,7 @@ func (c *Controller) UpdateUser(ctx *core.Context, request *core.Request, respon userForm.Merge(selectedUser) if err := c.store.UpdateUser(selectedUser); err != nil { log.Println(err) - response.Html().Render("edit_user", args.Merge(tplParams{ + response.HTML().Render("edit_user", args.Merge(tplParams{ "menu": "settings", "selected_user": selectedUser, "form": userForm, @@ -192,7 +192,7 @@ func (c *Controller) UpdateUser(ctx *core.Context, request *core.Request, respon func (c *Controller) RemoveUser(ctx *core.Context, request *core.Request, response *core.Response) { user := ctx.GetLoggedUser() if !user.IsAdmin { - response.Html().Forbidden() + response.HTML().Forbidden() return } @@ -202,7 +202,7 @@ func (c *Controller) RemoveUser(ctx *core.Context, request *core.Request, respon } if err := c.store.RemoveUser(selectedUser.ID); err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return } @@ -212,18 +212,18 @@ func (c *Controller) RemoveUser(ctx *core.Context, request *core.Request, respon func (c *Controller) getUserFromURL(ctx *core.Context, request *core.Request, response *core.Response) (*model.User, error) { userID, err := request.IntegerParam("userID") if err != nil { - response.Html().BadRequest(err) + response.HTML().BadRequest(err) return nil, err } user, err := c.store.GetUserById(userID) if err != nil { - response.Html().ServerError(err) + response.HTML().ServerError(err) return nil, err } if user == nil { - response.Html().NotFound() + response.HTML().NotFound() return nil, errors.New("User not found") } |