diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2021-12-20 15:19:53 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-12-20 15:19:53 +0100 |
| commit | cb8688f4298a1a3ed5e28565004588be3c071df0 (patch) | |
| tree | 038b196e914b949857bf8b7c00f22374408bc1ca /internal/typeutils | |
| parent | return first offer when no accept header set (#351) (diff) | |
| download | gotosocial-cb8688f4298a1a3ed5e28565004588be3c071df0.tar.xz | |
Remove unnecessary storage config variables (#344)
* rewire config to not use extraneous serve vars
* rename 'file' to 'local' for consistency
* use Type and Size again
Diffstat (limited to 'internal/typeutils')
| -rw-r--r-- | internal/typeutils/internal.go | 8 | ||||
| -rw-r--r-- | internal/typeutils/wrap.go | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/internal/typeutils/internal.go b/internal/typeutils/internal.go index 2257d7203..0d49ea6b2 100644 --- a/internal/typeutils/internal.go +++ b/internal/typeutils/internal.go @@ -7,7 +7,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/util" + "github.com/superseriousbusiness/gotosocial/internal/uris" ) func (c *converter) FollowRequestToFollow(ctx context.Context, f *gtsmodel.FollowRequest) *gtsmodel.Follow { @@ -25,13 +25,13 @@ func (c *converter) FollowRequestToFollow(ctx context.Context, f *gtsmodel.Follo func (c *converter) StatusToBoost(ctx context.Context, s *gtsmodel.Status, boostingAccount *gtsmodel.Account) (*gtsmodel.Status, error) { // the wrapper won't use the same ID as the boosted status so we generate some new UUIDs - uris := util.GenerateURIsForAccount(boostingAccount.Username) + accountURIs := uris.GenerateURIsForAccount(boostingAccount.Username) boostWrapperStatusID, err := id.NewULID() if err != nil { return nil, err } - boostWrapperStatusURI := fmt.Sprintf("%s/%s", uris.StatusesURI, boostWrapperStatusID) - boostWrapperStatusURL := fmt.Sprintf("%s/%s", uris.StatusesURL, boostWrapperStatusID) + boostWrapperStatusURI := fmt.Sprintf("%s/%s", accountURIs.StatusesURI, boostWrapperStatusID) + boostWrapperStatusURL := fmt.Sprintf("%s/%s", accountURIs.StatusesURL, boostWrapperStatusID) local := true if boostingAccount.Domain != "" { diff --git a/internal/typeutils/wrap.go b/internal/typeutils/wrap.go index 0f82a679b..81e8e53de 100644 --- a/internal/typeutils/wrap.go +++ b/internal/typeutils/wrap.go @@ -10,7 +10,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/ap" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" "github.com/superseriousbusiness/gotosocial/internal/id" - "github.com/superseriousbusiness/gotosocial/internal/util" + "github.com/superseriousbusiness/gotosocial/internal/uris" ) func (c *converter) WrapPersonInUpdate(person vocab.ActivityStreamsPerson, originAccount *gtsmodel.Account) (vocab.ActivityStreamsUpdate, error) { @@ -33,7 +33,7 @@ func (c *converter) WrapPersonInUpdate(person vocab.ActivityStreamsPerson, origi return nil, err } - idString := util.GenerateURIForUpdate(originAccount.Username, newID) + idString := uris.GenerateURIForUpdate(originAccount.Username, newID) idURI, err := url.Parse(idString) if err != nil { return nil, fmt.Errorf("WrapPersonInUpdate: error parsing url %s: %s", idString, err) |