brutalismbot 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90f5979e9db90f44925f11aa92d7fa675ec789ca9566c6fe4a05242e372efffc
-  data.tar.gz: a40a5b670b464532893c14577afb4f6c1b1f773754e921f1ab8c7cb43a51ac37
+  metadata.gz: 28218fbe0be73eed7c6f58124f4845c2ddcbcd5734055295c93ab544767455cf
+  data.tar.gz: 304ae833546888f31d9177e907bc6caba0f486a11048b8a16b2fcbe71ec2166b
 SHA512:
-  metadata.gz: 530a4b7290fd4555457f2f04d56ac4989b61eef290daaf27df71f71907a94b7d339903ee4889abf0d4a847d96080e28aa0cfee2796e6d0ea0c162dced6cd0478
-  data.tar.gz: d21755276d9592685a7b65fa23bc047e27ef0b722f54cfc71f6ca744577c0ade72f04f7665b931b7553639e0c87cca9a2f680556cec036cd680ad8d6895bcf9f
+  metadata.gz: dd8b2c2d014f52ce4a4d845e7342b4c5c8c4e5d62269b390376ea7de198b2098f800e9dea9931ec55e4c0ce17a4ca8badb66a2c92113c95c89901600cfbf2127
+  data.tar.gz: 254fed1155712f30f0440f38fb05576aabda571a9f6a592b8598f27f6b3bce4dbe27ac798b31aa37a6bfef200a07df5045c4633383471726751fbf34af3a6e98

data/lib/brutalismbot/reddit/post.rb

@@ -1,5 +1,6 @@
 require "forwardable"
 require "json"
+require "net/http"
 
 require "brutalismbot/base"
 
@@ -38,10 +39,45 @@ module Brutalismbot
         "#<#{self.class} #{data["permalink"]}>"
       end
 
+      def is_self?
+        data["is_self"]
+      end
+
       def kind
         @item["kind"]
       end
 
+      def media_uri
+        URI.parse(media_url)
+      end
+
+      def media_url
+        # Use URL if it's an image
+        if mime_type.start_with?("image/")
+          data["url"]
+
+        # Extract preview image URL
+        else
+          images = data.dig("preview", "images") || {}
+          source = images.map{|x| x["source"] }.compact.max do |a,b|
+            a.slice("width", "height").values <=> b.slice("width", "height").values
+          end
+          CGI.unescape_html(source["url"])
+        end
+      end
+
+      def mime_type
+        @mime ||= begin
+          uri = URI.parse(data["url"])
+          ssl = uri.scheme == "https"
+          Brutalismbot.logger.info("HEAD #{uri}")
+          Net::HTTP.start(uri.host, uri.port, use_ssl: ssl) do |http|
+            req = Net::HTTP::Head.new(uri)
+            http.request(req)["Content-Type"]
+          end
+        end
+      end
+
       def path
         created_utc.strftime("year=%Y/month=%Y-%m/day=%Y-%m-%d/%s.json")
       end
@@ -65,7 +101,7 @@ module Brutalismbot
       end
 
       def to_slack
-        url.nil? ? to_slack_text : to_slack_image
+        is_self? ? to_slack_text : to_slack_image
       end
 
       def to_slack_image
@@ -78,7 +114,7 @@ module Brutalismbot
                 text: "/r/brutalism",
                 emoji: true,
               },
-              image_url: url,
+              image_url: media_url,
               alt_text: title,
             },
             {
@@ -120,13 +156,7 @@ module Brutalismbot
       end
 
       def url
-        images = data.dig("preview", "images") || {}
-        source = images.map{|x| x["source"] }.compact.max do |a,b|
-          a.slice("width", "height").values <=> b.slice("width", "height").values
-        end
-        CGI.unescapeHTML(source.dig("url"))
-      rescue NoMethodError
-        data["media_metadata"]&.values&.first&.dig("s", "u")
+        data["url"]
       end
     end
   end

data/lib/brutalismbot/reddit/stub.rb

@@ -16,18 +16,19 @@ module Brutalismbot
               created_utc: created_utc.to_i,
               permalink:   "/r/brutalism/comments/#{permalink_id}/test/",
               title:       "Post to /r/brutalism",
+              url:         "https://image.host/#{image_id}.jpg",
               preview: {
                 images: [
                   {
                     source: {
-                      url: "https://preview.redd.it/#{image_id}.jpg",
+                      url: "https://preview.image.host/#{image_id}_large.jpg",
                       width: 1000,
                       height: 1000,
                     },
                   },
                   {
                     source: {
-                      url: "https://preview.redd.it/small.jpg",
+                      url: "https://preview.image.host/#{image_id}_small.jpg",
                       width: 500,
                       height: 500,
                     }

data/lib/brutalismbot/twitter/client.rb

@@ -20,22 +20,20 @@ module Brutalismbot
       end
 
       def push(post, dryrun:nil)
-        Brutalismbot.logger.info("PUSH #{"DRYRUN " if dryrun}twitter://@brutalismbot")
-        method = post.url.nil? ? :push_text : :push_image
+        method = post.is_self? ? :push_text : :push_image
         send(method, post, dryrun: dryrun)
       end
 
       def push_text(post, dryrun:nil)
-        status = post.to_twitter
-        @client.update(status) unless dryrun
+        Brutalismbot.logger.info("PUSH #{"DRYRUN " if dryrun}twitter://@brutalismbot")
+        @client.update(post.to_twitter) unless dryrun
       end
 
       def push_image(post, dryrun:nil)
-        status = post.to_twitter
-        uri    = URI.parse(post.url)
-        Brutalismbot.logger.info("GET #{uri}")
-        uri.open do |media|
-          @client.update_with_media(status, media)
+        Brutalismbot.logger.info("GET #{post.media_uri}")
+        Brutalismbot.logger.info("PUSH #{"DRYRUN " if dryrun}twitter://@brutalismbot")
+        post.media_uri.open do |media|
+          @client.update_with_media(post.to_twitter, media)
         end unless dryrun
       end
     end

data/lib/brutalismbot/version.rb

@@ -1,3 +1,3 @@
 module Brutalismbot
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brutalismbot
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Alexander Mancevice
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-18 00:00:00.000000000 Z
+date: 2020-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter