+
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 62cfd14763e..7e28c6620d2 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -2439,6 +2439,19 @@ en:
action: "merge selected posts"
error: "There was an error merging the selected posts."
+ publish_page:
+ title: "Page Publishing"
+ publish: "Publish"
+ description: "When a topic is published as a page, its URL can be shared and it will displayed with custom styling."
+ slug: "Slug"
+ publish_url: "Your page has been published at:"
+ topic_published: "Your topic has been published at:"
+ preview_url: "Your page will be published at:"
+ invalid_slug: "Sorry, you can't publish this page."
+ unpublish: "Unpublish"
+ unpublished: "Your page has been unpublished and is no longer accessible."
+ publishing_settings: "Publishing Settings"
+
change_owner:
title: "Change Owner"
action: "change ownership"
@@ -2591,6 +2604,7 @@ en:
convert_to_moderator: "Add Staff Color"
revert_to_regular: "Remove Staff Color"
rebake: "Rebuild HTML"
+ publish_page: "Page Publishing"
unhide: "Unhide"
change_owner: "Change Ownership"
grant_badge: "Grant Badge"
@@ -4083,6 +4097,8 @@ en:
api_key_update: "api key update"
api_key_destroy: "api key destroy"
override_upload_secure_status: "override upload secure status"
+ page_published: "page published"
+ page_unpublished: "page unpublished"
screened_emails:
title: "Screened Emails"
description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 5574f69ae85..f5f03a1b9d6 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -2107,6 +2107,7 @@ en:
new_user_notice_tl: "Minimum trust level required to see new user post notices."
returning_user_notice_tl: "Minimum trust level required to see returning user post notices."
returning_users_days: "How many days should pass before a user is considered to be returning."
+ enable_page_publishing: "Allow staff members to publish topics to new URLs with their own styling."
default_email_digest_frequency: "How often users receive summary emails by default."
default_include_tl0_in_digests: "Include posts from new users in summary emails by default. Users can change this in their preferences."
@@ -2299,6 +2300,12 @@ en:
change_owner:
post_revision_text: "Ownership transferred"
+ publish_page:
+ slug_errors:
+ blank: "can't be blank"
+ unavailable: "is unavailable"
+ invalid: "contains invalid characters"
+
topic_statuses:
autoclosed_message_max_posts:
one: "This message was automatically closed after reaching the maximum limit of %{count} reply."
diff --git a/config/routes.rb b/config/routes.rb
index 8306dcc40ac..1a92a5440d1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -45,6 +45,12 @@ Discourse::Application.routes.draw do
get "finish-installation/confirm-email" => "finish_installation#confirm_email"
put "finish-installation/resend-email" => "finish_installation#resend_email"
+ get "pub/check-slug" => "published_pages#check_slug"
+ get "pub/by-topic/:topic_id" => "published_pages#details"
+ put "pub/by-topic/:topic_id" => "published_pages#upsert"
+ delete "pub/by-topic/:topic_id" => "published_pages#destroy"
+ get "pub/:slug" => "published_pages#show"
+
resources :directory_items
get "site" => "site#site"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index ccbcc8150a1..e2fc35aac48 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -933,6 +933,8 @@ posting:
enum: "TrustLevelSetting"
returning_users_days:
default: 120
+ enable_page_publishing:
+ default: false
email:
email_time_window_mins:
diff --git a/db/migrate/20200401172023_create_published_pages.rb b/db/migrate/20200401172023_create_published_pages.rb
new file mode 100644
index 00000000000..201b08c9d6f
--- /dev/null
+++ b/db/migrate/20200401172023_create_published_pages.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class CreatePublishedPages < ActiveRecord::Migration[6.0]
+ def change
+ create_table :published_pages do |t|
+ t.references :topic, null: false, index: { unique: true }
+ t.string :slug, null: false
+ t.timestamps
+ end
+
+ add_index :published_pages, :slug, unique: true
+ end
+end
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 851dddf8811..00d496e46eb 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -485,6 +485,14 @@ class Guardian
(components - Theme.components_for(parent)).empty?
end
+ def can_publish_page?(topic)
+ return false unless SiteSetting.enable_page_publishing?
+ return false if topic.blank?
+ return false if topic.private_message?
+ return false unless can_see_topic?(topic)
+ is_staff?
+ end
+
def auth_token
if cookie = request&.cookies[Auth::DefaultCurrentUserProvider::TOKEN_COOKIE]
UserAuthToken.hash_token(cookie)
diff --git a/lib/stylesheet/watcher.rb b/lib/stylesheet/watcher.rb
index 384f7515d10..d2d49c2ab93 100644
--- a/lib/stylesheet/watcher.rb
+++ b/lib/stylesheet/watcher.rb
@@ -78,7 +78,7 @@ module Stylesheet
target = nil
if !plugin_name
- target_match = long.match(/admin|desktop|mobile/)
+ target_match = long.match(/admin|desktop|mobile|publish/)
if target_match&.length
target = target_match[0]
end
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index 94f31f44b18..82ae26c573c 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -596,6 +596,10 @@ class TopicView
ReviewableQueuedPost.viewable_by(@user).where(topic_id: @topic.id).pending.count
end
+ def published_page
+ @topic.published_page
+ end
+
protected
def read_posts_set
diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb
index bea0404696c..97a1b0c2e06 100644
--- a/spec/components/guardian_spec.rb
+++ b/spec/components/guardian_spec.rb
@@ -3476,4 +3476,36 @@ describe Guardian do
expect(guardian.auth_token).to eq(token.auth_token)
end
end
+
+ describe "can_publish_page?" do
+ context "when disabled" do
+ it "is false for staff" do
+ expect(Guardian.new(admin).can_publish_page?(topic)).to eq(false)
+ end
+ end
+
+ context "when enabled" do
+ before do
+ SiteSetting.enable_page_publishing = true
+ end
+
+ it "is false for anonymous users" do
+ expect(Guardian.new.can_publish_page?(topic)).to eq(false)
+ end
+
+ it "is false for regular users" do
+ expect(Guardian.new(user).can_publish_page?(topic)).to eq(false)
+ end
+
+ it "is true for staff" do
+ expect(Guardian.new(moderator).can_publish_page?(topic)).to eq(true)
+ expect(Guardian.new(admin).can_publish_page?(topic)).to eq(true)
+ end
+
+ it "is false if the topic is a private message" do
+ post = Fabricate(:private_message_post, user: admin)
+ expect(Guardian.new(admin).can_publish_page?(post.topic)).to eq(false)
+ end
+ end
+ end
end
diff --git a/spec/fabricators/published_page_fabricator.rb b/spec/fabricators/published_page_fabricator.rb
new file mode 100644
index 00000000000..44f8da98da2
--- /dev/null
+++ b/spec/fabricators/published_page_fabricator.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+Fabricator(:published_page) do
+ topic
+ slug "published-page-test"
+end
diff --git a/spec/models/published_page_spec.rb b/spec/models/published_page_spec.rb
new file mode 100644
index 00000000000..e863cdb4730
--- /dev/null
+++ b/spec/models/published_page_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe PublishedPage, type: :model do
+
+ fab!(:topic) { Fabricate(:topic) }
+
+ it "has path and url helpers" do
+ pp = PublishedPage.create!(topic: topic, slug: 'hello-world')
+ expect(pp.path).to eq("/pub/hello-world")
+ expect(pp.url).to eq(Discourse.base_url + "/pub/hello-world")
+ end
+
+ it "validates the slug" do
+ expect(PublishedPage.new(topic: topic, slug: "this-is-valid")).to be_valid
+ expect(PublishedPage.new(topic: topic, slug: "10_things_i_hate_about_slugs")).to be_valid
+ expect(PublishedPage.new(topic: topic, slug: "YELLING")).to be_valid
+
+ expect(PublishedPage.new(topic: topic, slug: "how about some space")).not_to be_valid
+ expect(PublishedPage.new(topic: topic, slug: "slugs are %%%%")).not_to be_valid
+
+ expect(PublishedPage.new(topic: topic, slug: "check-slug")).not_to be_valid
+ expect(PublishedPage.new(topic: topic, slug: "by-topic")).not_to be_valid
+ end
+
+end
diff --git a/spec/requests/published_pages_controller_spec.rb b/spec/requests/published_pages_controller_spec.rb
new file mode 100644
index 00000000000..6b3a6894f46
--- /dev/null
+++ b/spec/requests/published_pages_controller_spec.rb
@@ -0,0 +1,170 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe PublishedPagesController do
+ fab!(:published_page) { Fabricate(:published_page) }
+ fab!(:admin) { Fabricate(:admin) }
+ fab!(:user) { Fabricate(:user) }
+
+ context "when enabled" do
+ before do
+ SiteSetting.enable_page_publishing = true
+ end
+
+ context "check slug availability" do
+ it "returns true for a new slug" do
+ get "/pub/check-slug.json?slug=cool-slug-man"
+ expect(response).to be_successful
+ expect(response.parsed_body["valid_slug"]).to eq(true)
+ end
+
+ it "returns true for a new slug with whitespace" do
+ get "/pub/check-slug.json?slug=cool-slug-man%20"
+ expect(response).to be_successful
+ expect(response.parsed_body["valid_slug"]).to eq(true)
+ end
+
+ it "returns false for an empty value" do
+ get "/pub/check-slug.json?slug="
+ expect(response).to be_successful
+ expect(response.parsed_body["valid_slug"]).to eq(false)
+ expect(response.parsed_body["reason"]).to be_present
+ end
+
+ it "returns false for a reserved value" do
+ get "/pub/check-slug.json", params: { slug: "check-slug" }
+ expect(response).to be_successful
+ expect(response.parsed_body["valid_slug"]).to eq(false)
+ expect(response.parsed_body["reason"]).to be_present
+ end
+ end
+
+ context "show" do
+ it "returns 404 for a missing article" do
+ get "/pub/no-article-here-no-thx"
+ expect(response.status).to eq(404)
+ end
+
+ context "private topic" do
+ fab!(:group) { Fabricate(:group) }
+ fab!(:private_category) { Fabricate(:private_category, group: group) }
+
+ before do
+ published_page.topic.update!(category: private_category)
+ end
+
+ it "returns 403 for a topic you can't see" do
+ get published_page.path
+ expect(response.status).to eq(403)
+ end
+
+ context "as an admin" do
+ before do
+ sign_in(admin)
+ end
+
+ it "returns 200" do
+ get published_page.path
+ expect(response.status).to eq(200)
+ end
+ end
+ end
+
+ it "returns an error for an article you can't see" do
+ get "/pub/no-article-here-no-thx"
+ expect(response.status).to eq(404)
+ end
+
+ it "returns 200 for a valid article" do
+ get published_page.path
+ expect(response.status).to eq(200)
+ end
+ end
+
+ context "publishing" do
+ fab!(:topic) { Fabricate(:topic) }
+
+ it "returns invalid access for non-staff" do
+ sign_in(user)
+ put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'cant-do-this' } }
+ expect(response.status).to eq(403)
+ end
+
+ context "with a valid staff account" do
+ before do
+ sign_in(admin)
+ end
+
+ it "creates the published page record" do
+ put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'i-hate-salt' } }
+ expect(response).to be_successful
+ expect(response.parsed_body['published_page']).to be_present
+ expect(response.parsed_body['published_page']['slug']).to eq("i-hate-salt")
+
+ expect(PublishedPage.exists?(topic_id: response.parsed_body['published_page']['id'])).to eq(true)
+ expect(UserHistory.exists?(
+ acting_user_id: admin.id,
+ action: UserHistory.actions[:page_published],
+ topic_id: topic.id
+ )).to be(true)
+ end
+
+ it "returns an error if the slug is already taken" do
+ PublishedPage.create!(slug: 'i-hate-salt', topic: Fabricate(:topic))
+ put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'i-hate-salt' } }
+ expect(response).not_to be_successful
+ end
+
+ it "returns an error if the topic already has been published" do
+ PublishedPage.create!(slug: 'already-done-pal', topic: topic)
+ put "/pub/by-topic/#{topic.id}.json", params: { published_page: { slug: 'i-hate-salt' } }
+ expect(response).to be_successful
+ expect(PublishedPage.exists?(topic_id: topic.id)).to eq(true)
+ end
+
+ end
+ end
+
+ context "destroy" do
+
+ it "returns invalid access for non-staff" do
+ sign_in(user)
+ delete "/pub/by-topic/#{published_page.topic_id}.json"
+ expect(response.status).to eq(403)
+ end
+
+ context "with a valid staff account" do
+ before do
+ sign_in(admin)
+ end
+
+ it "deletes the record" do
+ topic_id = published_page.topic_id
+
+ delete "/pub/by-topic/#{topic_id}.json"
+ expect(response).to be_successful
+ expect(PublishedPage.exists?(slug: published_page.slug)).to eq(false)
+
+ expect(UserHistory.exists?(
+ acting_user_id: admin.id,
+ action: UserHistory.actions[:page_unpublished],
+ topic_id: topic_id
+ )).to be(true)
+ end
+ end
+ end
+ end
+
+ context "when disabled" do
+ before do
+ SiteSetting.enable_page_publishing = false
+ end
+
+ it "returns 404 for any article" do
+ get published_page.path
+ expect(response.status).to eq(404)
+ end
+ end
+
+end
diff --git a/spec/serializers/topic_view_serializer_spec.rb b/spec/serializers/topic_view_serializer_spec.rb
index b0627ab05f5..a80f884812f 100644
--- a/spec/serializers/topic_view_serializer_spec.rb
+++ b/spec/serializers/topic_view_serializer_spec.rb
@@ -258,6 +258,16 @@ describe TopicViewSerializer do
expect(details[:allowed_groups].find { |ag| ag[:id] == group.id }).to be_present
end
+ it "has can_publish_page if possible" do
+ SiteSetting.enable_page_publishing = true
+
+ json = serialize_topic(topic, user)
+ expect(json[:details][:can_publish_page]).to be_blank
+
+ json = serialize_topic(topic, admin)
+ expect(json[:details][:can_publish_page]).to eq(true)
+ end
+
context "can_edit_tags" do
before do
SiteSetting.tagging_enabled = true
@@ -279,4 +289,26 @@ describe TopicViewSerializer do
end
end
+ context "published_page" do
+ fab!(:published_page) { Fabricate(:published_page, topic: topic) }
+
+ it "doesn't return the published page if not enabled" do
+ json = serialize_topic(topic, admin)
+ expect(json[:published_page]).to be_blank
+ end
+
+ it "doesn't return the published page unless staff" do
+ SiteSetting.enable_page_publishing = true
+ json = serialize_topic(topic, user)
+ expect(json[:published_page]).to be_blank
+ end
+
+ it "returns the published page if enabled and staff" do
+ SiteSetting.enable_page_publishing = true
+ json = serialize_topic(topic, admin)
+ expect(json[:published_page]).to be_present
+ expect(json[:published_page][:slug]).to eq("published-page-test")
+ end
+ end
+
end
diff --git a/test/javascripts/acceptance/page-publishing-test.js b/test/javascripts/acceptance/page-publishing-test.js
new file mode 100644
index 00000000000..2b51229bb28
--- /dev/null
+++ b/test/javascripts/acceptance/page-publishing-test.js
@@ -0,0 +1,40 @@
+import { acceptance } from "helpers/qunit-helpers";
+
+acceptance("Page Publishing", {
+ loggedIn: true,
+ pretend(server, helper) {
+ const validSlug = helper.response({ valid_slug: true });
+
+ server.put("/pub/by-topic/280", () => {
+ return helper.response({});
+ });
+ server.get("/pub/by-topic/280", () => {
+ return helper.response({});
+ });
+ server.get("/pub/check-slug", req => {
+ if (req.queryParams.slug === "internationalization-localization") {
+ return validSlug;
+ }
+ return helper.response({
+ valid_slug: false,
+ reason: "i don't need a reason"
+ });
+ });
+ }
+});
+QUnit.test("can publish a page via modal", async assert => {
+ await visit("/t/internationalization-localization/280");
+ await click(".topic-post:eq(0) button.show-more-actions");
+ await click(".topic-post:eq(0) button.show-post-admin-menu");
+ await click(".topic-post:eq(0) .publish-page");
+
+ await fillIn(".publish-slug", "bad-slug");
+ assert.ok(!exists(".valid-slug"));
+ assert.ok(exists(".invalid-slug"));
+ await fillIn(".publish-slug", "internationalization-localization");
+ assert.ok(exists(".valid-slug"));
+ assert.ok(!exists(".invalid-slug"));
+
+ await click(".publish-page");
+ assert.ok(exists(".current-url"));
+});
diff --git a/test/javascripts/fixtures/topic.js b/test/javascripts/fixtures/topic.js
index 7c380de3a00..dedf9814b83 100644
--- a/test/javascripts/fixtures/topic.js
+++ b/test/javascripts/fixtures/topic.js
@@ -1977,6 +1977,7 @@ export default {
pinned: false,
pinned_at: null,
details: {
+ can_publish_page: true,
can_invite_via_email: true,
auto_close_at: null,
auto_close_hours: null,
+
+<%= @topic.title %>
+ +
+ 
+
+
+
+ <%- if @topic.first_post.present? %>
+
+ <%= @topic.first_post.cooked.html_safe %>
+
+ <%- end -%>
+