Filter deactivated comments (#401)

Author: raymondjacobson

api/v1_track_comment_count.go

@@ -36,6 +36,13 @@ func (app *ApiServer) v1TrackCommentCount(c *fiber.Ctx) error {
 		WHERE score < 0
 	),
 
+	-- Deactivated users
+	deactivated_users AS (
+		SELECT user_id
+		FROM users
+		WHERE is_deactivated = true
+	),
+
 	-- Comments reported by high-karma users
 	high_karma_reporters AS (
 		SELECT comment_id
@@ -63,6 +70,11 @@ func (app *ApiServer) v1TrackCommentCount(c *fiber.Ctx) error {
 		low_abuse_score.user_id = comments.user_id
 		AND @myId != comments.user_id  -- always show comments to their poster
 		AND track.owner_id != comments.user_id  -- always show comments from the track owner
+		)
+	LEFT JOIN deactivated_users ON (
+		deactivated_users.user_id = comments.user_id
+		AND @myId != comments.user_id  -- always show comments to their poster
+		AND track.owner_id != comments.user_id  -- always show comments from the track owner
 	)
 	WHERE comments.entity_id = @trackId
 		AND comments.entity_type = 'Track'
@@ -87,6 +99,8 @@ func (app *ApiServer) v1TrackCommentCount(c *fiber.Ctx) error {
 		)
 		-- Filter out comments from users with low abuse score
 		AND low_abuse_score.user_id IS NULL
+		-- Filter out comments from deactivated users
+		AND deactivated_users.user_id IS NULL
 	`
 
 	rows, err := app.pool.Query(c.Context(), sql, pgx.NamedArgs{

api/v1_track_comments.go

@@ -34,6 +34,13 @@ func (app *ApiServer) v1TrackComments(c *fiber.Ctx) error {
 		WHERE score < 0
 	),
 
+	-- Deactivated users
+	deactivated_users AS (
+		SELECT user_id
+		FROM users
+		WHERE is_deactivated = true
+	),
+
 	-- Comments reported by high-karma users
 	high_karma_reporters AS (
 		SELECT comment_reports.comment_id
@@ -63,6 +70,11 @@ func (app *ApiServer) v1TrackComments(c *fiber.Ctx) error {
 		AND @myId != comments.user_id  -- always show comments to their poster
 		AND track.owner_id != comments.user_id  -- always show comments from the track owner
 	)
+	LEFT JOIN deactivated_users ON (
+		deactivated_users.user_id = comments.user_id
+		AND @myId != comments.user_id  -- always show comments to their poster
+		AND track.owner_id != comments.user_id  -- always show comments from the track owner
+	)
 	WHERE comments.entity_id = @track_id
 		AND parent_comment_id IS NULL
 		AND entity_type = 'Track'
@@ -87,6 +99,8 @@ func (app *ApiServer) v1TrackComments(c *fiber.Ctx) error {
 		)
 		-- Filter out comments from users with low abuse score
 		AND low_abuse_score.user_id IS NULL
+		-- Filter out comments from deactivated users
+		AND deactivated_users.user_id IS NULL
 	`
 
 	args := pgx.NamedArgs{

api/v1_track_comments_test.go

@@ -121,3 +121,122 @@ func TestTrackComments_UnlistedTrack(t *testing.T) {
 		"data.1.id": "",
 	})
 }
+
+func TestTrackComments_LowScoreUser(t *testing.T) {
+	app := emptyTestApp(t)
+	fixtures := database.FixtureMap{
+		"users": {
+			{
+				"user_id":   1,
+				"handle":    "testuser",
+				"handle_lc": "testuser",
+				"name":      "Test User",
+				"wallet":    "0x7d273271690538cf855e5b3002a0dd8c154bb060",
+			},
+			{
+				"user_id":   2,
+				"handle":    "lowscoreuser",
+				"handle_lc": "lowscoreuser",
+				"name":      "Low Score User",
+				"wallet":    "0xc3d1d41e6872ffbd15c473d14fc3a9250be5b5e0",
+			},
+		},
+		"aggregate_user": {
+			{
+				"user_id": 2,
+				"score":   -1,
+			},
+		},
+		"tracks": {
+			{
+				"track_id": 101,
+				"owner_id": 10,
+				"title":    "Test Track",
+			},
+		},
+		"comments": {
+			{
+				"comment_id": 1,
+				"user_id":    1,
+				"entity_id":  101,
+				"text":       "cool",
+			},
+			{
+				"comment_id": 2,
+				"user_id":    2,
+				"entity_id":  101,
+				"text":       "i am spam loser",
+			},
+		},
+	}
+	database.Seed(app.pool.Replicas[0], fixtures)
+	status, body := testGet(t, app, "/v1/tracks/ePWJD/comments")
+	assert.Equal(t, 200, status)
+	jsonAssert(t, body, map[string]any{
+		"data.0.message":   "cool",
+		"data.0.id":        "7eP5n",
+		"data.0.user_id":   "7eP5n",
+		"data.0.entity_id": "ePWJD",
+
+		// there is no second comment
+		"data.#":    1,
+		"data.1.id": "",
+	})
+}
+
+func TestTrackComments_DeactivatedUser(t *testing.T) {
+	app := emptyTestApp(t)
+	fixtures := database.FixtureMap{
+		"users": {
+			{
+				"user_id":   1,
+				"handle":    "testuser",
+				"handle_lc": "testuser",
+				"name":      "Test User",
+				"wallet":    "0x7d273271690538cf855e5b3002a0dd8c154bb060",
+			},
+			{
+				"user_id":        2,
+				"handle":         "deactivateduser",
+				"handle_lc":      "deactivateduser",
+				"name":           "Deactivated User",
+				"wallet":         "0xc3d1d41e6872ffbd15c473d14fc3a9250be5b5e0",
+				"is_deactivated": true,
+			},
+		},
+		"tracks": {
+			{
+				"track_id": 101,
+				"owner_id": 10,
+				"title":    "Test Track",
+			},
+		},
+		"comments": {
+			{
+				"comment_id": 1,
+				"user_id":    1,
+				"entity_id":  101,
+				"text":       "cool",
+			},
+			{
+				"comment_id": 2,
+				"user_id":    2,
+				"entity_id":  101,
+				"text":       "i am deactivated",
+			},
+		},
+	}
+	database.Seed(app.pool.Replicas[0], fixtures)
+	status, body := testGet(t, app, "/v1/tracks/ePWJD/comments")
+	assert.Equal(t, 200, status)
+	jsonAssert(t, body, map[string]any{
+		"data.0.message":   "cool",
+		"data.0.id":        "7eP5n",
+		"data.0.user_id":   "7eP5n",
+		"data.0.entity_id": "ePWJD",
+
+		// there is no second comment
+		"data.#":    1,
+		"data.1.id": "",
+	})
+}