Gracefully handle the elephant

mastodon/accounts.go

@@ -34,7 +34,7 @@ type Account struct {
 	Moved          *Account        `json:"moved"`
 	Fields         []Field         `json:"fields"`
 	Bot            bool            `json:"bot"`
-	Pleroma        AccountPleroma `json:"pleroma"`
+	Pleroma        *AccountPleroma `json:"pleroma"`
 }
 
 // Field is a Mastodon account profile field.
@@ -60,6 +60,15 @@ func (c *Client) GetAccount(ctx context.Context, id string) (*Account, error) {
 	if err != nil {
 		return nil, err
 	}
+	if account.Pleroma == nil {
+		rs, err := c.GetAccountRelationships(ctx, []string{id})
+		if err != nil {
+			return nil, err
+		}
+		if len(rs) > 0 {
+			account.Pleroma = &AccountPleroma{*rs[0]}
+		}
+	}
 	return &account, nil
 }
 

service/service.go

@@ -339,6 +339,7 @@ func (svc *service) ServeThreadPage(ctx context.Context, c *model.Client,
 	for i := range statuses {
 		statuses[i].ShowReplies = true
 		statuses[i].ReplyMap = replies
+		statuses[i].ReplyNumber = i
 		addToReplyMap(replies, statuses[i].InReplyToID, statuses[i].ID, i+1)
 	}
 

templates/status.tmpl

@@ -56,7 +56,7 @@
 				{{if .InReplyToID}}
 				<div class="status-reply-to">
 					<a class="status-reply-to-link" href="{{if not .ShowReplies}}/thread/{{.InReplyToID}}{{end}}#status-{{.InReplyToID}}"> 
-						 reply to {{.Pleroma.InReplyToAccountAcct}} 
+						 in reply to {{if .Pleroma.InReplyToAccountAcct}}{{.Pleroma.InReplyToAccountAcct}}{{else if .ReplyNumber}}#{{.ReplyNumber}}{{else}}{{.InReplyToID}}{{end}}
 					</a>
 				</div>
 				{{if index .ReplyMap .ID}} <span class="status-reply-info-divider"> - </span> {{end}}