brutalismbot 1.6.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c823de7d2cb19bf4f6d8742111bf4a995b565a40fde6eb89ab66e0fa49f32dcf
-  data.tar.gz: 2f7053d644bf1c64e9221aec56d6b4bc28ab3ea393972d97fd7e70304b39ed64
+  metadata.gz: b7a72ed65ec740aef21cb54256d7f8f9b9e3128a039eb217711ee02c372683bf
+  data.tar.gz: 75b2ebef6b98ec94b716fe00cb1f657b386e9d9c40d89211b37443c8f0d98fb0
 SHA512:
-  metadata.gz: 967b8a00fedb99a4bc186f14c2c5122366ccd3c5ba012e6e5851a2868d88f0fa5ac944c00e05b174e9a2bf99dcbf51594790c24240cb4468a4999ae7f2f77f47
-  data.tar.gz: aee379c78663682c29bdccfe56215e9694d997807e3629768b31c208954cba643c681579dfd48ac1788daa6987feef41ecd06a238b5d939c772c65dfb646e4bd
+  metadata.gz: 80fb1a88e38e9d1fc5988d7586aebd1859339cf9c3bcd67b08cb7a587f5b0c6c0ab6c13db295f2569c19088637ade5a5e2a28c7ed7064ed57a63e5329a1747b5
+  data.tar.gz: eca017057b7c3a4d0c2d184ea8a328af49e319d96ac02f42e51977a65a5677e31fedd770a484c960c78e5b1f5bcc1ed834c0239ebc9bd12c7d6f320ea24bbe9b

data/README.md

@@ -1,9 +1,9 @@
 <img alt="brutalismbot" src="https://brutalismbot.com/banner.png"/>
 
