jekyll-hackclub 1.5.1 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 946c0c6e84743e07d73f28be93196ab5b36f64aac96b6b38c874f2f312b64bcd
-  data.tar.gz: e1042a102d08ca8591bfd7ea152d1ff5b3603257372c301bd94d9d224e834417
+  metadata.gz: c35199cb176d936872986c6dbb7b46e65cb6b11f21250f759099b143cb8bb378
+  data.tar.gz: bdd6a99a115b5b9b6c1c0e45c6e97477abac61476e73c61513fd590945cab7b4
 SHA512:
-  metadata.gz: c93c3636b08e11618087f9927dee95e724721b7ff2675e7868c6da030a863a0e8bff1c9803d1cc8ac0d16bb93c85228c80bf30ea3ac41f74ccf3c0cbdd6ac2c0
-  data.tar.gz: d44840b14ac1712cb1d1469287d3e6b9a64984c4ef22731654dfae51ea806330c7ef0fa535b5559af236cba1c6e8f162a5dfdeccc8e2da925037129074189171
+  metadata.gz: 96e1e7198747743df95612dec2bd2c944dd82d62bb7ce8d05886515d49c217cd362d9b55f522707d9a9269011d607b39e3a95ad3b883fa4dbf39c51723304c09
+  data.tar.gz: 79da52c88ea5cb8b3f299b513ec44a74cc4bbe667b522523a464acbbb3e72b88c695786b3da402256277de2916435f814d3ee22a9f4c1342e6d7ab59589a91c2

data/lib/server-bridge.rb

@@ -3,34 +3,60 @@ require "json"
 require "uri"
 
 module HackclubRequest
-    DEFAULT_EMOJI = "https://emoji.slack-edge.com/T0266FRGM/alibaba-question/c5ba32ce553206b8.png" # :alibaba-question:
+    DEFAULT_EMOJI = "https://cdn.hackclub.com/019ce841-fe66-72e6-bb16-d57a93ac574f/alibaba-question.png" # :alibaba-question:
     @host = Jekyll.configuration({})['HACKCLUB_API'] || "https://hackclub.mathiasd.fr"
+    DEFAULT_RETRIES = 3
+    RETRYABLE_STATUS_CODES = [408, 425, 429, 500, 502, 503, 504].freeze
 
     class << self
         attr_accessor :host
     end
 
-    def self.make_request(path)
+    def self.make_request(path, retries: DEFAULT_RETRIES, base_delay: 0.25)
         uri = URI("#{host}#{path}")
-        req = Net::HTTP::Get.new(uri)
-        req['Referer'] = "jekyll-hackclub"
+        attempts = 0
 
-        res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
-            http.request(req)
+        while attempts < retries
+            attempts += 1
+
+            begin
+                req = Net::HTTP::Get.new(uri)
+                req['Referer'] = "jekyll-hackclub"
+
+                res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https", open_timeout: 3, read_timeout: 6) do |http|
+                    http.request(req)
+                end
+
+                if RETRYABLE_STATUS_CODES.include?(res.code.to_i)
+                    sleep(base_delay * attempts) if attempts < retries
+                    next
+                end
+
+                return JSON.parse(res.body), res
+            rescue JSON::ParserError
+                return {}, res
+            rescue => e
+                if attempts < retries
+                    sleep(base_delay * attempts)
+                    next
+                end
+
+                warn "Request to #{uri} failed after #{attempts} attempts: #{e}"
+                return {}, nil
+            end
         end
 
-        return JSON.parse(res.body), res
-    rescue JSON::ParserError
-        return {}, res
-    rescue => e
-        warn "Request to #{uri} failed: #{e}"
         return {}, nil
     end
 
-    def self.get_emoji(id)
+    def self.get_emoji_url(id)
         return "#{host}/emoji/#{id.strip}"
     end
 
+    def self.get_pfp_url(id, quality)
+        return "#{host}/profile.picture/#{id.strip}?q=#{quality}"
+    end
+
     def self.raw_file(fileid)
         data, res = make_request("/files.info/#{fileid}")
         res&.is_a?(Net::HTTPSuccess) ? data : {}

data/lib/tags/emoji.rb

@@ -6,7 +6,7 @@ module Jekyll
         def initialize(tagName, content, tokens)
             super
             @id = content.gsub(/\A:+|:+\z/, '').strip
-            @img_url = HackclubRequest.get_emoji(@id)
+            @img_url = HackclubRequest.get_emoji_url(@id)
         end
 
         def render(context)

data/lib/tags/profile-pic.rb

@@ -10,15 +10,14 @@ module Jekyll
                 data = HackclubRequest.raw_user(id)
                 @resolution = Regexp.last_match(2) || "original"
 
-                @img_url = data.dig("user", "profile", "image_"+@resolution)
-                @name = data.dig("user", "name")
+                @img_url = HackclubRequest.get_pfp_url(id, @resolution)
             else
                 raise ArgumentError, "Invalid profilepic tag format: #{content}"
             end
         end
 
         def render(context)
-            %Q{<img src="#{@img_url}" title="#{@name}'s profile picture" alt="#{@name}'s profile picture" class="hackclub-pfp res-#{@resolution}">}
+            %Q{<img src="#{@img_url}" title="Slack profile picture" alt="Slack profile picture" class="hackclub-pfp res-#{@resolution}">}
         end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-hackclub
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.4
 platform: ruby
 authors:
 - MathiasDPX