jekyll-hackclub 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1de71437907ec6e92d5b674b42dc745763ffb1f0b4010345df2bd38ae614960f
-  data.tar.gz: 0c04f981eaed4fb3b09f4aef40ed183ea64a95019977f8f407fa97e0f750a432
+  metadata.gz: 946c0c6e84743e07d73f28be93196ab5b36f64aac96b6b38c874f2f312b64bcd
+  data.tar.gz: e1042a102d08ca8591bfd7ea152d1ff5b3603257372c301bd94d9d224e834417
 SHA512:
-  metadata.gz: ab656eaeb6afcd5810732d0ca95bf0feb9be3165c6b50101f2f1eac981842fcd9e4ccca73575edab704e50513dad6ee53ef6af8d657d3ab6664453035550f2b6
-  data.tar.gz: 0a7ba5e07b1c95719ee6f407302bd571488e2033b4ccdd6211f6d9ac06d73cb5c927dbd677a57011fac09e2d7620f8bd37e809b67650fc909c1c165aff726016
+  metadata.gz: c93c3636b08e11618087f9927dee95e724721b7ff2675e7868c6da030a863a0e8bff1c9803d1cc8ac0d16bb93c85228c80bf30ea3ac41f74ccf3c0cbdd6ac2c0
+  data.tar.gz: d44840b14ac1712cb1d1469287d3e6b9a64984c4ef22731654dfae51ea806330c7ef0fa535b5559af236cba1c6e8f162a5dfdeccc8e2da925037129074189171

data/lib/args-parser.rb

@@ -21,7 +21,7 @@ module ArgsParser
             elsif ArraysManipulation.respond_to?(func)
                 value = ArraysManipulation.public_send(func, value, args)
             else
-                raise ArgumentError, "Unkown function '#{func}'"
+                raise ArgumentError, "Unknown function '#{func}'"
             end
         end
         value

data/lib/jekyll-hackclub.rb

@@ -3,6 +3,7 @@ require_relative "./tags/mentions"
 require_relative "./tags/user-tag"
 require_relative "./tags/channel-tag"
 require_relative "./tags/usergroup-tag"
+require_relative "./tags/profile-pic"
 require_relative "./tags/file"
 
 require_relative "./tags/parser"

data/lib/server-bridge.rb

@@ -4,105 +4,69 @@ require "uri"
 
 module HackclubRequest
     DEFAULT_EMOJI = "https://emoji.slack-edge.com/T0266FRGM/alibaba-question/c5ba32ce553206b8.png" # :alibaba-question:
-    @host = Jekyll.configuration({})['HACKCLUB_API'] || "https://slack.mathias.hackclub.app"
+    @host = Jekyll.configuration({})['HACKCLUB_API'] || "https://hackclub.mathiasd.fr"
 
     class << self
         attr_accessor :host
     end
 
-    def self.resolve_emoji(id)
-        uri = URI("#{host}/emoji/#{id.strip}")
-        res = Net::HTTP.get_response(uri)
+    def self.make_request(path)
+        uri = URI("#{host}#{path}")
+        req = Net::HTTP::Get.new(uri)
+        req['Referer'] = "jekyll-hackclub"
 
-        if res.is_a?(Net::HTTPSuccess)
-            res.body
-        else
-            DEFAULT_EMOJI
+        res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
+            http.request(req)
         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.raw_file(fileid)
-        uri = URI("#{host}/files.info/#{fileid}")
-        res = Net::HTTP.get_response(uri)
+    def self.get_emoji(id)
+        return "#{host}/emoji/#{id.strip}"
+    end
 
-        data = JSON.parse(res.body)
-        if res.is_a?(Net::HTTPSuccess)
-            data
-        else
-            {}
-        end
+    def self.raw_file(fileid)
+        data, res = make_request("/files.info/#{fileid}")
+        res&.is_a?(Net::HTTPSuccess) ? data : {}
     end
 
     def self.raw_user(userid)
-        uri = URI("#{host}/users.info/#{userid}")
-        res = Net::HTTP.get_response(uri)
-
-        data = JSON.parse(res.body)
-        if res.is_a?(Net::HTTPSuccess)
-            data
-        else
-            {}
-        end
+        data, res = make_request("/users.info/#{userid}")
+        res&.is_a?(Net::HTTPSuccess) ? data : {}
     end
 
     def self.raw_usergroup(groupid)
-        uri = URI("#{host}/usergroup/#{groupid}")
-        res = Net::HTTP.get_response(uri)
-
-        data = JSON.parse(res.body)
-        if res.is_a?(Net::HTTPSuccess)
-            data
-        else
-            {}
-        end
+        data, res = make_request("/usergroup/#{groupid}")
+        res&.is_a?(Net::HTTPSuccess) ? data : {}
     end
 
     def self.resolve_usergroup(groupid)
         data = raw_usergroup(groupid)
-        return data.dig("handle") || "unknown"
+        data["handle"] || "unknown"
     end
 
     def self.resolve_username(userid)
-        uri = URI("#{host}/users.info/#{userid}")
-        res = Net::HTTP.get_response(uri)
-
-        begin
-            data = JSON.parse(res.body)
-            if res.is_a?(Net::HTTPSuccess)
-                data.dig("user", "name") || "unknown"
-            else
-                "unknown"
-            end
-        rescue
-            "unavailable"
-        end
+        data, res = make_request("/users.info/#{userid}")
+        res&.is_a?(Net::HTTPSuccess) ? (data.dig("user", "name") || "unknown") : "unknown"
+    rescue
+        "unavailable"
     end
 
     def self.raw_channel(channelid)
-        uri = URI("#{host}/conversations.info/#{channelid}")
-        res = Net::HTTP.get_response(uri)
-
-        data = JSON.parse(res.body)
-        if res.is_a?(Net::HTTPSuccess)
-            data
-        else
-            {}
-        end
+        data, res = make_request("/conversations.info/#{channelid}")
+        res&.is_a?(Net::HTTPSuccess) ? data : {}
     end
 
     def self.resolve_channel(channelid)
-        uri = URI("#{host}/conversations.info/#{channelid}")
-        res = Net::HTTP.get_response(uri)
-
-        begin
-            data = JSON.parse(res.body)
-            if res.is_a?(Net::HTTPSuccess)
-                data.dig("channel", "name") || "unknown"
-            else
-                "unknown"
-            end
-        rescue
-            "unavailable"
-        end
+        data, res = make_request("/conversations.info/#{channelid}")
+        res&.is_a?(Net::HTTPSuccess) ? (data.dig("channel", "name") || "unknown") : "unknown"
+    rescue
+        "unavailable"
     end
 end

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.resolve_emoji(@id)
+            @img_url = HackclubRequest.get_emoji(@id)
         end
 
         def render(context)

data/lib/tags/profile-pic.rb

@@ -0,0 +1,26 @@
+require "jekyll"
+require_relative "../server-bridge"
+
+module Jekyll
+    class HackclubPFP < Liquid::Tag
+        def initialize(tagName, content, tokens)
+            super
+            if content.strip =~ /^(U\w+)(?:@(.+))?$/
+                id = Regexp.last_match(1)
+                data = HackclubRequest.raw_user(id)
+                @resolution = Regexp.last_match(2) || "original"
+
+                @img_url = data.dig("user", "profile", "image_"+@resolution)
+                @name = data.dig("user", "name")
+            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}">}
+        end
+    end
+
+    Liquid::Template.register_tag "profilepic", HackclubPFP
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-hackclub
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - MathiasDPX
@@ -52,6 +52,7 @@ files:
 - lib/tags/file.rb
 - lib/tags/mentions.rb
 - lib/tags/parser.rb
+- lib/tags/profile-pic.rb
 - lib/tags/user-tag.rb
 - lib/tags/usergroup-tag.rb
 licenses: