mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 00:32:25 -05:00 
			
		
		
		
	[chore] Prefer JSON errors in API endpoints (#1766)
* Default to JSON over HTML for error handling * Change the default error display for web endpoints to html
This commit is contained in:
		
					parent
					
						
							
								265cc32516
							
						
					
				
			
			
				commit
				
					
						ba5a464ca5
					
				
			
		
					 11 changed files with 50 additions and 44 deletions
				
			
		|  | @ -88,7 +88,8 @@ func genericErrorHandler(c *gin.Context, instanceGet func(ctx context.Context) ( | ||||||
| // the caller prefers to see an html page with the error rendered there. If not, or | // the caller prefers to see an html page with the error rendered there. If not, or | ||||||
| // if something goes wrong during the function, it will recover and just try to serve | // if something goes wrong during the function, it will recover and just try to serve | ||||||
| // an appropriate application/json content-type error. | // an appropriate application/json content-type error. | ||||||
| func ErrorHandler(c *gin.Context, errWithCode gtserror.WithCode, instanceGet func(ctx context.Context) (*apimodel.InstanceV1, gtserror.WithCode)) { | // To override the default response type, specify `offers`. | ||||||
|  | func ErrorHandler(c *gin.Context, errWithCode gtserror.WithCode, instanceGet func(ctx context.Context) (*apimodel.InstanceV1, gtserror.WithCode), offers ...MIME) { | ||||||
| 	// set the error on the gin context so that it can be logged | 	// set the error on the gin context so that it can be logged | ||||||
| 	// in the gin logger middleware (internal/router/logger.go) | 	// in the gin logger middleware (internal/router/logger.go) | ||||||
| 	c.Error(errWithCode) //nolint:errcheck | 	c.Error(errWithCode) //nolint:errcheck | ||||||
|  | @ -97,7 +98,7 @@ func ErrorHandler(c *gin.Context, errWithCode gtserror.WithCode, instanceGet fun | ||||||
| 	// or if we should just use a json. Normally we would want to | 	// or if we should just use a json. Normally we would want to | ||||||
| 	// check for a returned error, but if an error occurs here we | 	// check for a returned error, but if an error occurs here we | ||||||
| 	// can just fall back to default behavior (serve json error). | 	// can just fall back to default behavior (serve json error). | ||||||
| 	accept, _ := NegotiateAccept(c, HTMLOrJSONAcceptHeaders...) | 	accept, _ := NegotiateAccept(c, JSONOrHTMLAcceptHeaders...) | ||||||
| 
 | 
 | ||||||
| 	if errWithCode.Code() == http.StatusNotFound { | 	if errWithCode.Code() == http.StatusNotFound { | ||||||
| 		// use our special not found handler with useful status text | 		// use our special not found handler with useful status text | ||||||
|  | @ -107,6 +108,11 @@ func ErrorHandler(c *gin.Context, errWithCode gtserror.WithCode, instanceGet fun | ||||||
| 	} | 	} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | // WebErrorHandler is like ErrorHandler, but will display HTML over JSON by default. | ||||||
|  | func WebErrorHandler(c *gin.Context, errWithCode gtserror.WithCode, instanceGet func(ctx context.Context) (*apimodel.InstanceV1, gtserror.WithCode)) { | ||||||
|  | 	ErrorHandler(c, errWithCode, instanceGet, TextHTML, AppJSON) | ||||||
|  | } | ||||||
|  | 
 | ||||||
| // OAuthErrorHandler is a lot like ErrorHandler, but it specifically returns errors | // OAuthErrorHandler is a lot like ErrorHandler, but it specifically returns errors | ||||||
| // that are compatible with https://datatracker.ietf.org/doc/html/rfc6749#section-5.2, | // that are compatible with https://datatracker.ietf.org/doc/html/rfc6749#section-5.2, | ||||||
| // but serializing errWithCode.Error() in the 'error' field, and putting any help text | // but serializing errWithCode.Error() in the 'error' field, and putting any help text | ||||||
|  |  | ||||||
|  | @ -44,12 +44,12 @@ var WebfingerJSONAcceptHeaders = []MIME{ | ||||||
| 	AppJSON, | 	AppJSON, | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // HTMLOrJSONAcceptHeaders is a slice of offers that prefers TextHTML and will | // JSONOrHTMLAcceptHeaders is a slice of offers that prefers AppJSON and will | ||||||
| // fall back to JSON if necessary. This is useful for error handling, since it can | // fall back to HTML if necessary. This is useful for error handling, since it can | ||||||
| // be used to serve a nice HTML page if the caller accepts that, or just JSON if not. | // be used to serve a nice HTML page if the caller accepts that, or just JSON if not. | ||||||
| var HTMLOrJSONAcceptHeaders = []MIME{ | var JSONOrHTMLAcceptHeaders = []MIME{ | ||||||
| 	TextHTML, |  | ||||||
| 	AppJSON, | 	AppJSON, | ||||||
|  | 	TextHTML, | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // HTMLAcceptHeaders is a slice of offers that just contains text/html types. | // HTMLAcceptHeaders is a slice of offers that just contains text/html types. | ||||||
|  |  | ||||||
|  | @ -33,7 +33,7 @@ const ( | ||||||
| func (m *Module) aboutGETHandler(c *gin.Context) { | func (m *Module) aboutGETHandler(c *gin.Context) { | ||||||
| 	instance, err := m.processor.InstanceGetV1(c.Request.Context()) | 	instance, err := m.processor.InstanceGetV1(c.Request.Context()) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -36,7 +36,7 @@ func (m *Module) baseHandler(c *gin.Context) { | ||||||
| 
 | 
 | ||||||
| 	instance, err := m.processor.InstanceGetV1(c.Request.Context()) | 	instance, err := m.processor.InstanceGetV1(c.Request.Context()) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -32,19 +32,19 @@ func (m *Module) confirmEmailGETHandler(c *gin.Context) { | ||||||
| 	// if there's no token in the query, just serve the 404 web handler | 	// if there's no token in the query, just serve the 404 web handler | ||||||
| 	token := c.Query(tokenParam) | 	token := c.Query(tokenParam) | ||||||
| 	if token == "" { | 	if token == "" { | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorNotFound(errors.New(http.StatusText(http.StatusNotFound))), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorNotFound(errors.New(http.StatusText(http.StatusNotFound))), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	user, errWithCode := m.processor.User().EmailConfirm(ctx, token) | 	user, errWithCode := m.processor.User().EmailConfirm(ctx, token) | ||||||
| 	if errWithCode != nil { | 	if errWithCode != nil { | ||||||
| 		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	instance, err := m.processor.InstanceGetV1(ctx) | 	instance, err := m.processor.InstanceGetV1(ctx) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -33,12 +33,12 @@ const textCSSUTF8 = string(apiutil.TextCSS + "; charset=utf-8") | ||||||
| func (m *Module) customCSSGETHandler(c *gin.Context) { | func (m *Module) customCSSGETHandler(c *gin.Context) { | ||||||
| 	if !config.GetAccountsAllowCustomCSS() { | 	if !config.GetAccountsAllowCustomCSS() { | ||||||
| 		err := errors.New("accounts-allow-custom-css is not enabled on this instance") | 		err := errors.New("accounts-allow-custom-css is not enabled on this instance") | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorNotFound(err), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorNotFound(err), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if _, err := apiutil.NegotiateAccept(c, apiutil.TextCSS); err != nil { | 	if _, err := apiutil.NegotiateAccept(c, apiutil.TextCSS); err != nil { | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -46,13 +46,13 @@ func (m *Module) customCSSGETHandler(c *gin.Context) { | ||||||
| 	username := strings.ToLower(c.Param(usernameKey)) | 	username := strings.ToLower(c.Param(usernameKey)) | ||||||
| 	if username == "" { | 	if username == "" { | ||||||
| 		err := errors.New("no account username specified") | 		err := errors.New("no account username specified") | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	customCSS, errWithCode := m.processor.Account().GetCustomCSSForUsername(c.Request.Context(), username) | 	customCSS, errWithCode := m.processor.Account().GetCustomCSSForUsername(c.Request.Context(), username) | ||||||
| 	if errWithCode != nil { | 	if errWithCode != nil { | ||||||
| 		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -35,25 +35,25 @@ const ( | ||||||
| func (m *Module) domainBlockListGETHandler(c *gin.Context) { | func (m *Module) domainBlockListGETHandler(c *gin.Context) { | ||||||
| 	authed, err := oauth.Authed(c, false, false, false, false) | 	authed, err := oauth.Authed(c, false, false, false, false) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if !config.GetInstanceExposeSuspendedWeb() && (authed.Account == nil || authed.User == nil) { | 	if !config.GetInstanceExposeSuspendedWeb() && (authed.Account == nil || authed.User == nil) { | ||||||
| 		err := fmt.Errorf("this instance does not expose the list of suspended domains publicly") | 		err := fmt.Errorf("this instance does not expose the list of suspended domains publicly") | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	instance, err := m.processor.InstanceGetV1(c.Request.Context()) | 	instance, err := m.processor.InstanceGetV1(c.Request.Context()) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	domainBlocks, errWithCode := m.processor.InstancePeersGet(c.Request.Context(), true, false, false) | 	domainBlocks, errWithCode := m.processor.InstancePeersGet(c.Request.Context(), true, false, false) | ||||||
| 	if errWithCode != nil { | 	if errWithCode != nil { | ||||||
| 		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -44,20 +44,20 @@ func (m *Module) profileGETHandler(c *gin.Context) { | ||||||
| 
 | 
 | ||||||
| 	authed, err := oauth.Authed(c, false, false, false, false) | 	authed, err := oauth.Authed(c, false, false, false, false) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	username := strings.ToLower(c.Param(usernameKey)) | 	username := strings.ToLower(c.Param(usernameKey)) | ||||||
| 	if username == "" { | 	if username == "" { | ||||||
| 		err := errors.New("no account username specified") | 		err := errors.New("no account username specified") | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	instance, err := m.processor.InstanceGetV1(ctx) | 	instance, err := m.processor.InstanceGetV1(ctx) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -67,7 +67,7 @@ func (m *Module) profileGETHandler(c *gin.Context) { | ||||||
| 
 | 
 | ||||||
| 	account, errWithCode := m.processor.Account().GetLocalByUsername(ctx, authed.Account, username) | 	account, errWithCode := m.processor.Account().GetLocalByUsername(ctx, authed.Account, username) | ||||||
| 	if errWithCode != nil { | 	if errWithCode != nil { | ||||||
| 		apiutil.ErrorHandler(c, errWithCode, instanceGet) | 		apiutil.WebErrorHandler(c, errWithCode, instanceGet) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -105,7 +105,7 @@ func (m *Module) profileGETHandler(c *gin.Context) { | ||||||
| 
 | 
 | ||||||
| 	statusResp, errWithCode := m.processor.Account().WebStatusesGet(ctx, account.ID, maxStatusID) | 	statusResp, errWithCode := m.processor.Account().WebStatusesGet(ctx, account.ID, maxStatusID) | ||||||
| 	if errWithCode != nil { | 	if errWithCode != nil { | ||||||
| 		apiutil.ErrorHandler(c, errWithCode, instanceGet) | 		apiutil.WebErrorHandler(c, errWithCode, instanceGet) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -116,7 +116,7 @@ func (m *Module) profileGETHandler(c *gin.Context) { | ||||||
| 	if !paging { | 	if !paging { | ||||||
| 		pinnedResp, errWithCode = m.processor.Account().StatusesGet(ctx, authed.Account, account.ID, 0, false, false, "", "", true, false, false) | 		pinnedResp, errWithCode = m.processor.Account().StatusesGet(ctx, authed.Account, account.ID, 0, false, false, "", "", true, false, false) | ||||||
| 		if errWithCode != nil { | 		if errWithCode != nil { | ||||||
| 			apiutil.ErrorHandler(c, errWithCode, instanceGet) | 			apiutil.WebErrorHandler(c, errWithCode, instanceGet) | ||||||
| 			return | 			return | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  | @ -158,14 +158,14 @@ func (m *Module) returnAPProfile(ctx context.Context, c *gin.Context, username s | ||||||
| 
 | 
 | ||||||
| 	user, errWithCode := m.processor.Fedi().UserGet(ctx, username, c.Request.URL) | 	user, errWithCode := m.processor.Fedi().UserGet(ctx, username, c.Request.URL) | ||||||
| 	if errWithCode != nil { | 	if errWithCode != nil { | ||||||
| 		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) //nolint:contextcheck | 		apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1) //nolint:contextcheck | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	b, mErr := json.Marshal(user) | 	b, mErr := json.Marshal(user) | ||||||
| 	if mErr != nil { | 	if mErr != nil { | ||||||
| 		err := fmt.Errorf("could not marshal json: %s", mErr) | 		err := fmt.Errorf("could not marshal json: %s", mErr) | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) //nolint:contextcheck | 		apiutil.WebErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) //nolint:contextcheck | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -83,7 +83,7 @@ func (m *Module) rssFeedGETHandler(c *gin.Context) { | ||||||
| 	ctx := c.Request.Context() | 	ctx := c.Request.Context() | ||||||
| 
 | 
 | ||||||
| 	if _, err := apiutil.NegotiateAccept(c, apiutil.AppRSSXML); err != nil { | 	if _, err := apiutil.NegotiateAccept(c, apiutil.AppRSSXML); err != nil { | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -91,7 +91,7 @@ func (m *Module) rssFeedGETHandler(c *gin.Context) { | ||||||
| 	username := strings.ToLower(c.Param(usernameKey)) | 	username := strings.ToLower(c.Param(usernameKey)) | ||||||
| 	if username == "" { | 	if username == "" { | ||||||
| 		err := errors.New("no account username specified") | 		err := errors.New("no account username specified") | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -100,7 +100,7 @@ func (m *Module) rssFeedGETHandler(c *gin.Context) { | ||||||
| 
 | 
 | ||||||
| 	getRssFeed, accountLastPostedPublic, errWithCode := m.processor.Account().GetRSSFeedForUsername(ctx, username) | 	getRssFeed, accountLastPostedPublic, errWithCode := m.processor.Account().GetRSSFeedForUsername(ctx, username) | ||||||
| 	if errWithCode != nil { | 	if errWithCode != nil { | ||||||
| 		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -112,13 +112,13 @@ func (m *Module) rssFeedGETHandler(c *gin.Context) { | ||||||
| 		// we either have no cache entry for this, or we have an expired cache entry; generate a new one | 		// we either have no cache entry for this, or we have an expired cache entry; generate a new one | ||||||
| 		rssFeed, errWithCode = getRssFeed() | 		rssFeed, errWithCode = getRssFeed() | ||||||
| 		if errWithCode != nil { | 		if errWithCode != nil { | ||||||
| 			apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) | 			apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1) | ||||||
| 			return | 			return | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
| 		eTag, err := generateEtag(bytes.NewBufferString(rssFeed)) | 		eTag, err := generateEtag(bytes.NewBufferString(rssFeed)) | ||||||
| 		if err != nil { | 		if err != nil { | ||||||
| 			apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | 			apiutil.WebErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | ||||||
| 			return | 			return | ||||||
| 		} | 		} | ||||||
| 
 | 
 | ||||||
|  | @ -146,7 +146,7 @@ func (m *Module) rssFeedGETHandler(c *gin.Context) { | ||||||
| 		// we had a cache entry already so we didn't call to get the rss feed yet | 		// we had a cache entry already so we didn't call to get the rss feed yet | ||||||
| 		rssFeed, errWithCode = getRssFeed() | 		rssFeed, errWithCode = getRssFeed() | ||||||
| 		if errWithCode != nil { | 		if errWithCode != nil { | ||||||
| 			apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) | 			apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1) | ||||||
| 			return | 			return | ||||||
| 		} | 		} | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
|  | @ -28,7 +28,7 @@ import ( | ||||||
| func (m *Module) SettingsPanelHandler(c *gin.Context) { | func (m *Module) SettingsPanelHandler(c *gin.Context) { | ||||||
| 	instance, err := m.processor.InstanceGetV1(c.Request.Context()) | 	instance, err := m.processor.InstanceGetV1(c.Request.Context()) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -39,7 +39,7 @@ func (m *Module) threadGETHandler(c *gin.Context) { | ||||||
| 
 | 
 | ||||||
| 	authed, err := oauth.Authed(c, false, false, false, false) | 	authed, err := oauth.Authed(c, false, false, false, false) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -47,7 +47,7 @@ func (m *Module) threadGETHandler(c *gin.Context) { | ||||||
| 	username := strings.ToLower(c.Param(usernameKey)) | 	username := strings.ToLower(c.Param(usernameKey)) | ||||||
| 	if username == "" { | 	if username == "" { | ||||||
| 		err := errors.New("no account username specified") | 		err := errors.New("no account username specified") | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -55,13 +55,13 @@ func (m *Module) threadGETHandler(c *gin.Context) { | ||||||
| 	statusID := strings.ToUpper(c.Param(statusIDKey)) | 	statusID := strings.ToUpper(c.Param(statusIDKey)) | ||||||
| 	if statusID == "" { | 	if statusID == "" { | ||||||
| 		err := errors.New("no status id specified") | 		err := errors.New("no status id specified") | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	instance, err := m.processor.InstanceGetV1(ctx) | 	instance, err := m.processor.InstanceGetV1(ctx) | ||||||
| 	if err != nil { | 	if err != nil { | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -72,19 +72,19 @@ func (m *Module) threadGETHandler(c *gin.Context) { | ||||||
| 	// do this check to make sure the status is actually from a local account, | 	// do this check to make sure the status is actually from a local account, | ||||||
| 	// we shouldn't render threads from statuses that don't belong to us! | 	// we shouldn't render threads from statuses that don't belong to us! | ||||||
| 	if _, errWithCode := m.processor.Account().GetLocalByUsername(ctx, authed.Account, username); errWithCode != nil { | 	if _, errWithCode := m.processor.Account().GetLocalByUsername(ctx, authed.Account, username); errWithCode != nil { | ||||||
| 		apiutil.ErrorHandler(c, errWithCode, instanceGet) | 		apiutil.WebErrorHandler(c, errWithCode, instanceGet) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	status, errWithCode := m.processor.Status().Get(ctx, authed.Account, statusID) | 	status, errWithCode := m.processor.Status().Get(ctx, authed.Account, statusID) | ||||||
| 	if errWithCode != nil { | 	if errWithCode != nil { | ||||||
| 		apiutil.ErrorHandler(c, errWithCode, instanceGet) | 		apiutil.WebErrorHandler(c, errWithCode, instanceGet) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	if !strings.EqualFold(username, status.Account.Username) { | 	if !strings.EqualFold(username, status.Account.Username) { | ||||||
| 		err := gtserror.NewErrorNotFound(errors.New("path username not equal to status author username")) | 		err := gtserror.NewErrorNotFound(errors.New("path username not equal to status author username")) | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorNotFound(err), instanceGet) | 		apiutil.WebErrorHandler(c, gtserror.NewErrorNotFound(err), instanceGet) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -98,7 +98,7 @@ func (m *Module) threadGETHandler(c *gin.Context) { | ||||||
| 
 | 
 | ||||||
| 	context, errWithCode := m.processor.Status().ContextGet(ctx, authed.Account, statusID) | 	context, errWithCode := m.processor.Status().ContextGet(ctx, authed.Account, statusID) | ||||||
| 	if errWithCode != nil { | 	if errWithCode != nil { | ||||||
| 		apiutil.ErrorHandler(c, errWithCode, instanceGet) | 		apiutil.WebErrorHandler(c, errWithCode, instanceGet) | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  | @ -133,14 +133,14 @@ func (m *Module) returnAPStatus(ctx context.Context, c *gin.Context, username st | ||||||
| 
 | 
 | ||||||
| 	status, errWithCode := m.processor.Fedi().StatusGet(ctx, username, statusID) | 	status, errWithCode := m.processor.Fedi().StatusGet(ctx, username, statusID) | ||||||
| 	if errWithCode != nil { | 	if errWithCode != nil { | ||||||
| 		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) //nolint:contextcheck | 		apiutil.WebErrorHandler(c, errWithCode, m.processor.InstanceGetV1) //nolint:contextcheck | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| 	b, mErr := json.Marshal(status) | 	b, mErr := json.Marshal(status) | ||||||
| 	if mErr != nil { | 	if mErr != nil { | ||||||
| 		err := fmt.Errorf("could not marshal json: %s", mErr) | 		err := fmt.Errorf("could not marshal json: %s", mErr) | ||||||
| 		apiutil.ErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) //nolint:contextcheck | 		apiutil.WebErrorHandler(c, gtserror.NewErrorInternalError(err), m.processor.InstanceGetV1) //nolint:contextcheck | ||||||
| 		return | 		return | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue