Skip to content

Commit

Permalink
[bugfix] Set 'discoverable' properly on API accounts (#1511)
Browse files Browse the repository at this point in the history
  • Loading branch information
@tsmethurst
tsmethurst committed Feb 16, 2023
1 parent 6ee0dc8 commit b599309
Show file tree
Hide file tree
Showing 10 changed files with 87 additions and 1 deletion.
42 changes: 42 additions & 0 deletions internal/api/client/accounts/accountupdate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,48 @@ func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerTwo
suite.NotEmpty(dbZork.EmojiIDs)
}

func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerDiscoverable() {
requestBody, w, err := testrig.CreateMultipartFormData(
"", "",
map[string]string{
"discoverable": "false",
})
if err != nil {
panic(err)
}
bodyBytes := requestBody.Bytes()
recorder := httptest.NewRecorder()
ctx := suite.newContext(recorder, http.MethodPatch, bodyBytes, accounts.UpdateCredentialsPath, w.FormDataContentType())

// call the handler
suite.accountsModule.AccountUpdateCredentialsPATCHHandler(ctx)

// 1. we should have OK because our request was valid
suite.Equal(http.StatusOK, recorder.Code)

// 2. we should have no error message in the result body
result := recorder.Result()
defer result.Body.Close()

// check the response
b, err := ioutil.ReadAll(result.Body)
suite.NoError(err)

// unmarshal the returned account
apimodelAccount := &apimodel.Account{}
err = json.Unmarshal(b, apimodelAccount)
suite.NoError(err)

// check the returned api model account
// fields should be updated
suite.False(apimodelAccount.Discoverable)

// check the account in the database
dbZork, err := suite.db.GetAccountByID(context.Background(), apimodelAccount.ID)
suite.NoError(err)
suite.False(*dbZork.Discoverable)
}

