From 7eb3134a914382c64fae32a1515882c2394c6020 Mon Sep 17 00:00:00 2001 From: tsmethurst Date: Sun, 11 Jul 2021 16:12:36 +0200 Subject: [PATCH] fiddle with display of blocked profiles --- internal/typeutils/internaltofrontend.go | 26 +++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go index 088e30d68..03e071981 100644 --- a/internal/typeutils/internaltofrontend.go +++ b/internal/typeutils/internaltofrontend.go @@ -150,6 +150,11 @@ func (c *converter) AccountToMastoPublic(a *gtsmodel.Account) (*model.Account, e acct = a.Username } + var suspended bool + if !a.SuspendedAt.IsZero() { + suspended = true + } + return &model.Account{ ID: a.ID, Username: a.Username, @@ -170,6 +175,7 @@ func (c *converter) AccountToMastoPublic(a *gtsmodel.Account) (*model.Account, e LastStatusAt: lastStatusAt, Emojis: emojis, // TODO: implement this Fields: fields, + Suspended: suspended, }, nil } @@ -183,14 +189,20 @@ func (c *converter) AccountToMastoBlocked(a *gtsmodel.Account) (*model.Account, acct = a.Username } + var suspended bool + if !a.SuspendedAt.IsZero() { + suspended = true + } + return &model.Account{ - ID: a.ID, - Username: a.Username, - Acct: acct, - DisplayName: a.Username, - Bot: a.Bot, - CreatedAt: a.CreatedAt.Format(time.RFC3339), - URL: a.URL, + ID: a.ID, + Username: a.Username, + Acct: acct, + DisplayName: a.DisplayName, + Bot: a.Bot, + CreatedAt: a.CreatedAt.Format(time.RFC3339), + URL: a.URL, + Suspended: suspended, }, nil }