qugalet/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2024-11-22 03:36:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[bugfix] post counters should not include direct messages (#3554)

Browse source 
* [bugfix] post counters should not include direct messages #3504

The fix is relativly simple, it just adds a line to the relevant
function which excludes all private posts.

* Formating fix

* mb
This commit is contained in:
Jannis 2024-11-21 10:06:06 +00:00 committed by GitHub
parent ffa67ac1ae
commit 9ace025da1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal/api/client/instance/instancepatch_test.go
View file

@ -155,7 +155,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch1() {
}, },
"stats": { "stats": {
"domain_count": 2, "domain_count": 2,
"status_count": 20, "status_count": 19,
"user_count": 4 "user_count": 4
}, },
"thumbnail": "http://localhost:8080/assets/logo.webp", "thumbnail": "http://localhost:8080/assets/logo.webp",
@ -296,7 +296,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch2() {
}, },
"stats": { "stats": {
"domain_count": 2, "domain_count": 2,
"status_count": 20, "status_count": 19,
"user_count": 4 "user_count": 4
}, },
"thumbnail": "http://localhost:8080/assets/logo.webp", "thumbnail": "http://localhost:8080/assets/logo.webp",
@ -437,7 +437,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch3() {
}, },
"stats": { "stats": {
"domain_count": 2, "domain_count": 2,
"status_count": 20, "status_count": 19,
"user_count": 4 "user_count": 4
}, },
"thumbnail": "http://localhost:8080/assets/logo.webp", "thumbnail": "http://localhost:8080/assets/logo.webp",
@ -629,7 +629,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch6() {
}, },
"stats": { "stats": {
"domain_count": 2, "domain_count": 2,
"status_count": 20, "status_count": 19,
"user_count": 4 "user_count": 4
}, },
"thumbnail": "http://localhost:8080/assets/logo.webp", "thumbnail": "http://localhost:8080/assets/logo.webp",
@ -792,7 +792,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch8() {
}, },
"stats": { "stats": {
"domain_count": 2, "domain_count": 2,
"status_count": 20, "status_count": 19,
"user_count": 4 "user_count": 4
}, },
"thumbnail": "http://localhost:8080/fileserver/01AY6P665V14JJR0AFVRT7311Y/attachment/original/`+instanceAccount.AvatarMediaAttachment.ID+`.gif",`+` "thumbnail": "http://localhost:8080/fileserver/01AY6P665V14JJR0AFVRT7311Y/attachment/original/`+instanceAccount.AvatarMediaAttachment.ID+`.gif",`+`
@ -974,7 +974,7 @@ func (suite *InstancePatchTestSuite) TestInstancePatch9() {
}, },
"stats": { "stats": {
"domain_count": 2, "domain_count": 2,
"status_count": 20, "status_count": 19,
"user_count": 4 "user_count": 4
}, },
"thumbnail": "http://localhost:8080/assets/logo.webp", "thumbnail": "http://localhost:8080/assets/logo.webp",

3
internal/db/bundb/instance.go
View file

@ -103,6 +103,9 @@ func (i *instanceDB) CountInstanceStatuses(ctx context.Context, domain string) (
// Ignore statuses that are currently pending approval. // Ignore statuses that are currently pending approval.
q = q.Where("NOT ? = ?", bun.Ident("status.pending_approval"), true) 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) count, err := q.Count(ctx)
if err != nil { if err != nil {
return 0, err return 0, err

2
internal/db/bundb/instance_test.go
View file

@ -47,7 +47,7 @@ func (suite *InstanceTestSuite) TestCountInstanceUsersRemote() {
func (suite *InstanceTestSuite) TestCountInstanceStatuses() { func (suite *InstanceTestSuite) TestCountInstanceStatuses() {
count, err := suite.db.CountInstanceStatuses(context.Background(), config.GetHost()) count, err := suite.db.CountInstanceStatuses(context.Background(), config.GetHost())
suite.NoError(err) suite.NoError(err)
suite.Equal(20, count) suite.Equal(19, count)
} }
func (suite *InstanceTestSuite) TestCountInstanceStatusesRemote() { func (suite *InstanceTestSuite) TestCountInstanceStatusesRemote() {

2
internal/typeutils/internaltofrontend_test.go
View file

@ -1993,7 +1993,7 @@ func (suite *InternalToFrontendTestSuite) TestInstanceV1ToFrontend() {
}, },
"stats": { "stats": {
"domain_count": 2, "domain_count": 2,
"status_count": 20, "status_count": 19,
"user_count": 4 "user_count": 4
}, },
"thumbnail": "http://localhost:8080/assets/logo.webp", "thumbnail": "http://localhost:8080/assets/logo.webp",