func (suite *AccountUpdateTestSuite) TestAccountUpdateCredentialsPATCHHandlerWithMedia() {
// set up the request
// we're updating the header image, the display name, and the locked status of zork
Expand Down
13 changes: 13 additions & 0 deletions internal/api/client/admin/reportsget_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ func (suite *ReportsGetTestSuite) TestReportsGet1() {
"acct": "foss_satan@fossbros-anonymous.io",
"display_name": "big gerald",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2021-09-26T10:52:36.000Z",
"note": "i post about like, i dunno, stuff, or whatever!!!!",
Expand Down Expand Up @@ -206,6 +207,7 @@ func (suite *ReportsGetTestSuite) TestReportsGet1() {
"acct": "1happyturtle",
"display_name": "happy little turtle :3",
"locked": true,
"discoverable": false,
"bot": false,
"created_at": "2022-06-04T13:12:00.000Z",
"note": "\u003cp\u003ei post about things that concern me\u003c/p\u003e",
Expand Down Expand Up @@ -246,6 +248,7 @@ func (suite *ReportsGetTestSuite) TestReportsGet1() {
"acct": "admin",
"display_name": "",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2022-05-17T13:10:59.000Z",
"note": "",
Expand Down Expand Up @@ -287,6 +290,7 @@ func (suite *ReportsGetTestSuite) TestReportsGet1() {
"acct": "admin",
"display_name": "",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2022-05-17T13:10:59.000Z",
"note": "",
Expand Down Expand Up @@ -341,6 +345,7 @@ func (suite *ReportsGetTestSuite) TestReportsGet1() {
"acct": "1happyturtle",
"display_name": "happy little turtle :3",
"locked": true,
"discoverable": false,
"bot": false,
"created_at": "2022-06-04T13:12:00.000Z",
"note": "\u003cp\u003ei post about things that concern me\u003c/p\u003e",
Expand Down Expand Up @@ -381,6 +386,7 @@ func (suite *ReportsGetTestSuite) TestReportsGet1() {
"acct": "foss_satan@fossbros-anonymous.io",
"display_name": "big gerald",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2021-09-26T10:52:36.000Z",
"note": "i post about like, i dunno, stuff, or whatever!!!!",
Expand Down Expand Up @@ -427,6 +433,7 @@ func (suite *ReportsGetTestSuite) TestReportsGet1() {
"acct": "foss_satan@fossbros-anonymous.io",
"display_name": "big gerald",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2021-09-26T10:52:36.000Z",
"note": "i post about like, i dunno, stuff, or whatever!!!!",
Expand Down Expand Up @@ -533,6 +540,7 @@ func (suite *ReportsGetTestSuite) TestReportsGet2() {
"acct": "1happyturtle",
"display_name": "happy little turtle :3",
"locked": true,
"discoverable": false,
"bot": false,
"created_at": "2022-06-04T13:12:00.000Z",
"note": "\u003cp\u003ei post about things that concern me\u003c/p\u003e",
Expand Down Expand Up @@ -573,6 +581,7 @@ func (suite *ReportsGetTestSuite) TestReportsGet2() {
"acct": "foss_satan@fossbros-anonymous.io",
"display_name": "big gerald",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2021-09-26T10:52:36.000Z",
"note": "i post about like, i dunno, stuff, or whatever!!!!",
Expand Down Expand Up @@ -619,6 +628,7 @@ func (suite *ReportsGetTestSuite) TestReportsGet2() {
"acct": "foss_satan@fossbros-anonymous.io",
"display_name": "big gerald",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2021-09-26T10:52:36.000Z",
"note": "i post about like, i dunno, stuff, or whatever!!!!",
Expand Down Expand Up @@ -725,6 +735,7 @@ func (suite *ReportsGetTestSuite) TestReportsGet3() {
"acct": "1happyturtle",
"display_name": "happy little turtle :3",
"locked": true,
"discoverable": false,
"bot": false,
"created_at": "2022-06-04T13:12:00.000Z",
"note": "\u003cp\u003ei post about things that concern me\u003c/p\u003e",
Expand Down Expand Up @@ -765,6 +776,7 @@ func (suite *ReportsGetTestSuite) TestReportsGet3() {
"acct": "foss_satan@fossbros-anonymous.io",
"display_name": "big gerald",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2021-09-26T10:52:36.000Z",
"note": "i post about like, i dunno, stuff, or whatever!!!!",
Expand Down Expand Up @@ -811,6 +823,7 @@ func (suite *ReportsGetTestSuite) TestReportsGet3() {
"acct": "foss_satan@fossbros-anonymous.io",
"display_name": "big gerald",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2021-09-26T10:52:36.000Z",
"note": "i post about like, i dunno, stuff, or whatever!!!!",
Expand Down
1 change: 1 addition & 0 deletions internal/api/client/followrequests/get_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ func (suite *GetTestSuite) TestGet() {
"acct": "Some_User@example.org",
"display_name": "some user",
"locked": true,
"discoverable": true,
"bot": false,
"created_at": "2020-08-10T12:13:28.000Z",
"note": "i'm a real son of a gun",
Expand Down
6 changes: 6 additions & 0 deletions internal/api/client/instance/instancepatch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch1() {
"acct": "admin",
"display_name": "",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2022-05-17T13:10:59.000Z",
"note": "",
Expand Down Expand Up @@ -230,6 +231,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch2() {
"acct": "admin",
"display_name": "",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2022-05-17T13:10:59.000Z",
"note": "",
Expand Down Expand Up @@ -325,6 +327,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch3() {
"acct": "admin",
"display_name": "",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2022-05-17T13:10:59.000Z",
"note": "",
Expand Down Expand Up @@ -471,6 +474,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch6() {
"acct": "admin",
"display_name": "",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2022-05-17T13:10:59.000Z",
"note": "",
Expand Down Expand Up @@ -589,6 +593,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch8() {
"acct": "admin",
"display_name": "",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2022-05-17T13:10:59.000Z",
"note": "",
Expand Down Expand Up @@ -719,6 +724,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch9() {
"acct": "admin",
"display_name": "",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2022-05-17T13:10:59.000Z",
"note": "",
Expand Down
1 change: 1 addition & 0 deletions internal/api/client/reports/reportget_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ func (suite *ReportGetTestSuite) TestGetReport1() {
"acct": "foss_satan@fossbros-anonymous.io",
"display_name": "big gerald",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2021-09-26T10:52:36.000Z",
"note": "i post about like, i dunno, stuff, or whatever!!!!",
Expand Down
4 changes: 4 additions & 0 deletions internal/api/client/reports/reportsget_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ func (suite *ReportsGetTestSuite) TestGetReports() {
"acct": "foss_satan@fossbros-anonymous.io",
"display_name": "big gerald",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2021-09-26T10:52:36.000Z",
"note": "i post about like, i dunno, stuff, or whatever!!!!",
Expand Down Expand Up @@ -226,6 +227,7 @@ func (suite *ReportsGetTestSuite) TestGetReports4() {
"acct": "foss_satan@fossbros-anonymous.io",
"display_name": "big gerald",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2021-09-26T10:52:36.000Z",
"note": "i post about like, i dunno, stuff, or whatever!!!!",
Expand Down Expand Up @@ -296,6 +298,7 @@ func (suite *ReportsGetTestSuite) TestGetReports6() {
"acct": "foss_satan@fossbros-anonymous.io",
"display_name": "big gerald",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2021-09-26T10:52:36.000Z",
"note": "i post about like, i dunno, stuff, or whatever!!!!",
Expand Down Expand Up @@ -350,6 +353,7 @@ func (suite *ReportsGetTestSuite) TestGetReports7() {
"acct": "foss_satan@fossbros-anonymous.io",
"display_name": "big gerald",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2021-09-26T10:52:36.000Z",
"note": "i post about like, i dunno, stuff, or whatever!!!!",
Expand Down
2 changes: 1 addition & 1 deletion internal/api/model/account.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ type Account struct {
// Account manually approves follow requests.
Locked bool `json:"locked"`
// Account has opted into discovery features.
Discoverable bool `json:"discoverable,omitempty"`
Discoverable bool `json:"discoverable"`
// Account identifies as a bot.
Bot bool `json:"bot"`
// When the account was created (ISO 8601 Datetime).
Expand Down
1 change: 1 addition & 0 deletions internal/processing/streaming/notification_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ func (suite *NotificationTestSuite) TestStreamNotification() {
"acct": "foss_satan@fossbros-anonymous.io",
"display_name": "big gerald",
"locked": false,
"discoverable": true,
"bot": false,
"created_at": "2021-09-26T10:52:36.000Z",
"note": "i post about like, i dunno, stuff, or whatever!!!!",
Expand Down
1 change: 1 addition & 0 deletions internal/typeutils/internaltofrontend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ func (c *converter) AccountToAPIAccountPublic(ctx context.Context, a *gtsmodel.A
Acct: acct,
DisplayName: a.DisplayName,
Locked: *a.Locked,
Discoverable: *a.Discoverable,
Bot: *a.Bot,
CreatedAt: util.FormatISO8601(a.CreatedAt),
Note: a.Note,
Expand Down
Loading

0 comments on commit b599309

Please sign in to comment.