[feature] add support for polls + receiving federated status edits (#2330)

3 files changed, 12 insertions, 7 deletions

diff --git a/internal/api/client/statuses/statuscreate.go b/internal/api/client/statuses/statuscreate.go
index e8378f461..5034e53b1 100644
--- a/internal/api/client/statuses/statuscreate.go
+++ b/internal/api/client/statuses/statuscreate.go
@@ -103,7 +103,12 @@ func (m *Module) StatusCreatePOSTHandler(c *gin.Context) {
 		return
 	}
 
-	apiStatus, errWithCode := m.processor.Status().Create(c.Request.Context(), authed.Account, authed.Application, form)
+	apiStatus, errWithCode := m.processor.Status().Create(
+		c.Request.Context(),
+		authed.Account,
+		authed.Application,
+		form,
+	)
 	if errWithCode != nil {
 		apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
 		return
@@ -144,7 +149,7 @@ func validateNormalizeCreateStatus(form *apimodel.AdvancedStatusCreateForm) erro
 	}
 
 	if form.Poll != nil {
-		if form.Poll.Options == nil {
+		if len(form.Poll.Options) == 0 {
 			return errors.New("poll with no options")
 		}
 		if len(form.Poll.Options) > maxPollOptions {
diff --git a/internal/api/client/statuses/statusmute_test.go b/internal/api/client/statuses/statusmute_test.go
index e642fb308..91a361bd6 100644
--- a/internal/api/client/statuses/statusmute_test.go
+++ b/internal/api/client/statuses/statusmute_test.go
@@ -130,8 +130,8 @@ func (suite *StatusMuteTestSuite) TestMuteUnmuteStatus() {
     "header_static": "http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/small/01PFPMWK2FF0D9WMHEJHR07C3Q.jpg",
     "followers_count": 2,
     "following_count": 2,
-    "statuses_count": 5,
-    "last_status_at": "2022-05-20T11:37:55.000Z",
+    "statuses_count": 6,
+    "last_status_at": "2022-05-20T11:41:10.000Z",
     "emojis": [],
     "fields": [],
     "enable_rss": true,
@@ -193,8 +193,8 @@ func (suite *StatusMuteTestSuite) TestMuteUnmuteStatus() {
     "header_static": "http://localhost:8080/fileserver/01F8MH1H7YV1Z7D2C8K2730QBF/header/small/01PFPMWK2FF0D9WMHEJHR07C3Q.jpg",
     "followers_count": 2,
     "following_count": 2,
-    "statuses_count": 5,
-    "last_status_at": "2022-05-20T11:37:55.000Z",
+    "statuses_count": 6,
+    "last_status_at": "2022-05-20T11:41:10.000Z",
     "emojis": [],
     "fields": [],
     "enable_rss": true,
diff --git a/internal/api/client/statuses/statusunpin_test.go b/internal/api/client/statuses/statusunpin_test.go
index 9f6602b98..14253f804 100644
--- a/internal/api/client/statuses/statusunpin_test.go
+++ b/internal/api/client/statuses/statusunpin_test.go
@@ -107,7 +107,7 @@ func (suite *StatusUnpinTestSuite) TestUnpinStatusNotFound() {
 	// Unpin a pinned followers-only status owned by another account.
 	targetStatus := suite.testStatuses["local_account_2_status_7"]
 
-	if _, err := suite.createUnpin(http.StatusNotFound, `{"error":"Not Found"}`, targetStatus.ID); err != nil {
+	if _, err := suite.createUnpin(http.StatusNotFound, `{"error":"Not Found: target status not found"}`, targetStatus.ID); err != nil {
 		suite.FailNow(err.Error())
 	}
 }