-[![rspec](https://github.com/brutalismbot/gem/workflows/rspec/badge.svg)](https://github.com/brutalismbot/gem/actions)
-[![Gem Version](https://badge.fury.io/rb/brutalismbot.svg)](http://badge.fury.io/rb/brutalismbot)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/83275cbdbf10f9fd2df7/test_coverage)](https://codeclimate.com/github/brutalismbot/gem/test_coverage)
-[![Maintainability](https://api.codeclimate.com/v1/badges/83275cbdbf10f9fd2df7/maintainability)](https://codeclimate.com/github/brutalismbot/gem/maintainability)
+![gem](https://img.shields.io/gem/v/brutalismbot?logo=rubygems&logoColor=eee&style=flat-square)
+[![rspec](https://img.shields.io/github/workflow/status/brutalismbot/gem/rspec?logo=github&style=flat-square)](https://github.com/brutalismbot/gem/actions)
+[![coverage](https://img.shields.io/codeclimate/coverage/brutalismbot/gem?logo=code-climate&style=flat-square)](https://codeclimate.com/github/brutalismbot/gem/test_coverage)
+[![maintainability](https://img.shields.io/codeclimate/maintainability/brutalismbot/gem?logo=code-climate&style=flat-square)](https://codeclimate.com/github/brutalismbot/gem/maintainability)
 
 Brutalismbot RubyGem
 
@@ -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/base.rb

@@ -5,7 +5,7 @@ module Brutalismbot
   module Parser
     def parse(source, opts = {})
       item = JSON.parse(source, opts)
-      new(**item)
+      new(**item.transform_keys(&:to_sym))
     end
   end
 

data/lib/brutalismbot/client.rb

@@ -14,16 +14,11 @@ module Brutalismbot
       @twitter = twitter || Twitter::Client.new
     end
 
-    def lag_time
-      lag = ENV["BRUTALISMBOT_LAG_TIME"].to_s
-      lag.empty? ? 9000 : lag.to_i
-    end
-
-    def pull(limit:nil, min_time:nil, max_time:nil, lag:nil, dryrun:nil)
+    def pull(limit:nil, min_time:nil, max_time:nil, min_age:nil, dryrun:nil)
       # Get time window for new posts
-      lag      ||= lag_time
+      min_age  ||= 9000
       min_time ||= @posts.max_time
-      max_time ||= Time.now.utc.to_i - lag
+      max_time ||= Time.now.utc.to_i - min_age.to_i
 
       # Get posts
       opts  = {q:"self:no AND nsfw:no", restrict_sr: true, sort: "new"}
@@ -43,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,128 +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)
+      def media_metadata
+        data["media_metadata"]
       end
 
-      def media_url
-        # Use URL if it's an image
-        if mime_type.start_with?("image/")
-          data["url"]
+      def permalink
+        "https://reddit.com#{data["permalink"]}"
+      end
 
-        # 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
+      def preview_images
+        data.dig("preview", "images")
       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
+      def title
+        CGI.unescape_html(data["title"])
       end
 
-      def mime_type=(value)
-        @mime_type = value
+      def url
+        data["url"]
       end
 
+      ##
+      # 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
+
+      ##
+      # S3 path
       def path
         created_utc.strftime("year=%Y/month=%Y-%m/day=%Y-%m-%d/%s.json")
       end
 
-      def permalink
-        "https://reddit.com#{data["permalink"]}"
-      end
+      private
 
-      def title
-        CGI.unescapeHTML(data["title"])
-      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,
-        }
-      end
-
-      def to_slack
-        is_self? ? to_slack_text : to_slack_image
-      end
-
-      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",
-              },
-            },
-          ],
-        }
-      end
-
-      def to_twitter
-        max = 280 - permalink.length - 1
-        text = title.length <= max ? title : "#{title[0...max - 1]}…"
-        [text, permalink].join("\n")
+      ##
+      # 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
 
-      def url
-        data["url"]
+      ##
+      # 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

@@ -24,9 +24,12 @@ module Brutalismbot
           response = JSON.parse(http.request(request).body)
           children = response.dig("data", "children") || []
           children.each do |child|
-            post = Post.new(**child)
-            Brutalismbot.logger.warn("NO PHOTO URL for #{post.permalink}") if post.url.nil?
-            yield post
+            item = child.transform_keys(&:to_sym)
+            post = Post.new(**item)
+            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

@@ -20,24 +20,12 @@ module Brutalismbot
         File.join("team=#{team_id}", "channel=#{channel_id}", "oauth.json")
       end
 
-      def push(post, dryrun:nil)
-        body = post.to_slack.to_json
-        uri  = URI.parse(webhook_url)
-        Brutalismbot.logger.info("POST #{"DRYRUN " if dryrun}#{uri}")
-        unless dryrun
-          ssl = uri.scheme == "https"
-          req = Net::HTTP::Post.new(uri, "content-type" => "application/json")
-          req.body = body
-          Net::HTTP.start(uri.host, uri.port, use_ssl: ssl) do |http|
-            http.request(req)
-          end
-        else
-          Net::HTTPOK.new("1.1", "204", "ok")
-        end
+      def team_id
+        @item["team_id"] || @item.dig("team", "id")
       end
 
-      def team_id
-        @item.dig("team_id")
+      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,17 +31,28 @@ 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(post, dryrun:nil)
-        list.map do |auth|
-          key = key_for(auth)
-          Brutalismbot.logger.info("PUSH #{"DRYRUN " if dryrun}s3://#{@bucket}/#{key}")
-          auth.push(post, dryrun: dryrun)
+      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 = { 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
       end
 
@@ -53,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

@@ -20,21 +20,53 @@ module Brutalismbot
       end
 
       def push(post, dryrun:nil)
-        method = post.is_self? ? :push_text : :push_image
-        send(method, post, dryrun: dryrun)
+        opts = {}
+        slices_for(post).each_with_index.map do |slice, index|
+          status, media = slice
+          Brutalismbot.logger.info("PUSH #{"DRYRUN " if dryrun}twitter://@brutalismbot")
+          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 push_text(post, dryrun:nil)
-        Brutalismbot.logger.info("PUSH #{"DRYRUN " if dryrun}twitter://@brutalismbot")
-        @client.update(post.to_twitter) unless dryrun
+      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 push_image(post, dryrun:nil)
-        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
+      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

data/lib/brutalismbot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brutalismbot
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Alexander Mancevice
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-19 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
@@ -24,118 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-s3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: dotenv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
 description: 'A Slack app that mirrors posts from /r/brutalism to a #channel of your
   choosing using incoming webhooks.'
 email: