apollo/enbas
1
0
Fork 0
Code Issues 4 Pull requests Projects Activity Actions

fix: update internal models for GoToSocial v0.15.0 #7

Manually merged
dananglin merged 1 commit from gts-0.15 into main 2024-05-19 15:28:13 +01:00
Conversation 0 Commits 1 Files changed 3 +67 -53
3 changed files with 67 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/model/account.go
View file

@ -23,6 +23,7 @@ type Account struct {
Locked bool `json:"locked"` Locked bool `json:"locked"`
Suspended bool `json:"suspended"` Suspended bool `json:"suspended"`
Discoverable bool `json:"discoverable"` Discoverable bool `json:"discoverable"`
HideCollections bool `json:"hide_collections"`
Fields []Field `json:"fields"` Fields []Field `json:"fields"`
FollowersCount int `json:"followers_count"` FollowersCount int `json:"followers_count"`
FollowingCount int `json:"following_count"` FollowingCount int `json:"following_count"`
@ -32,6 +33,7 @@ type Account struct {
Role AccountRole `json:"role"` Role AccountRole `json:"role"`
Source Source `json:"source"` Source Source `json:"source"`
StatusCount int `json:"statuses_count"` StatusCount int `json:"statuses_count"`
Theme string `json:"theme"`
URL string `json:"url"` URL string `json:"url"`
Username string `json:"username"` Username string `json:"username"`
} }
@ -48,6 +50,7 @@ type Source struct {
Privacy string `json:"string"` Privacy string `json:"string"`
Sensitive bool `json:"sensitive"` Sensitive bool `json:"sensitive"`
StatusContentType string `json:"status_content_type"` StatusContentType string `json:"status_content_type"`
AlsoKnownAsURIs []string `json:"also_known_as_uris"`
} }
type Field struct { type Field struct {

19
internal/model/instance_v2.go
View file

@ -11,12 +11,14 @@ type InstanceV2 struct {
Configuration InstanceConfiguration `json:"configuration"` Configuration InstanceConfiguration `json:"configuration"`
Contact InstanceV2Contact `json:"contact"` Contact InstanceV2Contact `json:"contact"`
Description string `json:"description"` Description string `json:"description"`
DescriptionText string `json:"description_text"`
Domain string `json:"domain"` Domain string `json:"domain"`
Languages []string `json:"languages"` Languages []string `json:"languages"`
Registrations InstanceV2Registrations `json:"registrations"` Registrations InstanceV2Registrations `json:"registrations"`
Rules []InstanceRule `json:"rules"` Rules []InstanceRule `json:"rules"`
SourceURL string `json:"source_url"` SourceURL string `json:"source_url"`
Terms string `json:"terms"` Terms string `json:"terms"`
TermsText string `json:"terms_text"`
Thumbnail InstanceV2Thumbnail `json:"thumbnail"` Thumbnail InstanceV2Thumbnail `json:"thumbnail"`
Title string `json:"title"` Title string `json:"title"`
Usage InstanceV2Usage `json:"usage"` Usage InstanceV2Usage `json:"usage"`
@ -95,7 +97,7 @@ type InstanceV2Thumbnail struct {
ThumbnailDescription string `json:"thumbnail_description"` ThumbnailDescription string `json:"thumbnail_description"`
ThumbnailType string `json:"thumbnail_type"` ThumbnailType string `json:"thumbnail_type"`
URL string `json:"url"` URL string `json:"url"`
Version InstanceV2ThumbnailVersions `json:"versions"` Versions InstanceV2ThumbnailVersions `json:"versions"`
} }
type InstanceV2ThumbnailVersions struct { type InstanceV2ThumbnailVersions struct {
@ -114,7 +116,13 @@ type InstanceV2Users struct {
func (i InstanceV2) String() string { func (i InstanceV2) String() string {
format := ` format := `
%s %s
%s - %s %s
%s
%s
%s
%s
%s %s
%s %s
@ -130,11 +138,14 @@ func (i InstanceV2) String() string {
return fmt.Sprintf( return fmt.Sprintf(
format, format,
utilities.HeaderFormat("INSTANCE:"), utilities.HeaderFormat("INSTANCE TITLE:"),
i.Title, i.Title,
i.Description, utilities.HeaderFormat("INSTANCE DESCRIPTION:"),
utilities.WrapLines(i.DescriptionText, "\n ", 80),
utilities.HeaderFormat("DOMAIN:"), utilities.HeaderFormat("DOMAIN:"),
i.Domain, i.Domain,
utilities.HeaderFormat("TERMS AND CONDITIONS:"),
utilities.WrapLines(i.TermsText, "\n ", 80),
utilities.HeaderFormat("VERSION:"), utilities.HeaderFormat("VERSION:"),
i.Version, i.Version,
utilities.HeaderFormat("CONTACT:"), utilities.HeaderFormat("CONTACT:"),

4
internal/model/status.go
View file

@ -28,7 +28,7 @@ type Status struct {
Poll Poll `json:"poll"` Poll Poll `json:"poll"`
Reblog StatusReblogged `json:"reblog"` Reblog StatusReblogged `json:"reblog"`
Reblogged bool `json:"reblogged"` Reblogged bool `json:"reblogged"`
RebloggsCount int `json:"reblogs_count"` ReblogsCount int `json:"reblogs_count"`
RepliesCount int `json:"replies_count"` RepliesCount int `json:"replies_count"`
Sensitive bool `json:"sensitive"` Sensitive bool `json:"sensitive"`
SpolierText string `json:"spoiler_text"` SpolierText string `json:"spoiler_text"`
@ -188,7 +188,7 @@ func (s Status) String() string {
utilities.HeaderFormat("CREATED AT:"), utilities.HeaderFormat("CREATED AT:"),
utilities.FormatTime(s.CreatedAt), utilities.FormatTime(s.CreatedAt),
utilities.HeaderFormat("STATS:"), utilities.HeaderFormat("STATS:"),
s.RebloggsCount, s.ReblogsCount,
s.FavouritesCount, s.FavouritesCount,
s.RepliesCount, s.RepliesCount,
utilities.HeaderFormat("VISIBILITY:"), utilities.HeaderFormat("VISIBILITY:"),