[bugfix] Fix boost of boost issue (#764)

This commit is contained in:
tobi 2022-08-23 10:46:10 +02:00 committed by GitHub
parent b96533ca8f
commit 2fe3a2b5b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 75 additions and 0 deletions

View File

@ -39,6 +39,21 @@ func (p *processor) Boost(ctx context.Context, requestingAccount *gtsmodel.Accou
return nil, gtserror.NewErrorNotFound(fmt.Errorf("no status owner for status %s", targetStatusID))
}
// if targetStatusID refers to a boost, then we should redirect
// the target to being the status that was boosted; if we don't
// do this, then we end up in weird situations where people
// boost boosts, and it looks absolutely bizarre in the UI
if targetStatus.BoostOfID != "" {
if targetStatus.BoostOf == nil {
b, err := p.db.GetStatusByID(ctx, targetStatus.BoostOfID)
if err != nil {
return nil, gtserror.NewErrorNotFound(fmt.Errorf("couldn't fetch boosted status %s", targetStatus.BoostOfID))
}
targetStatus.BoostOf = b
}
targetStatus = targetStatus.BoostOf
}
boostable, err := p.filter.StatusBoostable(ctx, targetStatus, requestingAccount)
if err != nil {
return nil, gtserror.NewErrorNotFound(fmt.Errorf("error seeing if status %s is boostable: %s", targetStatus.ID, err))

View File

@ -0,0 +1,60 @@
/*
GoToSocial
Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package status_test
import (
"context"
"testing"
"github.com/stretchr/testify/suite"
)
type StatusBoostTestSuite struct {
StatusStandardTestSuite
}
func (suite *StatusBoostTestSuite) TestBoostOfBoost() {
ctx := context.Background()
// first boost a status, no big deal
boostingAccount1 := suite.testAccounts["local_account_1"]
application1 := suite.testApplications["application_1"]
targetStatus1 := suite.testStatuses["admin_account_status_1"]
boost1, err := suite.status.Boost(ctx, boostingAccount1, application1, targetStatus1.ID)
suite.NoError(err)
suite.NotNil(boost1)
suite.Equal(targetStatus1.ID, boost1.Reblog.ID)
// now take another account and boost that boost
boostingAccount2 := suite.testAccounts["local_account_2"]
application2 := suite.testApplications["application_2"]
targetStatus2ID := boost1.ID
boost2, err := suite.status.Boost(ctx, boostingAccount2, application2, targetStatus2ID)
suite.NoError(err)
suite.NotNil(boost2)
// the boosted status should not be the boost,
// but the original status that was boosted
suite.Equal(targetStatus1.ID, boost2.Reblog.ID)
}
func TestStatusBoostTestSuite(t *testing.T) {
suite.Run(t, new(StatusBoostTestSuite))
}