diff options
Diffstat (limited to 'internal/api')
-rw-r--r-- | internal/api/activitypub/users/inboxpost_test.go | 4 | ||||
-rw-r--r-- | internal/api/client/accounts/accountalias.go | 99 | ||||
-rw-r--r-- | internal/api/client/accounts/accountmove.go | 97 | ||||
-rw-r--r-- | internal/api/client/accounts/accounts.go | 6 | ||||
-rw-r--r-- | internal/api/model/account.go | 20 | ||||
-rw-r--r-- | internal/api/model/source.go | 5 |
6 files changed, 229 insertions, 2 deletions
diff --git a/internal/api/activitypub/users/inboxpost_test.go b/internal/api/activitypub/users/inboxpost_test.go index cde807d8d..2791f8110 100644 --- a/internal/api/activitypub/users/inboxpost_test.go +++ b/internal/api/activitypub/users/inboxpost_test.go @@ -392,8 +392,8 @@ func (suite *InboxPostTestSuite) TestPostUpdate() { suite.EqualValues(requestingAccount.HeaderRemoteURL, dbUpdatedAccount.HeaderRemoteURL) suite.EqualValues(requestingAccount.Note, dbUpdatedAccount.Note) suite.EqualValues(requestingAccount.Memorial, dbUpdatedAccount.Memorial) - suite.EqualValues(requestingAccount.AlsoKnownAs, dbUpdatedAccount.AlsoKnownAs) - suite.EqualValues(requestingAccount.MovedToAccountID, dbUpdatedAccount.MovedToAccountID) + suite.EqualValues(requestingAccount.AlsoKnownAsURIs, dbUpdatedAccount.AlsoKnownAsURIs) + suite.EqualValues(requestingAccount.MovedToURI, dbUpdatedAccount.MovedToURI) suite.EqualValues(requestingAccount.Bot, dbUpdatedAccount.Bot) suite.EqualValues(requestingAccount.Reason, dbUpdatedAccount.Reason) suite.EqualValues(requestingAccount.Locked, dbUpdatedAccount.Locked) diff --git a/internal/api/client/accounts/accountalias.go b/internal/api/client/accounts/accountalias.go new file mode 100644 index 000000000..3f869c0d6 --- /dev/null +++ b/internal/api/client/accounts/accountalias.go @@ -0,0 +1,99 @@ +// 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 <http://www.gnu.org/licenses/>. + +package accounts + +import ( + "net/http" + + "github.com/gin-gonic/gin" + apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" + apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" + "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "github.com/superseriousbusiness/gotosocial/internal/oauth" +) + +// AccountAliasPOSTHandler swagger:operation POST /api/v1/accounts/alias accountAlias +// +// Alias your account to another account by setting alsoKnownAs to the given URI. +// +// This is useful when you want to move from another account this this account. +// +// In such cases, you should set the alsoKnownAs of this account to the URI of +// the account you want to move from. +// +// --- +// tags: +// - accounts +// +// consumes: +// - multipart/form-data +// +// parameters: +// - +// name: also_known_as_uris +// in: formData +// description: >- +// ActivityPub URI/IDs of target accounts to which this account +// is being aliased. Eg., `["https://example.org/users/some_account"]`. +// +// Use an empty array to unset alsoKnownAs, clearing the aliases. +// type: string +// required: true +// +// security: +// - OAuth2 Bearer: +// - write:accounts +// +// responses: +// '200': +// description: "The newly updated account." +// schema: +// "$ref": "#/definitions/account" +// '400': +// description: bad request +// '401': +// description: unauthorized +// '404': +// description: not found +// '406': +// description: not acceptable +// '422': +// description: Unprocessable. Check the response body for more details. +// '500': +// description: internal server error +func (m *Module) AccountAliasPOSTHandler(c *gin.Context) { + authed, err := oauth.Authed(c, true, true, true, true) + if err != nil { + apiutil.ErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGetV1) + return + } + + form := &apimodel.AccountAliasRequest{} + if err := c.ShouldBind(&form); err != nil { + apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) + return + } + + resp, errWithCode := m.processor.Account().Alias(c.Request.Context(), authed.Account, form.AlsoKnownAsURIs) + if errWithCode != nil { + apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) + return + } + + apiutil.JSON(c, http.StatusOK, resp) +} diff --git a/internal/api/client/accounts/accountmove.go b/internal/api/client/accounts/accountmove.go new file mode 100644 index 000000000..3698c06a3 --- /dev/null +++ b/internal/api/client/accounts/accountmove.go @@ -0,0 +1,97 @@ +// 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 <http://www.gnu.org/licenses/>. + +package accounts + +import ( + "net/http" + + "github.com/gin-gonic/gin" + apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" + apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" + "github.com/superseriousbusiness/gotosocial/internal/gtserror" + "github.com/superseriousbusiness/gotosocial/internal/oauth" +) + +// AccountMovePOSTHandler swagger:operation POST /api/v1/accounts/move accountMove +// +// Move your account to another account. +// +// --- +// tags: +// - accounts +// +// consumes: +// - multipart/form-data +// +// parameters: +// - +// name: password +// in: formData +// description: Password of the account user, for confirmation. +// type: string +// required: true +// - +// name: moved_to_uri +// in: formData +// description: >- +// ActivityPub URI/ID of the target account. Eg., `https://example.org/users/some_account`. +// The target account must be alsoKnownAs the requesting account in order for the move to be successful. +// type: string +// required: true +// +// security: +// - OAuth2 Bearer: +// - write:accounts +// +// responses: +// '202': +// description: The account move has been accepted and the account will be moved. +// '400': +// description: bad request +// '401': +// description: unauthorized +// '404': +// description: not found +// '406': +// description: not acceptable +// '422': +// description: Unprocessable. Check the response body for more details. +// '500': +// description: internal server error +func (m *Module) AccountMovePOSTHandler(c *gin.Context) { + authed, err := oauth.Authed(c, true, true, true, true) + if err != nil { + apiutil.ErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGetV1) + return + } + + form := &apimodel.AccountMoveRequest{} + if err := c.ShouldBind(&form); err != nil { + apiutil.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGetV1) + return + } + + if errWithCode := m.processor.Account().MoveSelf(c.Request.Context(), authed, form); errWithCode != nil { + apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1) + return + } + + apiutil.JSON(c, http.StatusAccepted, map[string]string{ + "message": "accepted", + }) +} diff --git a/internal/api/client/accounts/accounts.go b/internal/api/client/accounts/accounts.go index d57748d46..c94fbfbaa 100644 --- a/internal/api/client/accounts/accounts.go +++ b/internal/api/client/accounts/accounts.go @@ -53,6 +53,8 @@ const ( UnfollowPath = BasePathWithID + "/unfollow" UpdatePath = BasePath + "/update_credentials" VerifyPath = BasePath + "/verify_credentials" + MovePath = BasePath + "/move" + AliasPath = BasePath + "/alias" ) type Module struct { @@ -108,4 +110,8 @@ func (m *Module) Route(attachHandler func(method string, path string, f ...gin.H // search for accounts attachHandler(http.MethodGet, SearchPath, m.AccountSearchGETHandler) attachHandler(http.MethodGet, LookupPath, m.AccountLookupGETHandler) + + // migration handlers + attachHandler(http.MethodPost, AliasPath, m.AccountAliasPOSTHandler) + attachHandler(http.MethodPost, MovePath, m.AccountMovePOSTHandler) } diff --git a/internal/api/model/account.go b/internal/api/model/account.go index a8851ddcb..46b043f80 100644 --- a/internal/api/model/account.go +++ b/internal/api/model/account.go @@ -96,6 +96,9 @@ type Account struct { // Role of the account on this instance. // Omitted for remote accounts. Role *AccountRole `json:"role,omitempty"` + // If set, indicates that this account is currently inactive, and has migrated to the given account. + // Omitted for accounts that haven't moved, and for suspended accounts. + Moved *Account `json:"moved,omitempty"` } // AccountCreateRequest models account creation parameters. @@ -213,6 +216,23 @@ type AccountDeleteRequest struct { Password string `form:"password" json:"password" xml:"password"` } +// AccountMoveRequest models a request to Move an account. +// +// swagger:ignore +type AccountMoveRequest struct { + // Password of the account's user, for confirmation. + Password string `form:"password" json:"password" xml:"password"` + // ActivityPub URI of the account that's being moved to. + MovedToURI string `form:"moved_to_uri" json:"moved_to_uri" xml:"moved_to_uri"` +} + +// AccountAliasRequest models a request +// to set an account's alsoKnownAs URIs. +type AccountAliasRequest struct { + // ActivityPub URIs of any accounts that this one is being aliased to. + AlsoKnownAsURIs []string `form:"also_known_as_uris" json:"also_known_as_uris" xml:"also_known_as_uris"` +} + // AccountRole models the role of an account. // // swagger:model accountRole diff --git a/internal/api/model/source.go b/internal/api/model/source.go index a2c78ac78..3b57f8565 100644 --- a/internal/api/model/source.go +++ b/internal/api/model/source.go @@ -38,4 +38,9 @@ type Source struct { Fields []Field `json:"fields"` // The number of pending follow requests. FollowRequestsCount int `json:"follow_requests_count"` + // This account is aliased to / also known as accounts at the + // given ActivityPub URIs. To set this, use `/api/v1/accounts/alias`. + // + // Omitted from json if empty / not set. + AlsoKnownAsURIs []string `json:"also_known_as_uris,omitempty"` } |