diff options
Diffstat (limited to 'internal/api/client/admin')
20 files changed, 32 insertions, 24 deletions
diff --git a/internal/api/client/admin/accountaction.go b/internal/api/client/admin/accountaction.go index 91186ae73..89bcf644e 100644 --- a/internal/api/client/admin/accountaction.go +++ b/internal/api/client/admin/accountaction.go @@ -124,5 +124,7 @@ func (m *Module) AccountActionPOSTHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, gin.H{"message": "OK"}) + apiutil.JSON(c, http.StatusOK, map[string]string{ + "message": "OK", + }) } diff --git a/internal/api/client/admin/domainkeysexpire.go b/internal/api/client/admin/domainkeysexpire.go index 73a811dd4..10a7597a4 100644 --- a/internal/api/client/admin/domainkeysexpire.go +++ b/internal/api/client/admin/domainkeysexpire.go @@ -132,7 +132,9 @@ func (m *Module) DomainKeysExpirePOSTHandler(c *gin.Context) { return } - c.JSON(http.StatusAccepted, &apimodel.AdminActionResponse{ActionID: actionID}) + apiutil.JSON(c, http.StatusOK, &apimodel.AdminActionResponse{ + ActionID: actionID, + }) } func validateDomainKeysExpire(form *apimodel.DomainKeysExpireRequest) error { diff --git a/internal/api/client/admin/domainpermission.go b/internal/api/client/admin/domainpermission.go index 203eddc8b..05319086f 100644 --- a/internal/api/client/admin/domainpermission.go +++ b/internal/api/client/admin/domainpermission.go @@ -122,7 +122,7 @@ func (m *Module) createDomainPermissions( return } - c.JSON(http.StatusOK, domainBlock) + apiutil.JSON(c, http.StatusOK, domainBlock) return } @@ -158,7 +158,7 @@ func (m *Module) createDomainPermissions( domainPerms = append(domainPerms, entry.Resource) } - c.JSON(http.StatusOK, domainPerms) + apiutil.JSON(c, http.StatusOK, domainPerms) } // deleteDomainPermission deletes a single domain permission (block or allow). @@ -200,7 +200,7 @@ func (m *Module) deleteDomainPermission( return } - c.JSON(http.StatusOK, domainPerm) + apiutil.JSON(c, http.StatusOK, domainPerm) } // getDomainPermission gets a single domain permission (block or allow). @@ -248,7 +248,7 @@ func (m *Module) getDomainPermission( return } - c.JSON(http.StatusOK, domainPerm) + apiutil.JSON(c, http.StatusOK, domainPerm) } // getDomainPermissions gets all domain permissions of the given type (block, allow). @@ -290,5 +290,5 @@ func (m *Module) getDomainPermissions( return } - c.JSON(http.StatusOK, domainPerm) + apiutil.JSON(c, http.StatusOK, domainPerm) } diff --git a/internal/api/client/admin/emailtest.go b/internal/api/client/admin/emailtest.go index 5c5330679..8f274e226 100644 --- a/internal/api/client/admin/emailtest.go +++ b/internal/api/client/admin/emailtest.go @@ -116,5 +116,7 @@ func (m *Module) EmailTestPOSTHandler(c *gin.Context) { return } - c.JSON(http.StatusAccepted, gin.H{"status": "test email sent"}) + apiutil.JSON(c, http.StatusAccepted, map[string]string{ + "status": "test email sent", + }) } diff --git a/internal/api/client/admin/emojicategoriesget.go b/internal/api/client/admin/emojicategoriesget.go index 9597f789c..2c097c6df 100644 --- a/internal/api/client/admin/emojicategoriesget.go +++ b/internal/api/client/admin/emojicategoriesget.go @@ -89,5 +89,5 @@ func (m *Module) EmojiCategoriesGETHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, categories) + apiutil.JSON(c, http.StatusOK, categories) } diff --git a/internal/api/client/admin/emojicreate.go b/internal/api/client/admin/emojicreate.go index e98ef754e..d916a76c1 100644 --- a/internal/api/client/admin/emojicreate.go +++ b/internal/api/client/admin/emojicreate.go @@ -131,7 +131,7 @@ func (m *Module) EmojiCreatePOSTHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, apiEmoji) + apiutil.JSON(c, http.StatusOK, apiEmoji) } func validateCreateEmoji(form *apimodel.EmojiCreateRequest) error { diff --git a/internal/api/client/admin/emojidelete.go b/internal/api/client/admin/emojidelete.go index 8d388a409..b5cf72daf 100644 --- a/internal/api/client/admin/emojidelete.go +++ b/internal/api/client/admin/emojidelete.go @@ -105,5 +105,5 @@ func (m *Module) EmojiDELETEHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, emoji) + apiutil.JSON(c, http.StatusOK, emoji) } diff --git a/internal/api/client/admin/emojiget.go b/internal/api/client/admin/emojiget.go index 349747b6b..710094551 100644 --- a/internal/api/client/admin/emojiget.go +++ b/internal/api/client/admin/emojiget.go @@ -95,5 +95,5 @@ func (m *Module) EmojiGETHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, emoji) + apiutil.JSON(c, http.StatusOK, emoji) } diff --git a/internal/api/client/admin/emojisget.go b/internal/api/client/admin/emojisget.go index c0ae90004..212401117 100644 --- a/internal/api/client/admin/emojisget.go +++ b/internal/api/client/admin/emojisget.go @@ -206,5 +206,6 @@ func (m *Module) EmojisGETHandler(c *gin.Context) { if resp.LinkHeader != "" { c.Header("Link", resp.LinkHeader) } - c.JSON(http.StatusOK, resp.Items) + + apiutil.JSON(c, http.StatusOK, resp.Items) } diff --git a/internal/api/client/admin/emojiupdate.go b/internal/api/client/admin/emojiupdate.go index 49f8c3414..f531f36f9 100644 --- a/internal/api/client/admin/emojiupdate.go +++ b/internal/api/client/admin/emojiupdate.go @@ -161,7 +161,7 @@ func (m *Module) EmojiPATCHHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, emoji) + apiutil.JSON(c, http.StatusOK, emoji) } // do a first pass on the form here diff --git a/internal/api/client/admin/mediacleanup.go b/internal/api/client/admin/mediacleanup.go index 3ef3c1441..7a0ee4bd6 100644 --- a/internal/api/client/admin/mediacleanup.go +++ b/internal/api/client/admin/mediacleanup.go @@ -102,5 +102,5 @@ func (m *Module) MediaCleanupPOSTHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, remoteCacheDays) + apiutil.JSON(c, http.StatusOK, remoteCacheDays) } diff --git a/internal/api/client/admin/mediarefetch.go b/internal/api/client/admin/mediarefetch.go index 2c57d3b95..1c0da6dea 100644 --- a/internal/api/client/admin/mediarefetch.go +++ b/internal/api/client/admin/mediarefetch.go @@ -88,5 +88,5 @@ func (m *Module) MediaRefetchPOSTHandler(c *gin.Context) { return } - c.Status(http.StatusAccepted) + apiutil.Data(c, http.StatusOK, apiutil.AppJSON, apiutil.StatusAcceptedJSON) } diff --git a/internal/api/client/admin/reportget.go b/internal/api/client/admin/reportget.go index 55425f53a..f70ae8b54 100644 --- a/internal/api/client/admin/reportget.go +++ b/internal/api/client/admin/reportget.go @@ -98,5 +98,5 @@ func (m *Module) ReportGETHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, report) + apiutil.JSON(c, http.StatusOK, report) } diff --git a/internal/api/client/admin/reportresolve.go b/internal/api/client/admin/reportresolve.go index fdd4f8449..9c1c32afe 100644 --- a/internal/api/client/admin/reportresolve.go +++ b/internal/api/client/admin/reportresolve.go @@ -120,5 +120,5 @@ func (m *Module) ReportResolvePOSTHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, report) + apiutil.JSON(c, http.StatusOK, report) } diff --git a/internal/api/client/admin/reportsget.go b/internal/api/client/admin/reportsget.go index cffa578f4..394962f6b 100644 --- a/internal/api/client/admin/reportsget.go +++ b/internal/api/client/admin/reportsget.go @@ -176,5 +176,6 @@ func (m *Module) ReportsGETHandler(c *gin.Context) { if resp.LinkHeader != "" { c.Header("Link", resp.LinkHeader) } - c.JSON(http.StatusOK, resp.Items) + + apiutil.JSON(c, http.StatusOK, resp.Items) } diff --git a/internal/api/client/admin/rulecreate.go b/internal/api/client/admin/rulecreate.go index 7792233f6..e838bff1e 100644 --- a/internal/api/client/admin/rulecreate.go +++ b/internal/api/client/admin/rulecreate.go @@ -108,7 +108,7 @@ func (m *Module) RulePOSTHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, apiRule) + apiutil.JSON(c, http.StatusOK, apiRule) } func validateCreateRule(form *apimodel.InstanceRuleCreateRequest) error { diff --git a/internal/api/client/admin/ruledelete.go b/internal/api/client/admin/ruledelete.go index 7281ed62e..dfa84615f 100644 --- a/internal/api/client/admin/ruledelete.go +++ b/internal/api/client/admin/ruledelete.go @@ -103,5 +103,5 @@ func (m *Module) RuleDELETEHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, apiRule) + apiutil.JSON(c, http.StatusOK, apiRule) } diff --git a/internal/api/client/admin/ruleget.go b/internal/api/client/admin/ruleget.go index 444820a3f..8281092fb 100644 --- a/internal/api/client/admin/ruleget.go +++ b/internal/api/client/admin/ruleget.go @@ -98,5 +98,5 @@ func (m *Module) RuleGETHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, rule) + apiutil.JSON(c, http.StatusOK, rule) } diff --git a/internal/api/client/admin/rulesget.go b/internal/api/client/admin/rulesget.go index 56f83866f..2cc9e0158 100644 --- a/internal/api/client/admin/rulesget.go +++ b/internal/api/client/admin/rulesget.go @@ -87,5 +87,5 @@ func (m *Module) RulesGETHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, resp) + apiutil.JSON(c, http.StatusOK, resp) } diff --git a/internal/api/client/admin/ruleupdate.go b/internal/api/client/admin/ruleupdate.go index 82ed41190..eafa3af34 100644 --- a/internal/api/client/admin/ruleupdate.go +++ b/internal/api/client/admin/ruleupdate.go @@ -123,5 +123,5 @@ func (m *Module) RulePATCHHandler(c *gin.Context) { return } - c.JSON(http.StatusOK, apiRule) + apiutil.JSON(c, http.StatusOK, apiRule) } |