From 0df2e18cc0d5440deca32681f33c66d883913901 Mon Sep 17 00:00:00 2001
From: Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com>
Date: Fri, 21 May 2021 23:04:59 +0200
Subject: Home timeline (#28)

* v. basic implementation of home timeline

* Go fmt ./...
---
 internal/typeutils/astointernal.go       |  2 +-
 internal/typeutils/internaltoas.go       |  2 +-
 internal/typeutils/internaltofrontend.go | 24 ++++++++++++------------
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'internal/typeutils')

diff --git a/internal/typeutils/astointernal.go b/internal/typeutils/astointernal.go
index bf1ef7f45..7eb3f5927 100644
--- a/internal/typeutils/astointernal.go
+++ b/internal/typeutils/astointernal.go
@@ -121,7 +121,7 @@ func (c *converter) ASRepresentationToAccount(accountable Accountable) (*gtsmode
 	acct.URL = url.String()
 
 	// InboxURI
-	if accountable.GetActivityStreamsInbox() != nil || accountable.GetActivityStreamsInbox().GetIRI() != nil {
+	if accountable.GetActivityStreamsInbox() != nil && accountable.GetActivityStreamsInbox().GetIRI() != nil {
 		acct.InboxURI = accountable.GetActivityStreamsInbox().GetIRI().String()
 	}
 
diff --git a/internal/typeutils/internaltoas.go b/internal/typeutils/internaltoas.go
index 072c4e690..b7056ccbe 100644
--- a/internal/typeutils/internaltoas.go
+++ b/internal/typeutils/internaltoas.go
@@ -439,7 +439,7 @@ func (c *converter) StatusToAS(s *gtsmodel.Status) (vocab.ActivityStreamsNote, e
 
 	// replies
 	// TODO
-	
+
 	return status, nil
 }
 
diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go
index 70f8a8d3c..1fd1577f9 100644
--- a/internal/typeutils/internaltofrontend.go
+++ b/internal/typeutils/internaltofrontend.go
@@ -575,18 +575,18 @@ func (c *converter) InstanceToMasto(i *gtsmodel.Instance) (*model.Instance, erro
 
 func (c *converter) RelationshipToMasto(r *gtsmodel.Relationship) (*model.Relationship, error) {
 	return &model.Relationship{
-		ID: r.ID,
-		Following: r.Following,
-		ShowingReblogs: r.ShowingReblogs,
-		Notifying: r.Notifying,
-		FollowedBy: r.FollowedBy,
-		Blocking: r.Blocking,
-		BlockedBy: r.BlockedBy,
-		Muting: r.Muting,
+		ID:                  r.ID,
+		Following:           r.Following,
+		ShowingReblogs:      r.ShowingReblogs,
+		Notifying:           r.Notifying,
+		FollowedBy:          r.FollowedBy,
+		Blocking:            r.Blocking,
+		BlockedBy:           r.BlockedBy,
+		Muting:              r.Muting,
 		MutingNotifications: r.MutingNotifications,
-		Requested: r.Requested,
-		DomainBlocking: r.DomainBlocking,
-		Endorsed: r.Endorsed,
-		Note: r.Note,
+		Requested:           r.Requested,
+		DomainBlocking:      r.DomainBlocking,
+		Endorsed:            r.Endorsed,
+		Note:                r.Note,
 	}, nil
 }
-- 
cgit v1.2.3