2 files changed, 43 insertions, 1 deletions
diff --git a/internal/processing/status/boost.go b/internal/processing/status/boost.go
index 4a97706ab..d3fa87255 100644
--- a/internal/processing/status/boost.go
+++ b/internal/processing/status/boost.go
@@ -210,7 +210,15 @@ func (p *Processor) BoostRemove(
 		})
 	}
 
-	return p.c.GetAPIStatus(ctx, requester, target)
+	// For client convenience, mark the status as unboosted
+	// even though side effects probably haven't completed yet.
+	unboostedStatus, errWithCode := p.c.GetAPIStatus(ctx, requester, target)
+	if errWithCode != nil {
+		return nil, errWithCode
+	}
+	unboostedStatus.Reblogged = false
+
+	return unboostedStatus, nil
 }
 
 // StatusBoostedBy returns a slice of accounts that have boosted the given status, filtered according to privacy settings.
diff --git a/internal/processing/status/boost_test.go b/internal/processing/status/boost_test.go
index 96971c05e..e9055bad2 100644
--- a/internal/processing/status/boost_test.go
+++ b/internal/processing/status/boost_test.go
@@ -53,6 +53,40 @@ func (suite *StatusBoostTestSuite) TestBoostOfBoost() {
 	suite.Equal(targetStatus1.ID, boost2.Reblog.ID)
 }
 
+func (suite *StatusBoostTestSuite) TestBoostUnboost() {
+	var (
+		ctx      = suite.T().Context()
+		acct     = suite.testAccounts["local_account_1"]
+		app      = suite.testApplications["application_1"]
+		statusID = suite.testStatuses["admin_account_status_1"].ID
+	)
+
+	// Boost the status.
+	_, err := suite.status.BoostCreate(ctx, acct, app, statusID)
+	if err != nil {
+		suite.FailNow(err.Error())
+	}
+
+	// Check status is boosted by the caller.
+	status, err := suite.status.Get(ctx, acct, statusID)
+	if err != nil {
+		suite.FailNow(err.Error())
+	}
+	if !status.Reblogged {
+		suite.FailNow("", "expected reblogged=true, got false")
+	}
+
+	// Unboost that status.
+	// Check it's not boosted by the caller.
+	status, err = suite.status.BoostRemove(ctx, acct, app, statusID)
+	if err != nil {
+		suite.FailNow(err.Error())
+	}
+	if status.Reblogged {
+		suite.FailNow("", "expected reblogged=false, got true")
+	}
+}
+
 func TestStatusBoostTestSuite(t *testing.T) {
 	suite.Run(t, new(StatusBoostTestSuite))
 }