diff options
| -rw-r--r-- | internal/api/client/instance/instancepatch_test.go | 12 | ||||
| -rw-r--r-- | internal/db/bundb/instance.go | 3 | ||||
| -rw-r--r-- | internal/db/bundb/instance_test.go | 2 | ||||
| -rw-r--r-- | internal/typeutils/internaltofrontend_test.go | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/internal/api/client/instance/instancepatch_test.go b/internal/api/client/instance/instancepatch_test.go index 9c4a9118a..efcb3762f 100644 --- a/internal/api/client/instance/instancepatch_test.go +++ b/internal/api/client/instance/instancepatch_test.go @@ -155,7 +155,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch1() { }, "stats": { "domain_count": 2, - "status_count": 20, + "status_count": 19, "user_count": 4 }, "thumbnail": "http://localhost:8080/assets/logo.webp", @@ -296,7 +296,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch2() { }, "stats": { "domain_count": 2, - "status_count": 20, + "status_count": 19, "user_count": 4 }, "thumbnail": "http://localhost:8080/assets/logo.webp", @@ -437,7 +437,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch3() { }, "stats": { "domain_count": 2, - "status_count": 20, + "status_count": 19, "user_count": 4 }, "thumbnail": "http://localhost:8080/assets/logo.webp", @@ -629,7 +629,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch6() { }, "stats": { "domain_count": 2, - "status_count": 20, + "status_count": 19, "user_count": 4 }, "thumbnail": "http://localhost:8080/assets/logo.webp", @@ -792,7 +792,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch8() { }, "stats": { "domain_count": 2, - "status_count": 20, + "status_count": 19, "user_count": 4 }, "thumbnail": "http://localhost:8080/fileserver/01AY6P665V14JJR0AFVRT7311Y/attachment/original/`+instanceAccount.AvatarMediaAttachment.ID+`.gif",`+` @@ -974,7 +974,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch9() { }, "stats": { "domain_count": 2, - "status_count": 20, + "status_count": 19, "user_count": 4 }, "thumbnail": "http://localhost:8080/assets/logo.webp", diff --git a/internal/db/bundb/instance.go b/internal/db/bundb/instance.go index 419951253..bbfd82ffb 100644 --- a/internal/db/bundb/instance.go +++ b/internal/db/bundb/instance.go @@ -103,6 +103,9 @@ func (i *instanceDB) CountInstanceStatuses(ctx context.Context, domain string) ( // Ignore statuses that are currently pending approval. q = q.Where("NOT ? = ?", bun.Ident("status.pending_approval"), true) + // Ignore statuses that are direct messages. + q = q.Where("NOT ? = ?", bun.Ident("status.visibility"), "direct") + count, err := q.Count(ctx) if err != nil { return 0, err diff --git a/internal/db/bundb/instance_test.go b/internal/db/bundb/instance_test.go index 13fd7f61c..4b8ec9962 100644 --- a/internal/db/bundb/instance_test.go +++ b/internal/db/bundb/instance_test.go @@ -47,7 +47,7 @@ func (suite *InstanceTestSuite) TestCountInstanceUsersRemote() { func (suite *InstanceTestSuite) TestCountInstanceStatuses() { count, err := suite.db.CountInstanceStatuses(context.Background(), config.GetHost()) suite.NoError(err) - suite.Equal(20, count) + suite.Equal(19, count) } func (suite *InstanceTestSuite) TestCountInstanceStatusesRemote() { diff --git a/internal/typeutils/internaltofrontend_test.go b/internal/typeutils/internaltofrontend_test.go index b9cadb183..db37d3abd 100644 --- a/internal/typeutils/internaltofrontend_test.go +++ b/internal/typeutils/internaltofrontend_test.go @@ -1993,7 +1993,7 @@ func (suite *InternalToFrontendTestSuite) TestInstanceV1ToFrontend() { }, "stats": { "domain_count": 2, - "status_count": 20, + "status_count": 19, "user_count": 4 }, "thumbnail": "http://localhost:8080/assets/logo.webp", |