WIP editing poll flow when editing post

community/flows/posts.lua

@@ -198,9 +198,26 @@ do
             end
           end)() or nil)
         })
+        table.insert(v, {
+          "poll",
+          types.empty + types.table
+        })
       end
       local post_update = assert_valid(self.params.post, types.params_shape(v))
       post_update.body = assert_error(Posts:filter_body(post_update.body, post_update.body_format))
+      local poll_flow
+      if post_update.poll then
+        local PollsFlow = require("community.flows.topic_polls")
+        poll_flow = PollsFlow(self)
+        local poll_edit
+        poll_edit = assert_valid(self.params.topic, types.params_shape({
+          {
+            "poll",
+            poll_flow:validate_params_shape()
+          }
+        })).poll
+        post_update.poll = poll_edit
+      end
       if opts and opts.before_edit_callback then
         opts.before_edit_callback(post_update)
       end

community/flows/posts.moon

@@ -167,10 +167,25 @@ class PostsFlow extends Flow
 
       -- this treats nil and not provided and does not action
       table.insert v, {"tags", types.nil + types.empty / (-> {}) + types.limited_text(240) / (category and category\parse_tags or nil) }
+      table.insert v, {"poll", types.empty + types.table}
+
 
     post_update = assert_valid @params.post, types.params_shape v
     post_update.body = assert_error Posts\filter_body post_update.body, post_update.body_format
 
+    local poll_flow
+    if post_update.poll
+      PollsFlow = require "community.flows.topic_polls"
+      poll_flow = PollsFlow @
+
+      -- we do validation in separate step to have better error messages
+      {poll: poll_edit} = assert_valid @params.topic, types.params_shape {
+        {"poll", poll_flow\validate_params_shape!}
+      }
+
+      post_update.poll = poll_edit
+
+
     if opts and opts.before_edit_callback
       opts.before_edit_callback post_update
 

community/flows/topics.lua

@@ -117,7 +117,7 @@ do
             "poll",
             poll_flow:validate_params_shape()
           }
-        })).new_poll
+        })).poll
         new_topic.poll = new_poll
         assert_error(self.category:allowed_to_create_poll(self.current_user), "you can't create a poll in this category")
       end

community/flows/topics.moon

@@ -75,7 +75,7 @@ class TopicsFlow extends Flow
 
     if new_topic.poll
       -- we do validation like this so we can have nice error messages
-      {:new_poll} = assert_valid @params.topic, types.params_shape {
+      {poll: new_poll} = assert_valid @params.topic, types.params_shape {
         {"poll", poll_flow\validate_params_shape!}
       }