A platform for community discussion. Free, open, simple.
FEATURE: Expose post editors for editor-based workflow conditions (#43729)
Régis Hanolccf91e068d62
diff --git a/lib/post_revisor.rb b/lib/post_revisor.rbindex 2a896df9e5d..e7e35d31566 100644--- a/lib/post_revisor.rb+++ b/lib/post_revisor.rb@@ -94,7 +94,7 @@ class PostRevisor]# Extensions can inspect revision options via the `:post_edited` event payload.- attr_reader :category_changed, :post_revision, :opts+ attr_reader :category_changed, :post_revision, :opts, :editordef initialize(post, topic = post.topic)@post = postdiff --git a/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_edited/v1.rb b/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_edited/v1.rbindex 5b00ca7281d..eea24df196a 100644--- a/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_edited/v1.rb+++ b/plugins/discourse-workflows/lib/discourse_workflows/nodes/post_edited/v1.rb@@ -22,6 +22,13 @@ module DiscourseWorkflowsSchema::POST_SCHEMA,Schema::TOPIC_LIST_ITEM_SCHEMA,Schema::USER_SCHEMA,+ Schema.document(+ "editor" => {+ "type" => %w[object null],+ "description" => "User who performed the edit, when available",+ "properties" => Schema::USER_PROPERTIES,+ },+ ),),},],@@ -58,7 +65,8 @@ module DiscourseWorkflows{post: serialize_post(@post, include_cooked: true).merge(cooked: @cooked),topic: topic_data(@post.topic),- user: user_data(@post.user),+ user: serialize_user(@post.user),+ editor: serialize_user(@revisor&.editor),}end@@ -77,10 +85,6 @@ module DiscourseWorkflowsprivate- def user_data(user)- serialize_user(user)- end-def matches_post_scope?(post_scope)case post_scopewhen "all_posts"diff --git a/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_edited/v1_spec.rb b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_edited/v1_spec.rbindex 55b07a79340..ea9175ab6df 100644--- a/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_edited/v1_spec.rb+++ b/plugins/discourse-workflows/spec/lib/discourse_workflows/nodes/post_edited/v1_spec.rb@@ -43,6 +43,26 @@ RSpec.describe DiscourseWorkflows::Nodes::PostEdited::V1 doenddescribe "#output" do+ it "exposes the editor separately from the author" do+ editor = Fabricate(:admin)+ events =+ DiscourseEvent.track_events(:post_edited) do+ first_post.revise(editor, raw: "Edited by another user")+ end++ output = described_class.new(*events.sole[:params]).output++ expect(output[:editor]).to include(+ id: editor.id,+ username: editor.username,+ trust_level: editor.trust_level,+ )+ expect(output[:user][:id]).to eq(user.id)+ expect(output).to match_node_output_schema(described_class)+ editor_schema = described_class.output_schemas.first.dig("properties", "editor")+ expect(editor_schema).to include("properties" => DiscourseWorkflows::Schema::USER_PROPERTIES)+ end+it "returns post and topic data" dotrigger = described_class.new(first_post, "<p>Cooked</p>")output = trigger.output@@ -60,6 +80,8 @@ RSpec.describe DiscourseWorkflows::Nodes::PostEdited::V1 doexpect(output[:topic][:user_id]).to eq(topic.user_id)expect(output[:topic][:tags].map { |topic_tag| topic_tag[:name] }).to eq(["test-tag"])expect(output).not_to have_key(:cooked)+ expect(output).to include(editor: nil)+ expect(output).to match_node_output_schema(described_class)endend