From 75add26e2f30aac55ac276965158a5ff76ef8185 Mon Sep 17 00:00:00 2001
From: Adnan Maolood <me@adnano.co>
Date: Sat, 23 Jul 2022 08:09:55 -0400
Subject: [PATCH] api/graph: Fix duplicates in User.trackers query

Fixes: https://todo.sr.ht/~sircmpwn/todo.sr.ht/273
---
 api/graph/model/tracker.go    | 6 +++---
 api/graph/schema.resolvers.go | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/api/graph/model/tracker.go b/api/graph/model/tracker.go
index ad52b48..d59166e 100644
--- a/api/graph/model/tracker.go
+++ b/api/graph/model/tracker.go
@@ -91,15 +91,15 @@ func (t *Tracker) QueryWithCursor(ctx context.Context, runner sq.BaseRunner,
 	q = q.
 		OrderBy(database.WithAlias(t.alias, "id")+" DESC").
 		Limit(uint64(cur.Count+1)).
-		LeftJoin(`user_access tr_ua ON tr_ua.tracker_id = tr.id AND tr_ua.user_id = ?`, auser.UserID).
+		LeftJoin(`user_access ua ON ua.tracker_id = tr.id AND ua.user_id = ?`, auser.UserID).
 		Column(`COALESCE(
-			tr_ua.permissions,
+			ua.permissions,
 			CASE WHEN tr.owner_id = ?
 				THEN ?
 				ELSE tr.default_access
 			END)`,
 			auser.UserID, ACCESS_ALL).
-		Column(`tr_ua.id`)
+		Column(`ua.id`)
 
 	if rows, err = q.RunWith(runner).QueryContext(ctx); err != nil {
 		panic(err)
diff --git a/api/graph/schema.resolvers.go b/api/graph/schema.resolvers.go
index 40bbcd5..bbcb421 100644
--- a/api/graph/schema.resolvers.go
+++ b/api/graph/schema.resolvers.go
@@ -3225,7 +3225,6 @@ func (r *userResolver) Trackers(ctx context.Context, obj *model.User, cursor *co
 		query := database.
 			Select(ctx, tracker).
 			From(`tracker tr`).
-			LeftJoin(`user_access ua ON ua.tracker_id = tr.id`).
 			Where(sq.And{
 				sq.Expr(`tr.owner_id = ?`, obj.ID),
 				sq.Or{