brutalismbot 1.8.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc9aa96ddf426ba53cd94234a85ab6b3b11237dcdfb8414ca522f983a58c807c
-  data.tar.gz: 87ccc44e65a2565e31a3e60c399ab2d6725f6594a12da582c273e9b95292020d
+  metadata.gz: b7a72ed65ec740aef21cb54256d7f8f9b9e3128a039eb217711ee02c372683bf
+  data.tar.gz: 75b2ebef6b98ec94b716fe00cb1f657b386e9d9c40d89211b37443c8f0d98fb0
 SHA512:
-  metadata.gz: a8160fd997677a8ab632be035009b1cea925c4791cc45109c9cba086eda92408b4d931394efa92a1b438357a9784206b2479ccf191397dd66f0beeb809af7d6f
-  data.tar.gz: bba9c3dda2a30a14209d74599a4bcd01e0cce55caa138970135fd001a0a9db79272c8acdb4d0bef6dce89970ac0cda8bbfca181d7d4febb0bcb8103e581e96f0
+  metadata.gz: 80fb1a88e38e9d1fc5988d7586aebd1859339cf9c3bcd67b08cb7a587f5b0c6c0ab6c13db295f2569c19088637ade5a5e2a28c7ed7064ed57a63e5329a1747b5
+  data.tar.gz: eca017057b7c3a4d0c2d184ea8a328af49e319d96ac02f42e51977a65a5677e31fedd770a484c960c78e5b1f5bcc1ed834c0239ebc9bd12c7d6f320ea24bbe9b

data/README.md

@@ -16,27 +16,27 @@ gem install brutalismbot
 ## Usage
 
 ```ruby
-require "brutalismbot/s3"
+require "brutalismbot"
 
-brutbot = Brutalismbot::S3::Client.new bucket: "my-bucket", prefix: "my/prefix/"
+bot = Brutalismbot::Client.new
 
 # Get latest cached post
-post = brutbot.posts.last
+post = bot.posts.last
 
 # Get newest posts
-brutbot.subreddit.posts(:new).all
+bot.reddit.list(:new).all
 
 # Get new posts since latest
-brutbot.subreddit.posts(:new, before: post.fullname).all
+bot.reddit.list(:new, before: post.fullname).all
 
 # Get current top post
-brutbot.subreddit.posts(:top, limit: 1).first
+bot.reddit.list(:top, limit: 1).first
 
 # Pull latest posts
-brutbot.posts.pull
+bot.pull
 
 # Mirror a post to all clients
-brutbot.auths.mirror post
+bot.push post
 ```
 
 ## Contributing

data/lib/brutalismbot/client.rb

@@ -38,7 +38,9 @@ module Brutalismbot
       @twitter.push(post, dryrun: dryrun)
 
       # Push to Slack
-      @slack.push(post, dryrun: dryrun)
+      @slack.list.map(&:webhook_url).each do |webhook_url|
+        @slack.push(post, webhook_url, dryrun: dryrun)
+      end
 
       nil
     end

data/lib/brutalismbot/posts/client.rb

@@ -15,7 +15,8 @@ module Brutalismbot
       end
 
       def key_for(post)
-        File.join(@prefix, post.path)
+        path = post.created_utc.strftime("year=%Y/month=%Y-%m/day=%Y-%m-%d/%s.json")
+        File.join(@prefix, path)
       end
 
       def get(**options)
@@ -27,7 +28,7 @@ module Brutalismbot
       end
 
       def list(**options)
-        super(**options) do |object|
+        super do |object|
           Brutalismbot.logger.info("GET s3://#{@bucket}/#{object.key}")
           Reddit::Post.parse(object.get.body.read)
         end
@@ -54,10 +55,14 @@ module Brutalismbot
       end
 
       def push(post, dryrun:nil)
-        options = post.to_s3(bucket: @bucket, prefix: @prefix)
-        Brutalismbot.logger.info("PUT #{"DRYRUN " if dryrun}s3://#{options[:bucket]}/#{options[:key]}")
-        @client.put_object(**options) unless dryrun
-        options.slice(:bucket, :key)
+        key = key_for(post)
+        Brutalismbot.logger.info("PUT #{"DRYRUN " if dryrun}s3://#{@bucket}/#{key}")
+        @client.put_object(bucket: @bucket, key: key, body: post.to_json) unless dryrun
+        {
+          bucket: @bucket,
+          key:    key,
+          url:    post.permalink,
+        }
       end
     end
   end

data/lib/brutalismbot/reddit/post.rb

@@ -39,131 +39,74 @@ module Brutalismbot
         "#<#{self.class} #{data["permalink"]}>"
       end
 
+      def is_gallery?
+        data["is_gallery"] || false
+      end
+
       def is_self?
-        data["is_self"]
+        data["is_self"] || false
       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_type ||= 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 mime_type=(value)
-        @mime_type = value
-      end
-
-      def path
-        created_utc.strftime("year=%Y/month=%Y-%m/day=%Y-%m-%d/%s.json")
+      def media_metadata
+        data["media_metadata"]
       end
 
       def permalink
         "https://reddit.com#{data["permalink"]}"
       end
 
