From 6fee55dcff976f3eeae5879fe91d2f27780d0da4 Mon Sep 17 00:00:00 2001 From: tobi Date: Wed, 15 Oct 2025 18:57:57 +0200 Subject: [chore] Rationalize HTTP return codes for fedi endpoints, other tidying up (#4503) # Description > If this is a code change, please include a summary of what you've coded, and link to the issue(s) it closes/implements. > > If this is a documentation change, please briefly describe what you've changed and why. This pull request does some refactoring of the fedi API endpoints and processing functions, and the authenticate + pub key deref functions, to try to return fewer silly HTTP codes like 410 Gone (when a *remote* account is gone, not a local one), and 500 errors where something isn't really an error. Also does some general tidying up and renaming for consistency. ## Checklist Please put an x inside each checkbox to indicate that you've read and followed it: `[ ]` -> `[x]` If this is a documentation change, only the first checkbox must be filled (you can delete the others if you want). - [x] I/we have read the [GoToSocial contribution guidelines](https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md). - [x] I/we have discussed the proposed changes already, either in an issue on the repository, or in the Matrix chat. - [x] I/we have not leveraged AI to create the proposed changes. - [x] I/we have performed a self-review of added code. - [x] I/we have written code that is legible and maintainable by others. - [x] I/we have commented the added code, particularly in hard-to-understand areas. - [ ] I/we have made any necessary changes to documentation. - [ ] I/we have added tests that cover new code. - [x] I/we have run tests and they pass locally with the changes. - [x] I/we have run `go fmt ./...` and `golangci-lint run`. Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4503 Co-authored-by: tobi Co-committed-by: tobi --- internal/processing/fedi/accept.go | 57 -------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 internal/processing/fedi/accept.go (limited to 'internal/processing/fedi/accept.go') diff --git a/internal/processing/fedi/accept.go b/internal/processing/fedi/accept.go deleted file mode 100644 index 97e36fbb3..000000000 --- a/internal/processing/fedi/accept.go +++ /dev/null @@ -1,57 +0,0 @@ -// GoToSocial -// Copyright (C) GoToSocial Authors admin@gotosocial.org -// SPDX-License-Identifier: AGPL-3.0-or-later -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see . - -package fedi - -import ( - "context" - - "code.superseriousbusiness.org/gotosocial/internal/ap" - "code.superseriousbusiness.org/gotosocial/internal/gtserror" -) - -// AcceptGet handles the getting of a fedi/activitypub -// representation of a local interaction acceptance. -// -// It performs appropriate authentication before -// returning a JSON serializable interface. -func (p *Processor) AcceptGet( - ctx context.Context, - requestedUser string, - intReqID string, -) (any, gtserror.WithCode) { - // Ensure valid request, intReq exists, etc. - intReq, errWithCode := p.validateIntReqRequest(ctx, requestedUser, intReqID) - if errWithCode != nil { - return nil, errWithCode - } - - // Convert + serialize the Accept. - accept, err := p.converter.InteractionReqToASAccept(ctx, intReq) - if err != nil { - err := gtserror.Newf("error converting to accept: %w", err) - return nil, gtserror.NewErrorInternalError(err) - } - - data, err := ap.Serialize(accept) - if err != nil { - err := gtserror.Newf("error serializing accept: %w", err) - return nil, gtserror.NewErrorInternalError(err) - } - - return data, nil -} -- cgit v1.2.3