SuperSeriousBusiness/GoToSocial
1
1
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial synced 2025-06-05 21:59:39 +02:00
Code Issues Projects Releases Wiki Activity

[chore] Mastodon api fixups (#617)

Browse Source 
* don't omitempty on description

* don't omitempty on any fields

* add ms to timestamp format

* don't omitempty on text_url

* rearrange attachment fields a bit

* just give URL again as attachment text url

* update tests

* fix accidental replace
This commit is contained in:
tobi
2022-05-28 19:59:55 +02:00
committed by GitHub
parent 323dbca4f7
commit ae5402ada6
11 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/ap/extract_test.go
View File

@@ -154,7 +154,7 @@ func addressable4() vocab.ActivityStreamsAnnounce {
"cc": "https://another.instance/users/someone_else", "cc": "https://another.instance/users/someone_else",
"id": "https://example.org/users/someone/statuses/107043888547829808/activity", "id": "https://example.org/users/someone/statuses/107043888547829808/activity",
"object": "https://another.instance/users/someone_else/statuses/107026674805188668", "object": "https://another.instance/users/someone_else/statuses/107026674805188668",
"published": "2021-10-04T15:08:35Z", "published": "2021-10-04T15:08:35.00Z",
"to": "https://example.org/users/someone/followers", "to": "https://example.org/users/someone/followers",
"type": "Announce" "type": "Announce"
}`) }`)

2
internal/api/client/followrequest/get_test.go
View File