-      def title
-        CGI.unescapeHTML(data["title"])
+      def preview_images
+        data.dig("preview", "images")
       end
 
-      def to_s3(bucket:nil, prefix:nil)
-        bucket ||= ENV["POSTS_S3_BUCKET"] || "brutalismbot"
-        prefix ||= ENV["POSTS_S3_PREFIX"] || "data/v1/posts/"
-        {
-          bucket: bucket,
-          key: File.join(*[prefix, path].compact),
-          body: to_json,
-        }
+      def title
+        CGI.unescape_html(data["title"])
       end
 
-      def to_slack
-        is_self? ? to_slack_text : to_slack_image
+      def url
+        data["url"]
       end
 
-      def to_twitter
-        max = 280 - permalink.length - 1
-        status = title.length <= max ? title : "#{title[0...max - 1]}…"
-        status << "\n#{permalink}"
-        {status: status, media_url: is_self? ? nil : media_url}
+      ##
+      # Get media URLs for post
+      def media_urls(&block)
+        if is_gallery?
+          media_urls_gallery(&block)
+        elsif preview_images
+          media_urls_preview(&block)
+        else
+          []
+        end
       end
 
-      def url
-        data["url"]
+      ##
+      # S3 path
+      def path
+        created_utc.strftime("year=%Y/month=%Y-%m/day=%Y-%m-%d/%s.json")
       end
 
       private
 
-      def to_slack_image
-        {
-          blocks: [
-            {
-              type: "image",
-              title: {
-                type: "plain_text",
-                text: "/r/brutalism",
-                emoji: true,
-              },
-              image_url: media_url,
-              alt_text: title,
-            },
-            {
-              type: "context",
-              elements: [
-                {
-                  type: "mrkdwn",
-                  text: "<#{permalink}|#{title}>",
-                },
-              ],
-            },
-          ],
-        }
-      end
-
-      def to_slack_text
-        {
-          blocks: [
-            {
-              type: "section",
-              text: {
-                type: "mrkdwn",
-                text: "<#{permalink}|#{title}>",
-              },
-              accessory: {
-                type: "image",
-                image_url: "https://brutalismbot.com/logo-red-ppl.png",
-                alt_text: "/r/brutalism",
-              },
-            },
-          ],
-        }
+      ##
+      # Get media URLs from gallery
+      def media_urls_gallery(&block)
+        media_metadata.values.map do |image|
+          url = block_given? ? yield(image) : image.dig("s", "u")
+          CGI.unescape_html(url) unless url.nil?
+        end.compact
+      end
+
+      ##
+      # Get media URLs from previews
+      def media_urls_preview(&block)
+        preview_images.map do |image|
+          url = block_given? ? yield(image) : image.dig("source", "url")
+          CGI.unescape_html(url) unless url.nil?
+        end.compact
       end
     end
   end

data/lib/brutalismbot/reddit/resource.rb

@@ -26,8 +26,10 @@ module Brutalismbot
           children.each do |child|
             item = child.transform_keys(&:to_sym)
             post = Post.new(**item)
-            Brutalismbot.logger.warn("NO PHOTO URL for #{post.permalink}") if post.url.nil?
-            yield post
+            unless post.is_self?
+              Brutalismbot.logger.warn("NO MEDIA URLs for #{post.permalink}") if post.media_urls.empty?
+              yield post
+            end
           end
         end
       end

data/lib/brutalismbot/reddit/stub.rb

@@ -17,6 +17,28 @@ module Brutalismbot
               permalink:   "/r/brutalism/comments/#{permalink_id}/test/",
               title:       "Post to /r/brutalism",
               url:         "https://image.host/#{image_id}.jpg",
+              media_metadata: {
+                abcdef: {
+                  s: {
+                    u: "https://preview.image.host/#{image_id}_1.jpg",
+                  },
+                  p: [
+                    {x: 1, y: 1, u: "https://preview.image.host/#{image_id}_1.jpg"},
+                    {x: 2, y: 2, u: "https://preview.image.host/#{image_id}_2.jpg"},
+                    {x: 3, y: 3, u: "https://preview.image.host/#{image_id}_3.jpg"},
+                  ],
+                },
+                ghijkl: {
+                  s: {
+                    u: "https://preview.image.host/#{image_id}_2.jpg",
+                  },
+                  p: [
+                    {x: 1, y: 1, u: "https://preview.image.host/#{image_id}_1.jpg"},
+                    {x: 2, y: 2, u: "https://preview.image.host/#{image_id}_2.jpg"},
+                    {x: 3, y: 3, u: "https://preview.image.host/#{image_id}_3.jpg"},
+                  ],
+                },
+              },
               preview: {
                 images: [
                   {
@@ -26,13 +48,6 @@ module Brutalismbot
                       height: 1000,
                     },
                   },
-                  {
-                    source: {
-                      url: "https://preview.image.host/#{image_id}_small.jpg",
-                      width: 500,
-                      height: 500,
-                    }
-                  }
                 ],
               },
             },

