diff options
| author |  Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com> | 2021-07-05 13:23:03 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-07-05 13:23:03 +0200 |
| commit | d389e7b150df6ecd215c7b661b294ea153ad0103 (patch) | |
| tree | 8739e3103cb5130875d903cc7fc72fd9db3b8434 /internal/api/client/account | |
| parent | Fix 404 contact (#74) (diff) | |
| download | gotosocial-d389e7b150df6ecd215c7b661b294ea153ad0103.tar.xz | |
Domain block (#76)
* start work on admin domain blocking
* move stuff around + further work on domain blocks
* move + restructure processor
* prep work for deleting account
* tidy
* go fmt
* formatting
* domain blocking more work
* check domain blocks way earlier on
* progress on delete account
* delete more stuff when an account is gone
* and more...
* domain blocky block block
* get individual domain block, delete a block
Diffstat (limited to 'internal/api/client/account')
| -rw-r--r-- | internal/api/client/account/accountupdate_test.go | 2 | ||||
| -rw-r--r-- | internal/api/client/account/statuses.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/internal/api/client/account/accountupdate_test.go b/internal/api/client/account/accountupdate_test.go index ba7faa794..341b865ff 100644 --- a/internal/api/client/account/accountupdate_test.go +++ b/internal/api/client/account/accountupdate_test.go @@ -53,7 +53,7 @@ func (suite *AccountUpdateTestSuite) SetupTest() { suite.db = testrig.NewTestDB() suite.storage = testrig.NewTestStorage() suite.log = testrig.NewTestLog() - suite.federator = testrig.NewTestFederator(suite.db, testrig.NewTestTransportController(testrig.NewMockHTTPClient(nil))) + suite.federator = testrig.NewTestFederator(suite.db, testrig.NewTestTransportController(testrig.NewMockHTTPClient(nil)), suite.storage) suite.processor = testrig.NewTestProcessor(suite.db, suite.storage, suite.federator) suite.accountModule = account.New(suite.config, suite.processor, suite.log).(*account.Module) testrig.StandardDBSetup(suite.db) diff --git a/internal/api/client/account/statuses.go b/internal/api/client/account/statuses.go index f03a942f3..c92e85cee 100644 --- a/internal/api/client/account/statuses.go +++ b/internal/api/client/account/statuses.go @@ -82,7 +82,7 @@ func (m *Module) AccountStatusesGETHandler(c *gin.Context) { maxID = maxIDString } - pinned := false + pinnedOnly := false pinnedString := c.Query(PinnedKey) if pinnedString != "" { i, err := strconv.ParseBool(pinnedString) @@ -91,7 +91,7 @@ func (m *Module) AccountStatusesGETHandler(c *gin.Context) { c.JSON(http.StatusBadRequest, gin.H{"error": "couldn't parse pinned query param"}) return } - pinned = i + pinnedOnly = i } mediaOnly := false @@ -106,7 +106,7 @@ func (m *Module) AccountStatusesGETHandler(c *gin.Context) { mediaOnly = i } - statuses, errWithCode := m.processor.AccountStatusesGet(authed, targetAcctID, limit, excludeReplies, maxID, pinned, mediaOnly) + statuses, errWithCode := m.processor.AccountStatusesGet(authed, targetAcctID, limit, excludeReplies, maxID, pinnedOnly, mediaOnly) if errWithCode != nil { l.Debugf("error from processor account statuses get: %s", errWithCode) c.JSON(errWithCode.Code(), gin.H{"error": errWithCode.Safe()}) |