rafaelcaricio/gotosocial
1
0
Fork 0
forked from mirrors/gotosocial
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix up some account conversion logic

Browse source
This commit is contained in:
tsmethurst 2022-01-25 12:03:25 +01:00
parent eba66d3a88
commit 5d9e9e0e7f
3 changed files with 55 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/api/client/account/accountverify_test.go
View file

@ -67,7 +67,7 @@ func (suite *AccountVerifyTestSuite) TestAccountVerifyGet() {
suite.NoError(err) suite.NoError(err)
lastStatusAt, err := time.Parse(time.RFC3339, apimodelAccount.LastStatusAt) lastStatusAt, err := time.Parse(time.RFC3339, apimodelAccount.LastStatusAt)
suite.NoError(err) suite.NoError(err)
aaaaaaaaaaaaaaaaaaa
suite.Equal(testAccount.ID, apimodelAccount.ID) suite.Equal(testAccount.ID, apimodelAccount.ID)
suite.Equal(testAccount.Username, apimodelAccount.Username) suite.Equal(testAccount.Username, apimodelAccount.Username)
suite.Equal(testAccount.Username, apimodelAccount.Acct) suite.Equal(testAccount.Username, apimodelAccount.Acct)

18
internal/typeutils/internaltoas.go
View file

@ -215,13 +215,13 @@ func (c *converter) AccountToAS(ctx context.Context, a *gtsmodel.Account) (vocab
// Used as profile avatar. // Used as profile avatar.
if a.AvatarMediaAttachmentID != "" { if a.AvatarMediaAttachmentID != "" {
if a.AvatarMediaAttachment == nil { if a.AvatarMediaAttachment == nil {
avatar := &gtsmodel.MediaAttachment{} avatar, err := c.db.GetAttachmentByID(ctx, a.AvatarMediaAttachmentID)
if err := c.db.GetByID(ctx, a.AvatarMediaAttachmentID, avatar); err != nil { if err == nil {
return nil, err
}
a.AvatarMediaAttachment = avatar a.AvatarMediaAttachment = avatar
} }
}
if a.AvatarMediaAttachment != nil {
iconProperty := streams.NewActivityStreamsIconProperty() iconProperty := streams.NewActivityStreamsIconProperty()
iconImage := streams.NewActivityStreamsImage() iconImage := streams.NewActivityStreamsImage()
@ -241,18 +241,19 @@ func (c *converter) AccountToAS(ctx context.Context, a *gtsmodel.Account) (vocab
iconProperty.AppendActivityStreamsImage(iconImage) iconProperty.AppendActivityStreamsImage(iconImage)
person.SetActivityStreamsIcon(iconProperty) person.SetActivityStreamsIcon(iconProperty)
} }
}
// image // image
// Used as profile header. // Used as profile header.
if a.HeaderMediaAttachmentID != "" { if a.HeaderMediaAttachmentID != "" {
if a.HeaderMediaAttachment == nil { if a.HeaderMediaAttachment == nil {
header := &gtsmodel.MediaAttachment{} header, err := c.db.GetAttachmentByID(ctx, a.HeaderMediaAttachmentID)
if err := c.db.GetByID(ctx, a.HeaderMediaAttachmentID, header); err != nil { if err == nil {
return nil, err
}
a.HeaderMediaAttachment = header a.HeaderMediaAttachment = header
} }
}
if a.HeaderMediaAttachment != nil {
headerProperty := streams.NewActivityStreamsImageProperty() headerProperty := streams.NewActivityStreamsImageProperty()
headerImage := streams.NewActivityStreamsImage() headerImage := streams.NewActivityStreamsImage()
@ -272,6 +273,7 @@ func (c *converter) AccountToAS(ctx context.Context, a *gtsmodel.Account) (vocab
headerProperty.AppendActivityStreamsImage(headerImage) headerProperty.AppendActivityStreamsImage(headerImage)
person.SetActivityStreamsImage(headerProperty) person.SetActivityStreamsImage(headerProperty)
} }
}
return person, nil return person, nil
} }

8
internal/typeutils/internaltofrontend.go
View file

@ -104,11 +104,13 @@ func (c *converter) AccountToAPIAccountPublic(ctx context.Context, a *gtsmodel.A
avi, err := c.db.GetAttachmentByID(ctx, a.AvatarMediaAttachmentID) avi, err := c.db.GetAttachmentByID(ctx, a.AvatarMediaAttachmentID)
if err == nil { if err == nil {
a.AvatarMediaAttachment = avi a.AvatarMediaAttachment = avi
}
}
if a.AvatarMediaAttachment != nil {
aviURL = a.AvatarMediaAttachment.URL aviURL = a.AvatarMediaAttachment.URL
aviURLStatic = a.AvatarMediaAttachment.Thumbnail.URL aviURLStatic = a.AvatarMediaAttachment.Thumbnail.URL
} }
} }
}
// set account header fields if available // set account header fields if available
var headerURL string var headerURL string
@ -118,11 +120,13 @@ func (c *converter) AccountToAPIAccountPublic(ctx context.Context, a *gtsmodel.A
avi, err := c.db.GetAttachmentByID(ctx, a.HeaderMediaAttachmentID) avi, err := c.db.GetAttachmentByID(ctx, a.HeaderMediaAttachmentID)
if err == nil { if err == nil {
a.HeaderMediaAttachment = avi a.HeaderMediaAttachment = avi
}
}
if a.HeaderMediaAttachment != nil {
headerURL = a.HeaderMediaAttachment.URL headerURL = a.HeaderMediaAttachment.URL
headerURLStatic = a.HeaderMediaAttachment.Thumbnail.URL headerURLStatic = a.HeaderMediaAttachment.Thumbnail.URL
} }
} }
}
// get the fields set on this account // get the fields set on this account
fields := []model.Field{} fields := []model.Field{}