twitchrb 0.2.0 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9eee2d6f7cc0434ccb49cb42e12020ac4581f3c7d51c2e58696b0a0fe22db68b
-  data.tar.gz: 0060beeceb9c3ca2062ac56457d00f18cb3a406cd4c6d7149406b3a53861e962
+  metadata.gz: 5da5d24c0516dd123d3c603f728f1afb89dd388d8850bc39f6a46a62c7497b2f
+  data.tar.gz: 4c664108c26f55cceeb5d8c5524fc79fe15a14c16d9114abb3ad481e20afc028
 SHA512:
-  metadata.gz: 85c8d5fa26d7c37e13061bb45e071fc7eb02fdf68ba9bcb5e76e2c3964f6451916aa95f2b8584f9171954a34b4dc8a35303ff9629c19fa1a6c1a043d41a87913
-  data.tar.gz: 739d84bacdff4c31a2f63b7ccae655e1cc8661ca3346ab620db70792082777ab05da834c8d09874494654bb816f393b52b4cd445db424d693b6c07159e43712c
+  metadata.gz: 2fc664b3ae6a78bb1fbf61d65a04cbd8c6a97dd79cd47d418c007e000e6a568fcded0fa0246fb5907197684942c5549f26b6a8f287289cf0200a47f11dd2ea1e
+  data.tar.gz: e04d75f5c8f88392316fc652391998f842c6cd23f9e1484246f876c786ae828b2195dab346506445f945941aaf728c82034eccf596319c47f1f21c2b2484255a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    twitchrb (0.2.0)
+    twitchrb (0.2.4)
       faraday (~> 1.7)
       faraday_middleware (~> 1.1)
 
@@ -28,7 +28,7 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
-    faraday_middleware (1.1.0)
+    faraday_middleware (1.2.0)
       faraday (~> 1.0)
     minitest (5.14.1)
     multipart-post (2.1.1)

data/README.md

@@ -11,7 +11,7 @@ It only supports the Helix API as v5 is deprecated.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "twitchrb", require: "twitch"
+gem "twitchrb"
 ```
 
 ## Usage
@@ -23,7 +23,7 @@ Firstly you'll need to set a Client ID, Secret Key and an Access Token.
 An access token is required because the Helix API requires authentication.
 
 ```ruby
