forked from discourse/discourse
-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support for Embeddable Comments via IFRAME
- Loading branch information
Showing
28 changed files
with
672 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/* global discourseUrl */ | ||
/* global discourseEmbedUrl */ | ||
(function() { | ||
|
||
var comments = document.getElementById('discourse-comments'), | ||
iframe = document.createElement('iframe'); | ||
iframe.src = discourseUrl + "embed/best?embed_url=" + encodeURIComponent(discourseEmbedUrl); | ||
iframe.id = 'discourse-embed-frame'; | ||
iframe.width = "100%"; | ||
iframe.frameBorder = "0"; | ||
iframe.scrolling = "no"; | ||
comments.appendChild(iframe); | ||
|
||
|
||
function postMessageReceived(e) { | ||
if (!e) { return; } | ||
if (discourseUrl.indexOf(e.origin) === -1) { return; } | ||
|
||
if (e.data) { | ||
if (e.data.type === 'discourse-resize' && e.data.height) { | ||
iframe.height = e.data.height + "px"; | ||
} | ||
} | ||
} | ||
window.addEventListener('message', postMessageReceived, false); | ||
|
||
})(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
//= require ./vendor/normalize | ||
//= require ./common/foundation/base | ||
|
||
article.post { | ||
border-bottom: 1px solid #ddd; | ||
|
||
.post-date { | ||
float: right; | ||
color: #aaa; | ||
font-size: 12px; | ||
margin: 4px 4px 0 0; | ||
} | ||
|
||
.author { | ||
padding: 20px 0; | ||
width: 92px; | ||
float: left; | ||
|
||
text-align: center; | ||
|
||
h3 { | ||
text-align: center; | ||
color: #4a6b82; | ||
font-size: 13px; | ||
margin: 0; | ||
} | ||
} | ||
|
||
.cooked { | ||
padding: 20px 0; | ||
margin-left: 92px; | ||
|
||
p { | ||
margin: 0 0 1em 0; | ||
} | ||
} | ||
} | ||
|
||
header { | ||
padding: 10px 10px 20px 10px; | ||
|
||
font-size: 18px; | ||
|
||
border-bottom: 1px solid #ddd; | ||
} | ||
|
||
footer { | ||
font-size: 18px; | ||
|
||
.logo { | ||
margin-right: 10px; | ||
margin-top: 10px; | ||
} | ||
|
||
a[href].button { | ||
margin: 10px 0 0 10px; | ||
} | ||
} | ||
|
||
.logo { | ||
float: right; | ||
max-height: 30px; | ||
} | ||
|
||
a[href].button { | ||
background-color: #eee; | ||
padding: 5px; | ||
display: inline-block; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
class EmbedController < ApplicationController | ||
skip_before_filter :check_xhr | ||
skip_before_filter :preload_json | ||
before_filter :ensure_embeddable | ||
|
||
layout 'embed' | ||
|
||
def best | ||
embed_url = params.require(:embed_url) | ||
topic_id = TopicEmbed.topic_id_for_embed(embed_url) | ||
|
||
if topic_id | ||
@topic_view = TopicView.new(topic_id, current_user, {best: 5}) | ||
else | ||
Jobs.enqueue(:retrieve_topic, user_id: current_user.try(:id), embed_url: embed_url) | ||
render 'loading' | ||
end | ||
|
||
discourse_expires_in 1.minute | ||
end | ||
|
||
private | ||
|
||
def ensure_embeddable | ||
raise Discourse::InvalidAccess.new('embeddable host not set') if SiteSetting.embeddable_host.blank? | ||
raise Discourse::InvalidAccess.new('invalid referer host') if URI(request.referer || '').host != SiteSetting.embeddable_host | ||
|
||
response.headers['X-Frame-Options'] = "ALLOWALL" | ||
rescue URI::InvalidURIError | ||
raise Discourse::InvalidAccess.new('invalid referer host') | ||
end | ||
|
||
|
||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
require_dependency 'email/sender' | ||
require_dependency 'topic_retriever' | ||
|
||
module Jobs | ||
|
||
# Asynchronously retrieve a topic from an embedded site | ||
class RetrieveTopic < Jobs::Base | ||
|
||
def execute(args) | ||
raise Discourse::InvalidParameters.new(:embed_url) unless args[:embed_url].present? | ||
|
||
user = nil | ||
if args[:user_id] | ||
user = User.where(id: args[:user_id]).first | ||
end | ||
|
||
TopicRetriever.new(args[:embed_url], no_throttle: user.try(:staff?)).retrieve | ||
end | ||
|
||
end | ||
|
||
end | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
# | ||
# Creates and Updates Topics based on an RSS or ATOM feed. | ||
# | ||
require 'digest/sha1' | ||
require_dependency 'post_creator' | ||
require_dependency 'post_revisor' | ||
|
||
module Jobs | ||
class PollFeed < Jobs::Scheduled | ||
recurrence { hourly } | ||
sidekiq_options retry: false | ||
|
||
def execute(args) | ||
poll_feed if SiteSetting.feed_polling_enabled? && | ||
SiteSetting.feed_polling_url.present? && | ||
SiteSetting.embed_by_username.present? | ||
end | ||
|
||
def feed_key | ||
@feed_key ||= "feed-modified:#{Digest::SHA1.hexdigest(SiteSetting.feed_polling_url)}" | ||
end | ||
|
||
def poll_feed | ||
user = User.where(username_lower: SiteSetting.embed_by_username.downcase).first | ||
return if user.blank? | ||
|
||
fetch_opts = {} | ||
|
||
last_modified = $redis.get(feed_key) | ||
if last_modified.present? | ||
fetch_opts[:if_modified_since] = Time.parse(last_modified) | ||
end | ||
|
||
require 'feedzirra' | ||
feed = Feedzirra::Feed.fetch_and_parse(SiteSetting.feed_polling_url, fetch_opts) | ||
|
||
if feed.respond_to?(:entries) | ||
feed.entries.each do |e| | ||
url = e.url | ||
url = e.id if url.blank? || url !~ /^https?\:\/\// | ||
TopicEmbed.import(user, url, e.title, e.content) | ||
end | ||
|
||
# Store last modified for faster requests from feeds | ||
$redis.set(feed_key, feed.last_modified) | ||
|
||
false | ||
end | ||
end | ||
|
||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
require_dependency 'nokogiri' | ||
|
||
class TopicEmbed < ActiveRecord::Base | ||
belongs_to :topic | ||
belongs_to :post | ||
validates_presence_of :embed_url | ||
validates_presence_of :content_sha1 | ||
|
||
# Import an article from a source (RSS/Atom/Other) | ||
def self.import(user, url, title, contents) | ||
return unless url =~ /^https?\:\/\// | ||
|
||
contents << "\n<hr>\n<small>#{I18n.t('embed.imported_from', link: "<a href='#{url}'>#{url}</a>")}</small>\n" | ||
|
||
embed = TopicEmbed.where(embed_url: url).first | ||
content_sha1 = Digest::SHA1.hexdigest(contents) | ||
post = nil | ||
|
||
# If there is no embed, create a topic, post and the embed. | ||
if embed.blank? | ||
Topic.transaction do | ||
creator = PostCreator.new(user, title: title, raw: absolutize_urls(url, contents), skip_validations: true, cook_method: Post.cook_methods[:raw_html]) | ||
post = creator.create | ||
if post.present? | ||
TopicEmbed.create!(topic_id: post.topic_id, | ||
embed_url: url, | ||
content_sha1: content_sha1, | ||
post_id: post.id) | ||
end | ||
end | ||
else | ||
post = embed.post | ||
# Update the topic if it changed | ||
if content_sha1 != embed.content_sha1 | ||
revisor = PostRevisor.new(post) | ||
revisor.revise!(user, absolutize_urls(url, contents), skip_validations: true, bypass_rate_limiter: true) | ||
embed.update_column(:content_sha1, content_sha1) | ||
end | ||
end | ||
|
||
post | ||
end | ||
|
||
def self.import_remote(user, url, opts=nil) | ||
require 'ruby-readability' | ||
|
||
opts = opts || {} | ||
doc = Readability::Document.new(open(url).read, | ||
tags: %w[div p code pre h1 h2 h3 b em i strong a img], | ||
attributes: %w[href src]) | ||
|
||
TopicEmbed.import(user, url, opts[:title] || doc.title, doc.content) | ||
end | ||
|
||
# Convert any relative URLs to absolute. RSS is annoying for this. | ||
def self.absolutize_urls(url, contents) | ||
uri = URI(url) | ||
prefix = "#{uri.scheme}://#{uri.host}" | ||
prefix << ":#{uri.port}" if uri.port != 80 && uri.port != 443 | ||
|
||
fragment = Nokogiri::HTML.fragment(contents) | ||
fragment.css('a').each do |a| | ||
href = a['href'] | ||
if href.present? && href.start_with?('/') | ||
a['href'] = "#{prefix}/#{href.sub(/^\/+/, '')}" | ||
end | ||
end | ||
fragment.css('img').each do |a| | ||
src = a['src'] | ||
if src.present? && src.start_with?('/') | ||
a['src'] = "#{prefix}/#{src.sub(/^\/+/, '')}" | ||
end | ||
end | ||
|
||
fragment.to_html | ||
end | ||
|
||
def self.topic_id_for_embed(embed_url) | ||
TopicEmbed.where(embed_url: embed_url).pluck(:topic_id).first | ||
end | ||
|
||
end |
Oops, something went wrong.