@@ -70,7 +70,7 @@ func (suite *GetTestSuite) TestGet() {
b, err := ioutil.ReadAll(result.Body) b, err := ioutil.ReadAll(result.Body)
assert.NoError(suite.T(), err) assert.NoError(suite.T(), err)
suite.Equal(`[{"id":"01FHMQX3GAABWSM0S2VZEC2SWC","username":"some_user","acct":"some_user@example.org","display_name":"some user","locked":true,"bot":false,"created_at":"2020-08-10T12:13:28Z","note":"i'm a real son of a gun","url":"http://example.org/@some_user","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":0,"following_count":0,"statuses_count":0,"last_status_at":"","emojis":[],"fields":[]}]`, string(b)) suite.Equal(`[{"id":"01FHMQX3GAABWSM0S2VZEC2SWC","username":"some_user","acct":"some_user@example.org","display_name":"some user","locked":true,"bot":false,"created_at":"2020-08-10T12:13:28.00Z","note":"i'm a real son of a gun","url":"http://example.org/@some_user","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":0,"following_count":0,"statuses_count":0,"last_status_at":"","emojis":[],"fields":[]}]`, string(b))
} }
func TestGetTestSuite(t *testing.T) { func TestGetTestSuite(t *testing.T) {

2
internal/api/client/instance/instancepatch_test.go
View File

@@ -62,7 +62,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch1() {
b, err := io.ReadAll(result.Body) b, err := io.ReadAll(result.Body)
suite.NoError(err) suite.NoError(err)
suite.Equal(`{"uri":"http://localhost:8080","title":"Example Instance","description":"","short_description":"","email":"someone@example.org","version":"","registrations":true,"approval_required":true,"invites_enabled":false,"urls":{"streaming_api":"wss://localhost:8080"},"stats":{"domain_count":0,"status_count":16,"user_count":4},"thumbnail":"","contact_account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37Z","emojis":[],"fields":[]},"max_toot_chars":5000}`, string(b)) suite.Equal(`{"uri":"http://localhost:8080","title":"Example Instance","description":"","short_description":"","email":"someone@example.org","version":"","registrations":true,"approval_required":true,"invites_enabled":false,"urls":{"streaming_api":"wss://localhost:8080"},"stats":{"domain_count":0,"status_count":16,"user_count":4},"thumbnail":"","contact_account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59.00Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37.00Z","emojis":[],"fields":[]},"max_toot_chars":5000}`, string(b))
} }
func (suite *InstancePatchTestSuite) TestInstancePatch2() { func (suite *InstancePatchTestSuite) TestInstancePatch2() {

12
internal/api/model/attachment.go
View File

@@ -69,25 +69,25 @@ type Attachment struct {
// The location of the original full-size attachment. // The location of the original full-size attachment.
// example: https://example.org/fileserver/some_id/attachments/some_id/original/attachment.jpeg // example: https://example.org/fileserver/some_id/attachments/some_id/original/attachment.jpeg
URL string `json:"url"` URL string `json:"url"`
// A shorter URL for the attachment.
// In our case, we just give the URL again since we don't create smaller URLs.
TextURL string `json:"text_url"`
// The location of a scaled-down preview of the attachment. // The location of a scaled-down preview of the attachment.
// example: https://example.org/fileserver/some_id/attachments/some_id/small/attachment.jpeg // example: https://example.org/fileserver/some_id/attachments/some_id/small/attachment.jpeg
PreviewURL string `json:"preview_url"` PreviewURL string `json:"preview_url"`
// The location of the full-size original attachment on the remote server. // The location of the full-size original attachment on the remote server.
// Only defined for instances other than our own. // Only defined for instances other than our own.
// example: https://some-other-server.org/attachments/original/ahhhhh.jpeg // example: https://some-other-server.org/attachments/original/ahhhhh.jpeg
RemoteURL string `json:"remote_url,omitempty"` RemoteURL string `json:"remote_url"`
// The location of a scaled-down preview of the attachment on the remote server. // The location of a scaled-down preview of the attachment on the remote server.
// Only defined for instances other than our own. // Only defined for instances other than our own.
// example: https://some-other-server.org/attachments/small/ahhhhh.jpeg // example: https://some-other-server.org/attachments/small/ahhhhh.jpeg
PreviewRemoteURL string `json:"preview_remote_url,omitempty"` PreviewRemoteURL string `json:"preview_remote_url"`
// A shorter URL for the attachment.
// Not currently used.
TextURL string `json:"text_url,omitempty"`
// Metadata for this attachment. // Metadata for this attachment.
Meta MediaMeta `json:"meta,omitempty"` Meta MediaMeta `json:"meta,omitempty"`
// Alt text that describes what is in the media attachment. // Alt text that describes what is in the media attachment.
// example: This is a picture of a kitten. // example: This is a picture of a kitten.
Description string `json:"description,omitempty"` Description string `json:"description"`
// A hash computed by the BlurHash algorithm, for generating colorful preview thumbnails when media has not been downloaded yet. // A hash computed by the BlurHash algorithm, for generating colorful preview thumbnails when media has not been downloaded yet.
// See https://github.com/woltapp/blurhash // See https://github.com/woltapp/blurhash
Blurhash string `json:"blurhash,omitempty"` Blurhash string `json:"blurhash,omitempty"`

8
internal/api/model/status.go
View File

@@ -30,10 +30,10 @@ type Status struct {
CreatedAt string `json:"created_at"` CreatedAt string `json:"created_at"`
// ID of the status being replied to. // ID of the status being replied to.
// example: 01FBVD42CQ3ZEEVMW180SBX03B // example: 01FBVD42CQ3ZEEVMW180SBX03B
InReplyToID string `json:"in_reply_to_id,omitempty"` InReplyToID string `json:"in_reply_to_id"`
// ID of the account being replied to. // ID of the account being replied to.
// example: 01FBVD42CQ3ZEEVMW180SBX03B // example: 01FBVD42CQ3ZEEVMW180SBX03B
InReplyToAccountID string `json:"in_reply_to_account_id,omitempty"` InReplyToAccountID string `json:"in_reply_to_account_id"`
// Status contains sensitive content. // Status contains sensitive content.
// example: false // example: false
Sensitive bool `json:"sensitive"` Sensitive bool `json:"sensitive"`
@@ -67,13 +67,13 @@ type Status struct {
// This status has been bookmarked by the account viewing it. // This status has been bookmarked by the account viewing it.
Bookmarked bool `json:"bookmarked"` Bookmarked bool `json:"bookmarked"`
// This status has been pinned by the account viewing it (only relevant for your own statuses). // This status has been pinned by the account viewing it (only relevant for your own statuses).
Pinned bool `json:"pinned,omitempty"` Pinned bool `json:"pinned"`
// The content of this status. Should be HTML, but might also be plaintext in some cases. // The content of this status. Should be HTML, but might also be plaintext in some cases.
// example: <p>Hey this is a status!</p> // example: <p>Hey this is a status!</p>
Content string `json:"content"` Content string `json:"content"`
// The status that this status reblogs/boosts. // The status that this status reblogs/boosts.
// nullable: true // nullable: true
Reblog *StatusReblogged `json:"reblog,omitempty"` Reblog *StatusReblogged `json:"reblog"`
// The application used to post this status, if visible. // The application used to post this status, if visible.
Application *Application `json:"application"` Application *Application `json:"application"`
// The account that authored this status. // The account that authored this status.

4
internal/processing/streaming/notification_test.go
View File

@@ -44,7 +44,7 @@ func (suite *NotificationTestSuite) TestStreamNotification() {
notification := &apimodel.Notification{ notification := &apimodel.Notification{
ID: "01FH57SJCMDWQGEAJ0X08CE3WV", ID: "01FH57SJCMDWQGEAJ0X08CE3WV",
Type: "follow", Type: "follow",
CreatedAt: "2021-10-04T08:52:36Z", CreatedAt: "2021-10-04T08:52:36.00Z",
Account: followAccountAPIModel, Account: followAccountAPIModel,
} }
@@ -52,7 +52,7 @@ func (suite *NotificationTestSuite) TestStreamNotification() {
suite.NoError(err) suite.NoError(err)
msg := <-openStream.Messages msg := <-openStream.Messages
suite.Equal(`{"id":"01FH57SJCMDWQGEAJ0X08CE3WV","type":"follow","created_at":"2021-10-04T08:52:36Z","account":{"id":"01F8MH5ZK5VRH73AKHQM6Y9VNX","username":"foss_satan","acct":"foss_satan@fossbros-anonymous.io","display_name":"big gerald","locked":false,"bot":false,"created_at":"2021-09-26T10:52:36Z","note":"i post about like, i dunno, stuff, or whatever!!!!","url":"http://fossbros-anonymous.io/@foss_satan","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":0,"following_count":0,"statuses_count":1,"last_status_at":"2021-09-20T10:40:37Z","emojis":[],"fields":[]}}`, msg.Payload) suite.Equal(`{"id":"01FH57SJCMDWQGEAJ0X08CE3WV","type":"follow","created_at":"2021-10-04T08:52:36.00Z","account":{"id":"01F8MH5ZK5VRH73AKHQM6Y9VNX","username":"foss_satan","acct":"foss_satan@fossbros-anonymous.io","display_name":"big gerald","locked":false,"bot":false,"created_at":"2021-09-26T10:52:36.00Z","note":"i post about like, i dunno, stuff, or whatever!!!!","url":"http://fossbros-anonymous.io/@foss_satan","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":0,"following_count":0,"statuses_count":1,"last_status_at":"2021-09-20T10:40:37.00Z","emojis":[],"fields":[]}}`, msg.Payload)
} }
func TestNotificationTestSuite(t *testing.T) { func TestNotificationTestSuite(t *testing.T) {

20
internal/typeutils/converter_test.go
View File

@@ -44,7 +44,7 @@ const (
"id": "http://fossbros-anonymous.io/users/foss_satan/statuses/106221634728637552/activity", "id": "http://fossbros-anonymous.io/users/foss_satan/statuses/106221634728637552/activity",
"type": "Create", "type": "Create",
"actor": "http://fossbros-anonymous.io/users/foss_satan", "actor": "http://fossbros-anonymous.io/users/foss_satan",
"published": "2021-05-12T09:58:38Z", "published": "2021-05-12T09:58:38.00Z",
"to": [ "to": [
"http://fossbros-anonymous.io/users/foss_satan/followers" "http://fossbros-anonymous.io/users/foss_satan/followers"
], ],
@@ -57,7 +57,7 @@ const (
"type": "Note", "type": "Note",
"summary": null, "summary": null,
"inReplyTo": "http://localhost:8080/users/the_mighty_zork/statuses/01F8MHAMCHF6Y650WCRSCP4WMY", "inReplyTo": "http://localhost:8080/users/the_mighty_zork/statuses/01F8MHAMCHF6Y650WCRSCP4WMY",
"published": "2021-05-12T09:58:38Z", "published": "2021-05-12T09:58:38.00Z",
"url": "https://ondergrond.org/@dumpsterqueer/106221634728637552", "url": "https://ondergrond.org/@dumpsterqueer/106221634728637552",
"attributedTo": "http://fossbros-anonymous.io/users/foss_satan", "attributedTo": "http://fossbros-anonymous.io/users/foss_satan",
"to": [ "to": [
@@ -115,7 +115,7 @@ const (
"id": "http://fossbros-anonymous.io/users/foss_satan/statuses/106221567884565704/activity", "id": "http://fossbros-anonymous.io/users/foss_satan/statuses/106221567884565704/activity",
"type": "Create", "type": "Create",
"actor": "http://fossbros-anonymous.io/users/foss_satan", "actor": "http://fossbros-anonymous.io/users/foss_satan",
"published": "2021-05-12T09:41:38Z", "published": "2021-05-12T09:41:38.00Z",
"to": [ "to": [
"http://fossbros-anonymous.io/users/foss_satan/followers" "http://fossbros-anonymous.io/users/foss_satan/followers"
], ],
@@ -127,7 +127,7 @@ const (
"type": "Note", "type": "Note",
"summary": null, "summary": null,
"inReplyTo": null, "inReplyTo": null,
"published": "2021-05-12T09:41:38Z", "published": "2021-05-12T09:41:38.00Z",
"url": "https://ondergrond.org/@dumpsterqueer/106221567884565704", "url": "https://ondergrond.org/@dumpsterqueer/106221567884565704",
"attributedTo": "http://fossbros-anonymous.io/users/foss_satan", "attributedTo": "http://fossbros-anonymous.io/users/foss_satan",
"to": [ "to": [
@@ -160,7 +160,7 @@ const (
"id": "https://ondergrond.org/emojis/2390", "id": "https://ondergrond.org/emojis/2390",
"type": "Emoji", "type": "Emoji",
"name": ":party_parrot:", "name": ":party_parrot:",
"updated": "2020-11-06T13:42:11Z", "updated": "2020-11-06T13:42:11.00Z",
"icon": { "icon": {
"type": "Image", "type": "Image",
"mediaType": "image/gif", "mediaType": "image/gif",
@@ -171,7 +171,7 @@ const (
"id": "https://ondergrond.org/emojis/2395", "id": "https://ondergrond.org/emojis/2395",
"type": "Emoji", "type": "Emoji",
"name": ":amaze:", "name": ":amaze:",
"updated": "2020-09-26T12:29:56Z", "updated": "2020-09-26T12:29:56.00Z",
"icon": { "icon": {
"type": "Image", "type": "Image",
"mediaType": "image/png", "mediaType": "image/png",
@@ -182,7 +182,7 @@ const (
"id": "https://ondergrond.org/emojis/764", "id": "https://ondergrond.org/emojis/764",
"type": "Emoji", "type": "Emoji",
"name": ":blobsunglasses:", "name": ":blobsunglasses:",
"updated": "2020-09-26T12:13:23Z", "updated": "2020-09-26T12:13:23.00Z",
"icon": { "icon": {
"type": "Image", "type": "Image",
"mediaType": "image/png", "mediaType": "image/png",
@@ -337,7 +337,7 @@ const (
"type": "Note", "type": "Note",
"summary": "reading: Punishment and Reward in the Corporate University", "summary": "reading: Punishment and Reward in the Corporate University",
"inReplyTo": "http://fossbros-anonymous.io/users/foss_satan/statuses/108138729399508469", "inReplyTo": "http://fossbros-anonymous.io/users/foss_satan/statuses/108138729399508469",
"published": "2022-04-15T23:49:37Z", "published": "2022-04-15T23:49:37.00Z",
"url": "http://fossbros-anonymous.io/@foss_satan/108138763199405167", "url": "http://fossbros-anonymous.io/@foss_satan/108138763199405167",
"attributedTo": "http://fossbros-anonymous.io/users/foss_satan", "attributedTo": "http://fossbros-anonymous.io/users/foss_satan",
"to": [ "to": [
@@ -385,7 +385,7 @@ const (
"type": "Note", "type": "Note",
"summary": "reading: Punishment and Reward in the Corporate University", "summary": "reading: Punishment and Reward in the Corporate University",
"inReplyTo": "http://fossbros-anonymous.io/users/foss_satan/statuses/108138729399508469", "inReplyTo": "http://fossbros-anonymous.io/users/foss_satan/statuses/108138729399508469",
"published": "2022-04-15T23:49:37Z", "published": "2022-04-15T23:49:37.00Z",
"attributedTo": "http://fossbros-anonymous.io/users/foss_satan", "attributedTo": "http://fossbros-anonymous.io/users/foss_satan",
"to": [ "to": [
"https://www.w3.org/ns/activitystreams#Public" "https://www.w3.org/ns/activitystreams#Public"
@@ -447,7 +447,7 @@ const (
"owner": "https://owncast.example.org/federation/user/rgh", "owner": "https://owncast.example.org/federation/user/rgh",
"publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAurN+lUNwcGV2poLNtaoT\naRtJzN6s4SDcBmIFk82lxhdMKC6/Nssm+hvDuxWGqL0+dHwSvrG11rA6irGuSzRk\niHjYyVwYe/p1CxqJxzUfZVJAWdsCFWy+HtDrTWs5sggj1MiL59uGxvkCep+OYBuG\nBI8CvSOMLrDp8soCg3EY+zSgpXtGMuRaaUukavsfuglApShB61ny7W8LG252iKC5\nmyO8L7l8TNa5BrIi/pRHLzvv9aWiCa8VKtvmqj+mClEhpkRhImSk5GPJXgouTTgl\ntT28NYYciSf9YYgZ0SNWHdLUCdkMF592j4+BbkPvdgzc70G4yyu2GcWnTzBuvF5X\nYwIDAQAB\n-----END PUBLIC KEY-----\n" "publicKeyPem": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAurN+lUNwcGV2poLNtaoT\naRtJzN6s4SDcBmIFk82lxhdMKC6/Nssm+hvDuxWGqL0+dHwSvrG11rA6irGuSzRk\niHjYyVwYe/p1CxqJxzUfZVJAWdsCFWy+HtDrTWs5sggj1MiL59uGxvkCep+OYBuG\nBI8CvSOMLrDp8soCg3EY+zSgpXtGMuRaaUukavsfuglApShB61ny7W8LG252iKC5\nmyO8L7l8TNa5BrIi/pRHLzvv9aWiCa8VKtvmqj+mClEhpkRhImSk5GPJXgouTTgl\ntT28NYYciSf9YYgZ0SNWHdLUCdkMF592j4+BbkPvdgzc70G4yyu2GcWnTzBuvF5X\nYwIDAQAB\n-----END PUBLIC KEY-----\n"
}, },
"published": "2022-05-22T18:44:57Z", "published": "2022-05-22T18:44:57.00Z",
"summary": "linux audio stuff ", "summary": "linux audio stuff ",
"tag": [ "tag": [
{ {

1
internal/typeutils/internaltofrontend.go
View File

@@ -238,6 +238,7 @@ func (c *converter) AttachmentToAPIAttachment(ctx context.Context, a *gtsmodel.M
ID: a.ID, ID: a.ID,
Type: strings.ToLower(string(a.Type)), Type: strings.ToLower(string(a.Type)),
URL: a.URL, URL: a.URL,
TextURL: a.URL,
PreviewURL: a.Thumbnail.URL, PreviewURL: a.Thumbnail.URL,
RemoteURL: a.RemoteURL, RemoteURL: a.RemoteURL,
PreviewRemoteURL: a.Thumbnail.RemoteURL, PreviewRemoteURL: a.Thumbnail.RemoteURL,

6
internal/typeutils/internaltofrontend_test.go
View File

@@ -40,7 +40,7 @@ func (suite *InternalToFrontendTestSuite) TestAccountToFrontend() {
b, err := json.Marshal(apiAccount) b, err := json.Marshal(apiAccount)
suite.NoError(err) suite.NoError(err)
suite.Equal(`{"id":"01F8MH1H7YV1Z7D2C8K2730QBF","username":"the_mighty_zork","acct":"the_mighty_zork","display_name":"original zork (he/they)","locked":false,"bot":false,"created_at":"2022-05-20T11:09:18Z","note":"\u003cp\u003ehey yo this is my profile!\u003c/p\u003e","url":"http://localhost:8080/@the_mighty_zork","avatar":"http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/avatar/original/01F8MH58A357CV5K7R7TJMSH6S.jpeg","avatar_static":"http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/avatar/small/01F8MH58A357CV5K7R7TJMSH6S.jpeg","header":"http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/original/01PFPMWK2FF0D9WMHEJHR07C3Q.jpeg","header_static":"http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/small/01PFPMWK2FF0D9WMHEJHR07C3Q.jpeg","followers_count":2,"following_count":2,"statuses_count":5,"last_status_at":"2022-05-20T11:37:55Z","emojis":[],"fields":[]}`, string(b)) suite.Equal(`{"id":"01F8MH1H7YV1Z7D2C8K2730QBF","username":"the_mighty_zork","acct":"the_mighty_zork","display_name":"original zork (he/they)","locked":false,"bot":false,"created_at":"2022-05-20T11:09:18.00Z","note":"\u003cp\u003ehey yo this is my profile!\u003c/p\u003e","url":"http://localhost:8080/@the_mighty_zork","avatar":"http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/avatar/original/01F8MH58A357CV5K7R7TJMSH6S.jpeg","avatar_static":"http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/avatar/small/01F8MH58A357CV5K7R7TJMSH6S.jpeg","header":"http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/original/01PFPMWK2FF0D9WMHEJHR07C3Q.jpeg","header_static":"http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/small/01PFPMWK2FF0D9WMHEJHR07C3Q.jpeg","followers_count":2,"following_count":2,"statuses_count":5,"last_status_at":"2022-05-20T11:37:55.00Z","emojis":[],"fields":[]}`, string(b))
} }
func (suite *InternalToFrontendTestSuite) TestStatusToFrontend() { func (suite *InternalToFrontendTestSuite) TestStatusToFrontend() {
@@ -52,7 +52,7 @@ func (suite *InternalToFrontendTestSuite) TestStatusToFrontend() {
b, err := json.Marshal(apiStatus) b, err := json.Marshal(apiStatus)
suite.NoError(err) suite.NoError(err)
suite.Equal(`{"id":"01F8MH75CBF9JFX4ZAD54N0W0R","created_at":"2021-10-20T11:36:45Z","sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost:8080/users/admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R","url":"http://localhost:8080/@admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R","replies_count":0,"reblogs_count":0,"favourites_count":1,"favourited":true,"reblogged":false,"muted":false,"bookmarked":false,"content":"hello world! #welcome ! first post on the instance :rainbow: !","application":{"name":"superseriousbusiness","website":"https://superserious.business"},"account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37Z","emojis":[],"fields":[]},"media_attachments":[{"id":"01F8MH6NEM8D7527KZAECTCR76","type":"image","url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/original/01F8MH6NEM8D7527KZAECTCR76.jpeg","preview_url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/small/01F8MH6NEM8D7527KZAECTCR76.jpeg","meta":{"original":{"width":1200,"height":630,"size":"1200x630","aspect":1.9047619},"small":{"width":256,"height":134,"size":"256x134","aspect":1.9104477},"focus":{"x":0,"y":0}},"description":"Black and white image of some 50's style text saying: Welcome On Board","blurhash":"LNJRdVM{00Rj%Mayt7j[4nWBofRj"}],"mentions":[],"tags":[{"name":"welcome","url":"http://localhost:8080/tags/welcome"}],"emojis":[{"shortcode":"rainbow","url":"http://localhost:8080/fileserver/01F8MH261H1KSV3GW3016GZRY3/emoji/original/01F8MH9H8E4VG3KDYJR9EGPXCQ.png","static_url":"http://localhost:8080/fileserver/01F8MH261H1KSV3GW3016GZRY3/emoji/static/01F8MH9H8E4VG3KDYJR9EGPXCQ.png","visible_in_picker":true}],"card":null,"poll":null,"text":""}`, string(b)) suite.Equal(`{"id":"01F8MH75CBF9JFX4ZAD54N0W0R","created_at":"2021-10-20T11:36:45.00Z","in_reply_to_id":"","in_reply_to_account_id":"","sensitive":false,"spoiler_text":"","visibility":"public","language":"en","uri":"http://localhost:8080/users/admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R","url":"http://localhost:8080/@admin/statuses/01F8MH75CBF9JFX4ZAD54N0W0R","replies_count":0,"reblogs_count":0,"favourites_count":1,"favourited":true,"reblogged":false,"muted":false,"bookmarked":false,"pinned":false,"content":"hello world! #welcome ! first post on the instance :rainbow: !","reblog":null,"application":{"name":"superseriousbusiness","website":"https://superserious.business"},"account":{"id":"01F8MH17FWEB39HZJ76B6VXSKF","username":"admin","acct":"admin","display_name":"","locked":false,"bot":false,"created_at":"2022-05-17T13:10:59.00Z","note":"","url":"http://localhost:8080/@admin","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":1,"following_count":1,"statuses_count":4,"last_status_at":"2021-10-20T10:41:37.00Z","emojis":[],"fields":[]},"media_attachments":[{"id":"01F8MH6NEM8D7527KZAECTCR76","type":"image","url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/original/01F8MH6NEM8D7527KZAECTCR76.jpeg","text_url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/original/01F8MH6NEM8D7527KZAECTCR76.jpeg","preview_url":"http://localhost:8080/fileserver/01F8MH17FWEB39HZJ76B6VXSKF/attachment/small/01F8MH6NEM8D7527KZAECTCR76.jpeg","remote_url":"","preview_remote_url":"","meta":{"original":{"width":1200,"height":630,"size":"1200x630","aspect":1.9047619},"small":{"width":256,"height":134,"size":"256x134","aspect":1.9104477},"focus":{"x":0,"y":0}},"description":"Black and white image of some 50's style text saying: Welcome On Board","blurhash":"LNJRdVM{00Rj%Mayt7j[4nWBofRj"}],"mentions":[],"tags":[{"name":"welcome","url":"http://localhost:8080/tags/welcome"}],"emojis":[{"shortcode":"rainbow","url":"http://localhost:8080/fileserver/01F8MH261H1KSV3GW3016GZRY3/emoji/original/01F8MH9H8E4VG3KDYJR9EGPXCQ.png","static_url":"http://localhost:8080/fileserver/01F8MH261H1KSV3GW3016GZRY3/emoji/static/01F8MH9H8E4VG3KDYJR9EGPXCQ.png","visible_in_picker":true}],"card":null,"poll":null,"text":""}`, string(b))
} }
func (suite *InternalToFrontendTestSuite) TestInstanceToFrontend() { func (suite *InternalToFrontendTestSuite) TestInstanceToFrontend() {
@@ -97,7 +97,7 @@ func (suite *InternalToFrontendTestSuite) TestInstanceToFrontendWithAdminAccount
b, err := json.Marshal(apiInstance) b, err := json.Marshal(apiInstance)
suite.NoError(err) suite.NoError(err)
suite.Equal(`{"uri":"https://example.org","title":"example instance","description":"a much longer description","short_description":"a little description","email":"someone@example.org","version":"software-from-hell 0.666","registrations":false,"approval_required":false,"invites_enabled":false,"thumbnail":"","contact_account":{"id":"01FHMQX3GAABWSM0S2VZEC2SWC","username":"some_user","acct":"some_user@example.org","display_name":"some user","locked":true,"bot":false,"created_at":"2020-08-10T12:13:28Z","note":"i'm a real son of a gun","url":"http://example.org/@some_user","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":0,"following_count":0,"statuses_count":0,"last_status_at":"","emojis":[],"fields":[]},"max_toot_chars":0}`, string(b)) suite.Equal(`{"uri":"https://example.org","title":"example instance","description":"a much longer description","short_description":"a little description","email":"someone@example.org","version":"software-from-hell 0.666","registrations":false,"approval_required":false,"invites_enabled":false,"thumbnail":"","contact_account":{"id":"01FHMQX3GAABWSM0S2VZEC2SWC","username":"some_user","acct":"some_user@example.org","display_name":"some user","locked":true,"bot":false,"created_at":"2020-08-10T12:13:28.00Z","note":"i'm a real son of a gun","url":"http://example.org/@some_user","avatar":"","avatar_static":"","header":"","header_static":"","followers_count":0,"following_count":0,"statuses_count":0,"last_status_at":"","emojis":[],"fields":[]},"max_toot_chars":0}`, string(b))
} }
func TestInternalToFrontendTestSuite(t *testing.T) { func TestInternalToFrontendTestSuite(t *testing.T) {

2
internal/util/time.go
View File

@@ -21,7 +21,7 @@ package util
import "time" import "time"
// ISO8601 is a formatter for serializing times that forces ISO8601 behavior. // ISO8601 is a formatter for serializing times that forces ISO8601 behavior.
const ISO8601 = "2006-01-02T15:04:05Z" const ISO8601 = "2006-01-02T15:04:05.00Z"
// FormatISO8601 converts the given time to UTC and then formats it // FormatISO8601 converts the given time to UTC and then formats it
// using the ISO8601 const, which the Mastodon API is able to understand. // using the ISO8601 const, which the Mastodon API is able to understand.

6
internal/util/time_test.go
View File

@@ -33,19 +33,19 @@ type TimeSuite struct {
func (suite *TimeSuite) TestISO8601Format1() { func (suite *TimeSuite) TestISO8601Format1() {
testTime := testrig.TimeMustParse("2022-05-17T13:10:59Z") testTime := testrig.TimeMustParse("2022-05-17T13:10:59Z")
testTimeString := util.FormatISO8601(testTime) testTimeString := util.FormatISO8601(testTime)
suite.Equal("2022-05-17T13:10:59Z", testTimeString) suite.Equal("2022-05-17T13:10:59.00Z", testTimeString)
} }
func (suite *TimeSuite) TestISO8601Format2() { func (suite *TimeSuite) TestISO8601Format2() {
testTime := testrig.TimeMustParse("2022-05-09T07:34:35+02:00") testTime := testrig.TimeMustParse("2022-05-09T07:34:35+02:00")
testTimeString := util.FormatISO8601(testTime) testTimeString := util.FormatISO8601(testTime)
suite.Equal("2022-05-09T05:34:35Z", testTimeString) suite.Equal("2022-05-09T05:34:35.00Z", testTimeString)
} }
func (suite *TimeSuite) TestISO8601Format3() { func (suite *TimeSuite) TestISO8601Format3() {
testTime := testrig.TimeMustParse("2021-10-04T10:52:36+02:00") testTime := testrig.TimeMustParse("2021-10-04T10:52:36+02:00")
testTimeString := util.FormatISO8601(testTime) testTimeString := util.FormatISO8601(testTime)
suite.Equal("2021-10-04T08:52:36Z", testTimeString) suite.Equal("2021-10-04T08:52:36.00Z", testTimeString)
} }
func TestTimeSuite(t *testing.T) { func TestTimeSuite(t *testing.T) {