-@client = Twitch::Client.new(client_id: "", secret_key: "", access_token: "")
+@client = Twitch::Client.new(client_id: "", client_secret: "", access_token: "")
 ```
 
 ### Users

data/lib/twitch/client.rb

@@ -1,25 +1,3 @@
-# require "httparty"
-
-
-#     def headers(kind)
-#       if kind == :helix
-#         {
-#           "Client-ID" => @client_id,
-#           "Accept" => "application/json",
-#           "Content-Type" => "application/json",
-#           "Authorization" => "Bearer #{@access_token}"
-#         }
-#       else
-#         {
-#           "Client-ID" => @client_id,
-#           "Accept" => "application/vnd.twitchtv.v5+json",
-#           # "Authorization" => "OAuth #{@access_token}"
-#         }
-#       end
-#     end
-
-
-
 module Twitch
   class Client
     BASE_URL = "https://api.twitch.tv/helix"
@@ -144,5 +122,6 @@ module Twitch
         conn.adapter adapter, @stubs
       end
     end
+
   end
 end

data/lib/twitch/objects/video.rb

@@ -1,4 +1,31 @@
 module Twitch
   class Video < Object
+
+    def initialize(options = {})
+      super options
+
+      self.thumbnail_url_large = generate_thumbnail_url_large
+      self.animated_url = generate_animated_url
+    end
+
+
+    # Generates the Large Thumbnail image URL
+    def generate_thumbnail_url_large
+      return "" if thumbnail_url.empty?
+
+      thumbnail_url.gsub("%{width}", "640").gsub("%{height}", "360")
+    end
+  
+    # Generates a Storyboard/Animated image URL
+    def generate_animated_url
+      return "" if thumbnail_url.empty?
+      
+      thumb = thumbnail_url.dup
+      thumb.gsub!("https://static-cdn.jtvnw.net/cf_vods/", "").gsub!("/thumb/thumb0-%{width}x%{height}.jpg", "storyboards/#{id}-strip-0.jpg")
+      split = thumb.split("/")
+  
+      "https://#{split[0]}.cloudfront.net/#{split[1..].join("/")}"
+    end
+
   end
 end

data/lib/twitch/resources/channels.rb

@@ -2,7 +2,7 @@ module Twitch
   class ChannelsResource < Resource
     
     def get(broadcaster_id:)
-      User.new get_request("channels?broadcaster_id=#{broadcaster_id}").body.dig("data")[0]
+      Channel.new get_request("channels?broadcaster_id=#{broadcaster_id}").body.dig("data")[0]
     end
 
     # Requires scope: channel:manage:broadcast

data/lib/twitch/resources/clips.rb

@@ -8,6 +8,10 @@ module Twitch
       Collection.from_response(response, type: Clip)
     end
 
+    def retrieve(id:)
+      Clip.new get_request("clips?id=#{id}").body.dig("data")[0]
+    end
+
     # Required scope: clips:edit
     def create(broadcaster_id:, **attributes)
       response = post_request("clips", body: attributes.merge(broadcaster_id: broadcaster_id))

data/lib/twitch/resources/subscriptions.rb

@@ -19,55 +19,14 @@ module Twitch
       Collection.from_response(response, type: Subscription)
     end
 
-    # Calculate the number of Subscribers & Subscriber Points a broadcaster has
+    # Grabs the number of Subscribers and Subscriber Points a broadcaster has
     # Broadcaster ID must match the user in the OAuth token
     # Required scope: channel:read:subscriptions
-    def calculate(broadcaster_id:, remove_count: 0, remove_points: 0)
-      calculate_subs(broadcaster_id: broadcaster_id, remove_count: remove_count, remove_points: remove_points)
-    end
-    
-    private
+    def counts(broadcaster_id:)
+      response = get_request("subscriptions", params: {broadcaster_id: broadcaster_id})
 
-    def get_subscriptions(broadcaster_id:)
-      subs    = []
-      cursor  = nil
-      count   = 1
-  
-      while count > 0
-        sub_response = list(broadcaster_id: broadcaster_id, first: 100, after: cursor)
-  
-        subs    += sub_response.data
-  
-        cursor  = sub_response.cursor
-        count   = sub_response.total
-      end
-  
-      return subs
+      SubscriptionCount.new(count: response.body["total"], points: response.body["points"])
     end
-  
-    def calculate_subs(broadcaster_id:, remove_count:, remove_points:)
-      subs = get_subscriptions(broadcaster_id: broadcaster_id)
-  
-      count  = 0
-      points = 0
-  
-      if !subs.empty? && subs.count >= 1
-        subs.each do |sub|
-          # We don't want to add the broadcaster into the count
-          next if sub.user_id.to_s == broadcaster_id.to_s
-          
-          count  += 1
-          points += 1 if sub.tier == "1000"
-          points += 2 if sub.tier == "2000"
-          points += 6 if sub.tier == "3000"
-        end
-
-        count  = (count - remove_count)
-        points = (points - remove_points)
-      end
-  
-      SubscriptionCount.new(count: count, points: points)
-    end 
 
   end
 end

data/lib/twitch/version.rb

@@ -1,3 +1,3 @@
 module Twitch
-  VERSION = "0.2.0"
+  VERSION = "0.2.4"
 end

data/lib/twitch.rb

@@ -3,26 +3,6 @@ require "faraday_middleware"
 require "json"
 require "twitch/version"
 
-require "twitch/version"
-
-# require "twitch/client"
-# require "twitch/initializable"
-
-# # Models
-# require "twitch/models/channel"
-# require "twitch/models/badge"
-# require "twitch/models/game"
-# require "twitch/models/emote"
-# require "twitch/models/poll"
-# require "twitch/models/poll_choice"
-
-# # Helix API
-# require "twitch/channels"
-# require "twitch/emotes"
-# require "twitch/badges"
-# require "twitch/games"
-# require "twitch/polls"
-
 module Twitch
 
   autoload :Client, "twitch/client"

data/lib/twitchrb.rb

@@ -0,0 +1 @@
+require "twitch"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitchrb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.4
 platform: ruby
 authors:
 - Dean Perry
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-26 00:00:00.000000000 Z
+date: 2021-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -48,7 +48,6 @@ files:
 - ".env.example"
 - ".github/FUNDING.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -115,6 +114,7 @@ files:
 - lib/twitch/resources/users.rb
 - lib/twitch/resources/videos.rb
 - lib/twitch/version.rb
+- lib/twitchrb.rb
 - twitchrb.gemspec
 homepage: https://twitchrb.com
 licenses:

data/.travis.yml

@@ -1,6 +0,0 @@
----
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.1
-before_install: gem install bundler -v 2.1.4