data/lib/brutalismbot/slack/auth.rb

@@ -21,7 +21,11 @@ module Brutalismbot
       end
 
       def team_id
-        @item.dig("team_id")
+        @item["team_id"] || @item.dig("team", "id")
+      end
+
+      def team_name
+        @item["team_name"] || @item.dig("team", "name")
       end
 
       def to_s3(bucket:nil, prefix:nil)

data/lib/brutalismbot/slack/client.rb

@@ -31,20 +31,26 @@ module Brutalismbot
       end
 
       def list(**options)
-        super(**options) do |object|
+        super do |object|
           Brutalismbot.logger.info("GET s3://#{@bucket}/#{object.key}")
           Auth.parse(object.get.body.read)
         end
       end
 
-      def push(body:, webhook_url:, dryrun:nil)
+      def push(post, webhook_url, dryrun:nil)
+        blocks = blocks_for(post)
+
         Brutalismbot.logger.info("POST #{"DRYRUN " if dryrun}#{webhook_url}")
         unless dryrun
           uri = URI.parse(webhook_url)
           ssl = uri.scheme == "https"
           req = Net::HTTP::Post.new(uri, "content-type" => "application/json")
-          req.body = body.to_json
-          Net::HTTP.start(uri.host, uri.port, use_ssl: ssl) {|http| http.request(req) }
+          req.body = { blocks: blocks }.to_json
+          Net::HTTP.start(uri.host, uri.port, use_ssl: ssl) do |http|
+            http.request(req)
+          end.tap do |res|
+            Brutalismbot.logger.error("RESPONSE [#{res.code}] #{res.body}") unless res.kind_of?(Net::HTTPSuccess)
+          end
         else
           Net::HTTPOK.new("1.1", "204", "ok")
         end
@@ -58,6 +64,34 @@ module Brutalismbot
           object.delete unless dryrun
         end
       end
+
+      private
+
+      def blocks_for(post)
+        post.media_urls.map do |media_url|
+          [
+            {
+              type: "image",
+              title: {
+                type: "plain_text",
+                text: "/r/brutalism",
+                emoji: true,
+              },
+              image_url: media_url,
+              alt_text: post.title,
+            },
+            {
+              type: "context",
+              elements: [
+                {
+                  type: "mrkdwn",
+                  text: "<#{post.permalink}|#{post.title}>",
+                },
+              ],
+            },
+          ]
+        end.flatten
+      end
     end
   end
 end

data/lib/brutalismbot/twitter/client.rb

@@ -19,16 +19,55 @@ module Brutalismbot
         end
       end
 
-      def push(status:, media_url:nil, dryrun:nil)
-        if media_url.nil?
+      def push(post, dryrun:nil)
+        opts = {}
+        slices_for(post).each_with_index.map do |slice, index|
+          status, media = slice
           Brutalismbot.logger.info("PUSH #{"DRYRUN " if dryrun}twitter://@brutalismbot")
-          @client.update(status) unless dryrun
-        else
-          Brutalismbot.logger.info("GET #{media_url}")
-          Brutalismbot.logger.info("PUSH #{"DRYRUN " if dryrun}twitter://@brutalismbot")
-          URI.open(media_url) {|media| @client.update_with_media(status, media) } unless dryrun
+          begin
+            res = @client.update_with_media(status, media, opts)
+            opts[:in_reply_to_status_id] = res.id
+          rescue ::Twitter::Error::BadRequest => err
+            if err.message =~ /Image file size must be <= \d+ bytes/
+              Brutalismbot.logger.warn("IMAGE TOO LARGE - RETRYING WITH PREVIEWS")
+              res = push_preview(post, opts, index)
+              opts[:in_reply_to_status_id] = res.id
+            end
+          end unless dryrun
+
+          res&.id
         end
       end
+
+      private
+
+      def push_preview(post, opts, index)
+        status, media = slices_for(post) do |i|
+          i["p"].max {|a,b|  a["x"] * a["y"] <=> b["x"] * b["y"] }["u"]
+        end.to_a[index]
+        @client.update_with_media(status, media, opts)
+      end
+
+      def slices_for(post, &block)
+        status = status_for(post)
+        media_urls = post.media_urls(&block)
+        case media_urls.count % 4
+        when 1 then media_urls.each_slice(3).to_a
+        when 2 then media_urls.each_slice(3).to_a
+        else media_urls.each_slice(4).to_a
+        end.map do |media_urls_slice|
+          media_urls_slice.map do |media_url|
+            Brutalismbot.logger.info("GET #{media_url}")
+            URI.open(media_url)
+          end
+        end.zip([status]).map(&:reverse)
+      end
+
+      def status_for(post)
+        max = 280 - post.permalink.length - 1
+        status = post.title.length <= max ? post.title : "#{post.title[0...max - 1]}…"
+        status << "\n#{post.permalink}"
+      end
     end
   end
 end

data/lib/brutalismbot/version.rb

@@ -1,3 +1,3 @@
 module Brutalismbot
-  VERSION = "1.8.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brutalismbot
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Alexander Mancevice
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter