onebox 1.8.95 → 1.8.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d02de0d9a88959e66217ddb8ee376a74b2966329d6898141ca27c1c67bf528c
-  data.tar.gz: 586f0dd3b4f7ff9339d02ace072fc0e7e18b7f842e9d6a1466e6e4f69cd9ccc4
+  metadata.gz: 3f16554d39128fb96f768eb076e102f93a3a3a5b25225470babdc73b595cc039
+  data.tar.gz: e940f9efc136221d4343871fe9ed7032879866358d9c06cba4224d0a6b9d1e9e
 SHA512:
-  metadata.gz: b0ee8ace0a72a29fdd6c8d6dabe2648863c3168dd2aa861d766a7a4b51924e6bb562347b3de252cb922d7007f6e776c5901510854aa492d9917fe27cfc8e2491
-  data.tar.gz: 73417906a702859c059967b3b635438883278542cc3ad4b9a70a2ff3d0408a9a33e441a79125f38db8169859bc50244a690a72fee448e11fa61be3cff6405007
+  metadata.gz: d2331514eb4a99ccb813fd8f61522d326d42209a7bb184b24cc8484fa85b7894b8fcfb78806a5a6bbe9012a645c141f5bec30c34d9a900c8d0616671df2bd994
+  data.tar.gz: 484b176b361a4afb29d334a8491a9e3dcc51686594c96b23162a2c634b58d357d3e851bf8ecaf952aa847ac86546b34938057eabbf8bfaf9ee6fe20bcb3b6a7a

data/lib/onebox/engine/twitter_status_onebox.rb

@@ -23,7 +23,7 @@ module Onebox
             twitter_data[m_property.to_sym] = m_content
           end
         end
-        return twitter_data
+        twitter_data
       end
 
       def match
@@ -31,7 +31,7 @@ module Onebox
       end
 
       def twitter_data
-        @twitter_data = get_twitter_data
+        @twitter_data ||= get_twitter_data
       end
 
       def client
@@ -51,9 +51,7 @@ module Onebox
       end
 
       def access(*keys)
-        keys.reduce(raw) do |memo, key|
-          memo[key] || memo[key.to_s]
-        end
+        raw.dig *keys
       end
 
       def tweet
@@ -66,13 +64,12 @@ module Onebox
 
       def timestamp
         if twitter_api_credentials_present?
-          created_at = access(:created_at)
-          date = DateTime.strptime(created_at, "%a %b %d %H:%M:%S %z %Y")
+          date = DateTime.strptime(access(:created_at), "%a %b %d %H:%M:%S %z %Y")
           user_offset = access(:user, :utc_offset).to_i
           offset = (user_offset >= 0 ? "+" : "-") + Time.at(user_offset.abs).gmtime.strftime("%H%M")
           date.new_offset(offset).strftime("%-l:%M %p - %-d %b %Y")
         else
-          raw.at_css(".tweet-timestamp").attr('title')
+          attr_at_css(".tweet-timestamp", 'title')
         end
       end
 
@@ -80,7 +77,7 @@ module Onebox
         if twitter_api_credentials_present?
           "#{access(:user, :name)} (#{access(:user, :screen_name)})"
         else
-          "#{raw.css('.tweet.permalink-tweet')[0].attribute('data-name')} (#{raw.css('.tweet.permalink-tweet')[0].attribute('data-screen-name')})"
+          "#{attr_at_css('.tweet.permalink-tweet', 'data-name')} (#{attr_at_css('.tweet.permalink-tweet', 'data-screen-name')})"
         end
       end
 
@@ -94,30 +91,74 @@ module Onebox
 
       def likes
         if twitter_api_credentials_present?
-          count = access(:favorite_count).to_i
-          return count > 0 ? client.prettify_number(count) : nil
+          prettify_number(access(:favorite_count).to_i)
         else
-          raw.at_css(".request-favorited-popup").attr('data-compact-localized-count') rescue nil
+          attr_at_css(".request-favorited-popup", 'data-compact-localized-count')
         end
       end
 
       def retweets
         if twitter_api_credentials_present?
-          count = access(:retweet_count).to_i
-          return count > 0 ? client.prettify_number(count) : nil
+          prettify_number(access(:retweet_count).to_i)
         else
-          raw.at_css(".request-retweeted-popup").attr('data-compact-localized-count') rescue nil
+          attr_at_css(".request-retweeted-popup", 'data-compact-localized-count')
         end
       end
 
+      def quoted_full_name
+        if twitter_api_credentials_present?
+          access(:quoted_status, :user, :name)
+        else
+          raw.css('.QuoteTweet-fullname')[0]&.text
+        end
+      end
+
+      def quoted_screen_name
+        if twitter_api_credentials_present?
+          access(:quoted_status, :user, :screen_name)
+        else
+          attr_at_css(".QuoteTweet-innerContainer", "data-screen-name")
+        end
+      end
+
+      def quoted_tweet
+        if twitter_api_credentials_present?
+          access(:quoted_status, :full_text)
+        else
+          raw.css('.QuoteTweet-text')[0]&.text
+        end
+      end
+
+      def quoted_link
+        if twitter_api_credentials_present?
+          "https://twitter.com/#{quoted_screen_name}/status/#{access(:quoted_status, :id)}"
+        else
+          "https://twitter.com#{attr_at_css(".QuoteTweet-innerContainer", "href")}"
+        end
+      end
+
+      def prettify_number(count)
+        count > 0 ? client.prettify_number(count) : nil
+      end
+
+      def attr_at_css(css_property, attribute_name)
+        raw.at_css(css_property)&.attr(attribute_name)
+      end
+
       def data
-        { link: link,
+        @data ||= {
+          link: link,
           tweet: tweet,
           timestamp: timestamp,
           title: title,
           avatar: avatar,
           likes: likes,
-          retweets: retweets }
+          retweets: retweets,
+          quoted_tweet: quoted_tweet,
+          quoted_full_name: quoted_full_name,
+          quoted_screen_name: quoted_screen_name,
+          quoted_link: quoted_link
+        }
       end
     end
   end

data/lib/onebox/version.rb

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

data/templates/twitterstatus.mustache

@@ -5,7 +5,19 @@
   </a>
 </h4>
 
-<div class="tweet">{{{tweet}}}</div>
+<div class="tweet">
+  {{{tweet}}}
+  {{#quoted_tweet}}
+    <a class="quoted-link" href="{{quoted_link}}">
+      <div class="quoted">
+        <p class="quoted-title">{{quoted_full_name}} <span>@{{quoted_screen_name}}</span></p>
+        <div>
+          {{quoted_tweet}}
+        </div>
+      </div>
+    </a>
+  {{/quoted_tweet}}
+</div>
 
 <div class='date'>
   <a href="{{link}}" target="_blank">{{timestamp}}</a>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onebox
 version: !ruby/object:Gem::Version
-  version: 1.8.95
+  version: 1.8.96
 platform: ruby
 authors:
 - Joanna Zeta
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json