onebox 1.9.27.2 → 1.9.28.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fca47c06a126297d920bed356ad801c63eeb0d6f43b522f39d3216ec20484315
-  data.tar.gz: 5e5beb3d0c7c5a06223f7477bdf7f7576a2931f136c12c77e7cdc26c450a9369
+  metadata.gz: 2f0921bd8d91072c930eccee436ef05e362fbe20b0d4ec8d39cecb74580723c9
+  data.tar.gz: 58ff915a7d3a7dcbf2a7a0bcaf66366ad6210ba17b84695695be9a067c54be92
 SHA512:
-  metadata.gz: 8d1a204e8e952f4146988dce521f16a8729a31798671befdb56f2e13513744f63c94208edbeb0a7212c1b08d73c4b3224053f1d0a569fd754be3502d7c7e50a2
-  data.tar.gz: b0f9a0bff3d4013d492e7578034fb520f6f9cab4bd57f7c389e5a39b25801461582f0bc7c6ee432bb4ea2665c444bf3f980319343bd1d57f665643bd1e0881c7
+  metadata.gz: 5eb93e33a7c8c4919d47d03975545d08be18038d83e6b763ab5e7fabb1fe9b9a1ddc35a688656234e37231dff9b131900e87d00d0363e5e6f3454d9dad2988ed
+  data.tar.gz: 7097f982b53eb11d057f601af63e928941f086534a03ec7d92eb7794bf2981a9138d6891add442f52345b91a70f611397a86e4647a7302a12991d8560c5c96ba

data/.rubocop.yml

@@ -1 +1,2 @@
-inherit_from: https://raw.githubusercontent.com/discourse/discourse/master/.rubocop.yml
+inherit_gem:
+  rubocop-discourse: default.yml

data/lib/onebox/engine.rb

@@ -176,5 +176,6 @@ require_relative "engine/instagram_onebox"
 require_relative "engine/gitlab_blob_onebox"
 require_relative "engine/google_photos_onebox"
 require_relative "engine/kaltura_onebox"
-require_relative "engine/reddit_image_onebox"
+require_relative "engine/reddit_media_onebox"
 require_relative "engine/google_drive_onebox"
+require_relative "engine/facebook_media_onebox"

data/lib/onebox/engine/facebook_media_onebox.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Onebox
+  module Engine
+    class FacebookMediaOnebox
+      include Engine
+      include StandardEmbed
+
+      matches_regexp(/^https?:\/\/.*\.facebook\.com\/(\w+)\/(videos|\?).*/)
+      always_https
+
+      def to_html
+        metadata = get_twitter
+        if metadata.present? && metadata[:card] == "player" && metadata[:player].present?
+          <<-HTML
+            <iframe src="#{metadata[:player]}"
+                    width="#{metadata[:player_width]}"
+                    height="#{metadata[:player_height]}"
+                    scrolling="no"
+                    frameborder="0"
+                    allowfullscreen>
+            </iframe>
+          HTML
+        else
+          html = Onebox::Engine::WhitelistedGenericOnebox.new(@url, @timeout).to_html
+          return if Onebox::Helpers.blank?(html)
+          html
+        end
+      end
+    end
+  end
+end

data/lib/onebox/engine/instagram_onebox.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'htmlentities'
-
 module Onebox
   module Engine
     class InstagramOnebox
@@ -9,25 +7,28 @@ module Onebox
       include StandardEmbed
       include LayoutSupport
 
-      matches_regexp(/^https?:\/\/(?:www\.)?(?:instagram\.com|instagr\.am)\/?(?:.*)\/p\//)
+      matches_regexp(/^https?:\/\/(?:www\.)?(?:instagram\.com|instagr\.am)\/?(?:.*)\/p\/[a-zA-Z\d_-]+/)
       always_https
 
-      def data
-        og = get_opengraph
-        title = og.title.split(":")[0].strip.gsub(" on Instagram", "")
-
-        json_data = html_doc.xpath('//script[contains(text(),"window._sharedData")]').text.to_s
-        title = "[Album] #{title}" if json_data =~ /"edge_sidecar_to_children"/
+      def clean_url
+        url.scan(/^https?:\/\/(?:www\.)?(?:instagram\.com|instagr\.am)\/?(?:.*)\/p\/[a-zA-Z\d_-]+/).flatten.first
+      end
 
-        result = { link: og.url,
-                   title: Onebox::Helpers.truncate(title, 80),
-                   description: og.description(250)
-                  }
+      def data
+        oembed = get_oembed
+        permalink = clean_url.gsub("/#{oembed.author_name}/", "/")
+
+        { link: permalink,
+          title: "@#{oembed.author_name}",
+          image: "#{permalink}/media/?size=l",
+          description: Onebox::Helpers.truncate(oembed.title, 250)
+        }
+      end
 
-        result[:image] = og.image if !og.image.nil?
-        result[:video_link] = og.url if !og.video_secure_url.nil?
+      protected
 
-        result
+      def get_oembed_url
+        oembed_url = "https://api.instagram.com/oembed/?url=#{clean_url}"
       end
     end
   end

data/lib/onebox/engine/{reddit_image_onebox.rb → reddit_media_onebox.rb}

@@ -2,7 +2,7 @@
 
 module Onebox
   module Engine
-    class RedditImageOnebox
+    class RedditMediaOnebox
       include Engine
       include StandardEmbed
 
@@ -25,6 +25,25 @@ module Onebox
               </article>
             </aside>
           HTML
+        elsif  raw[:type] =~ /^video[\/\.]/
+          <<-HTML
+            <aside class="onebox reddit">
+              <header class="source">
+                <img src="#{raw[:favicon]}" class="site-icon" width="16" height="16">
+                <a href="#{raw[:url]}" target="_blank" rel="nofollow ugc noopener">#{raw[:site_name]}</a>
+              </header>
+              <article class="onebox-body">
+                <h3><a href="#{raw[:url]}" target="_blank" rel="nofollow ugc noopener">#{raw[:title]}</a></h3>
+                <div class="aspect-image-full-size">
+                  <a href="#{raw[:url]}" target="_blank" rel="nofollow ugc noopener">
+                    <img src="#{raw[:image]}" class="scale-image"/>
+                    <span class="instagram-video-icon"></span>
+                  </a>
+                </div>
+                <div class="description"><p>#{raw[:description]}</p></div>
+              </article>
+            </aside>
+          HTML
         else
           html = Onebox::Engine::WhitelistedGenericOnebox.new(@url, @timeout).to_html
           return if Onebox::Helpers.blank?(html)

data/lib/onebox/engine/twitter_status_onebox.rb

@@ -10,10 +10,14 @@ module Onebox
       matches_regexp(/^https?:\/\/(mobile\.|www\.)?twitter\.com\/.+?\/status(es)?\/\d+(\/(video|photo)\/\d?+)?+(\/?\?.*)?\/?$/)
       always_https
 
+      def http_params
+        { 'User-Agent' => 'DiscourseBot/1.0' }
+      end
+
       private
 
       def get_twitter_data
-        response = Onebox::Helpers.fetch_response(url) rescue nil
+        response = Onebox::Helpers.fetch_response(url, nil, nil, http_params) rescue nil
         html = Nokogiri::HTML(response)
         twitter_data = {}
         html.css('meta').each do |m|

data/lib/onebox/engine/whitelisted_generic_onebox.rb

@@ -57,6 +57,7 @@ module Onebox
           ehow.com
           espn.go.com
           etsy.com
+          facebook.com
           findery.com
           folksy.com
           forbes.com
@@ -77,6 +78,7 @@ module Onebox
           kickstarter.com
           kinomap.com
           lessonplanet.com
+          linkedin.com
           liveleak.com
           livestream.com
           mashable.com

data/lib/onebox/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Onebox
-  VERSION = "1.9.27.2"
+  VERSION = "1.9.28.4"
 end

data/onebox.gemspec

@@ -33,8 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'fakeweb', '~> 1.3'
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'mocha', '~> 1.1'
-  spec.add_development_dependency 'rubocop', '~> 0.78.0'
-  spec.add_development_dependency 'rubocop-discourse', '~> 1.0.1'
+  spec.add_development_dependency 'rubocop-discourse', '~> 2.1.2'
   spec.add_development_dependency 'twitter', '~> 4.8'
   spec.add_development_dependency 'guard-rspec', '~> 4.2.8'
   spec.add_development_dependency 'sinatra', '~> 1.4'

data/templates/instagram.mustache

@@ -2,9 +2,9 @@
 
 {{#image}}
   <div class="instagram-images">
-    {{#video_link}} <a href="{{{video_link}}}" target="_blank" rel="noopener"> {{/video_link}}
+    <a href="{{{link}}}" target="_blank" rel="noopener">
       <img class="instagram-image" src="{{{image}}}"/>
-    {{#video_link}} <span class="instagram-video-icon"></span></a> {{/video_link}}
+    </a>
   </div>
 {{/image}}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.9.27.2
+  version: 1.9.28.4
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -180,34 +180,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.78.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.78.0
 - !ruby/object:Gem::Dependency
   name: rubocop-discourse
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
@@ -321,6 +307,7 @@ files:
 - lib/onebox/engine/bandcamp_onebox.rb
 - lib/onebox/engine/cloudapp_onebox.rb
 - lib/onebox/engine/coub_onebox.rb
+- lib/onebox/engine/facebook_media_onebox.rb
 - lib/onebox/engine/five_hundred_px_onebox.rb
 - lib/onebox/engine/flickr_onebox.rb
 - lib/onebox/engine/flickr_shortened_onebox.rb
@@ -349,7 +336,7 @@ files:
 - lib/onebox/engine/pastebin_onebox.rb
 - lib/onebox/engine/pdf_onebox.rb
 - lib/onebox/engine/pubmed_onebox.rb
-- lib/onebox/engine/reddit_image_onebox.rb
+- lib/onebox/engine/reddit_media_onebox.rb
 - lib/onebox/engine/replit_onebox.rb
 - lib/onebox/engine/simplecast_onebox.rb
 - lib/onebox/engine/sketchfab_onebox.rb