jekyll-hackclub 1.3.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0495d9b427da78fb0c05e06159bebbd4c8b345398450d2962274fc0acd8e1bc4'
-  data.tar.gz: 81c1e2d3ac7e91326cd00c26a96eb353af2c1b141239aa449005e89d2801545c
+  metadata.gz: e4721706e534b10dd13f091c8b30cd6999e19348227e189f4a8a8169b4820b73
+  data.tar.gz: b0e2f43bf635c97f7ed581cc71a3f5e1d4b02865baff200721dab04ecb1b6eba
 SHA512:
-  metadata.gz: 766b2fdcd3e220a8d75bc500f8232f4dad39bcb3f800c10006c5e2735a1a2acb40ab8f4169b5e1933ae4240d6ffec87d711bbbc4568e2499774cbe8f9c22e049
-  data.tar.gz: 6cff13dae2e12a3a47aad22d598d53dd6a6f88181621c9a385f3793b2d25253861688b41810ad31498d9513fd90f9460e681c8824d42f27fbcc67701e5e7d34f
+  metadata.gz: 7537c156d3097764a069795b97b4ddd5788718ec3e6bcc07579f7e229614c1b640eb19ec95bca9cb84561953b7b0bae837a93d09c715a9a6dfdc7a29de55765c
+  data.tar.gz: d1f87e8f43d9e48a68ff789a3d0d165701026e45c9b8423b3221ebb02e629bf887688fd89fb310c11bcee137205268ff4ebb2a0daa9185b8ce358e5755153cba

data/lib/args-parser.rb

@@ -1,20 +1,6 @@
-module StringManipulation
-    def self.uppercase(content)
-        content.upcase
-    end
-
-    def self.downcase(content)
-        content.downcase
-    end
-
-    def self.capitalize(content)
-        content.capitalize
-    end
-
-    def self.size(content)
-        content.size
-    end
-end
+require_relative "./pipes/strings"
+require_relative "./pipes/numbers"
+require_relative "./pipes/arrays"
 
 module ArgsParser
     def self.split_args(content)
@@ -23,13 +9,19 @@ module ArgsParser
     
     def self.eval_pipes_with_val(value, pipes)
         pipes.each do |pipe|
+            args = pipe.split(" ") || []
+            func = args.shift || pipe
             if (match = pipe.match(/\[(-?\d+):(-?\d+)\]/))
                 start_idx, end_idx = match[1].to_i, match[2].to_i
                 value = value[start_idx..end_idx]
-            elsif StringManipulation.respond_to?(pipe)
-                value = StringManipulation.public_send(pipe, value)
+            elsif StringManipulation.respond_to?(func)
+                value = StringManipulation.public_send(func, value, args)
+            elsif NumbersManipulation.respond_to?(func)
+                value = NumbersManipulation.public_send(func, value, args)
+            elsif ArraysManipulation.respond_to?(func)
+                value = ArraysManipulation.public_send(func, value, args)
             else
-                raise ArgumentError, "Unkown pipe '#{pipe}'"
+                raise ArgumentError, "Unknown function '#{func}'"
             end
         end
         value

data/lib/jekyll-hackclub.rb

@@ -2,6 +2,9 @@ require_relative "./tags/emoji"
 require_relative "./tags/mentions"
 require_relative "./tags/user-tag"
 require_relative "./tags/channel-tag"
-require_relative "./tags/parser"
+require_relative "./tags/usergroup-tag"
+require_relative "./tags/profile-pic"
+require_relative "./tags/file"
 
+require_relative "./tags/parser"
 require_relative "./server-bridge"

data/lib/pipes/arrays.rb

@@ -0,0 +1,17 @@
+module ArraysManipulation
+    def self.first(content, args)
+        content = content.first
+    end
+
+    def self.last(content, args)
+        content = content.last
+    end
+
+    def self.get(content, args)
+        content = content[args[0]]
+    end
+
+    def self.cut(content, args)
+        content = content[args[0]..args[1]]
+    end
+end

data/lib/pipes/numbers.rb

@@ -0,0 +1,17 @@
+module NumbersManipulation
+    def self.to_int(content, args)
+        content.to_i
+    end
+
+    def self.multiply(content, args)
+        content * args[0].to_i
+    end
+
+    def self.add(content, args)
+        content + args[0].to_i
+    end
+
+    def self.substract(content, args)
+        content - args[0].to_i
+    end
+end

data/lib/pipes/strings.rb

@@ -0,0 +1,17 @@
+module StringManipulation
+    def self.uppercase(content, args)
+        content.upcase
+    end
+
+    def self.downcase(content, args)
+        content.downcase
+    end
+
+    def self.capitalize(content, args)
+        content.capitalize
+    end
+
+    def self.size(content, args)
+        content.size
+    end
+end

data/lib/server-bridge.rb

@@ -10,70 +10,64 @@ module HackclubRequest
         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.resolve_emoji(id)
+        _, res = make_request("/emoji/#{id.strip}")
+        res&.is_a?(Net::HTTPSuccess) ? res.body : DEFAULT_EMOJI
+    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, res = make_request("/users.info/#{userid}")
+        res&.is_a?(Net::HTTPSuccess) ? data : {}
+    end
 
-        data = JSON.parse(res.body)
-        if res.is_a?(Net::HTTPSuccess)
-            data
-        else
-            {}
-        end
+    def self.raw_usergroup(groupid)
+        data, res = make_request("/usergroup/#{groupid}")
+        res&.is_a?(Net::HTTPSuccess) ? data : {}
     end
 
-    def self.resolve_username(userid)
-        uri = URI("#{host}/users.info/#{userid}")
-        res = Net::HTTP.get_response(uri)
+    def self.resolve_usergroup(groupid)
+        data = raw_usergroup(groupid)
+        data["handle"] || "unknown"
+    end
 
-        begin
-            data = JSON.parse(res.body)
-            if res.is_a?(Net::HTTPSuccess)
-                data.dig("user", "name") || "unknown"
-            else
-                "unknown"
-            end
-        rescue
-            "unavailable"
-        end
+    def self.resolve_username(userid)
+        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/file.rb

@@ -0,0 +1,35 @@
+require "jekyll"
+require_relative "../server-bridge"
+
+module Jekyll
+    class HackclubFileTag < Liquid::Tag
+        def initialize(tagName, content, tokens)
+            super
+            content = content.strip()
+            @id, keys, pipes = ArgsParser.split_args(content)
+            pipes = pipes || ""
+            keys = keys || ""
+            keys = keys.split(".")
+
+            if keys == []
+                rawfile = HackclubRequest.raw_file(@id).dig("file")
+                permalink = rawfile.dig("permalink")
+                name = rawfile.dig("name")
+                @data = '<a href="'+permalink+'" class="hackclub-file" target="_blank">'+name+'</a>'
+            else
+                @data = HackclubRequest.raw_file(@id).dig("file").dig(*keys)
+                @data = ArgsParser.eval_pipes_with_val(@data, pipes.split(" | ").map(&:strip))
+            end
+        end
+
+        def render(context)
+            if @data == nil
+                %Q{null}
+            else
+                %Q{#{@data}}
+            end
+        end
+    end
+
+    Liquid::Template.register_tag "file", HackclubFileTag
+end

data/lib/tags/mentions.rb

@@ -16,7 +16,6 @@ module Jekyll
             @pipes = parts[1..-1]
 
             if @id && @id.start_with?("U")
-
                 display_name = @args[1] || HackclubRequest.resolve_username(@id)
                 display_name = ArgsParser.eval_pipes_with_val(display_name, @pipes)
                 %Q{<a href="https://hackclub.slack.com/team/#{@id}" class="hackclub-mention hackclub-user" target="_blank">@#{display_name}</a>}
@@ -24,6 +23,10 @@ module Jekyll
                 display_name = @args[1] || HackclubRequest.resolve_channel(@id)
                 display_name = ArgsParser.eval_pipes_with_val(display_name, @pipes)
                 %Q{<a href="https://hackclub.slack.com/archives/#{@id}" class="hackclub-mention hackclub-channel" target="_blank">##{display_name}</a>}
+            elsif @id && @id.start_with?("S")
+                display_name = @args[1] || HackclubRequest.resolve_usergroup(@id)
+                display_name = ArgsParser.eval_pipes_with_val(display_name, @pipes)
+                %Q{@#{display_name}}
             end
         end
     end

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

data/lib/tags/usergroup-tag.rb

@@ -0,0 +1,27 @@
+require "jekyll"
+require_relative "../server-bridge"
+
+module Jekyll
+    class HackclubUsergroupTag < Liquid::Tag
+        def initialize(tagName, content, tokens)
+            super
+            content = content.strip()
+            @id, keys, pipes = ArgsParser.split_args(content)
+            pipes = pipes || ""
+            keys = keys.split(".")
+
+            @data = HackclubRequest.raw_usergroup(@id).dig(*keys)
+            @data = ArgsParser.eval_pipes_with_val(@data, pipes.split(" | ").map(&:strip))
+        end
+
+        def render(context)
+            if @data == nil
+                %Q{null}
+            else
+                %Q{#{@data}}
+            end
+        end
+    end
+
+    Liquid::Template.register_tag "usergroup", HackclubUsergroupTag
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-hackclub
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.5.0
 platform: ruby
 authors:
 - MathiasDPX
@@ -43,12 +43,18 @@ extra_rdoc_files: []
 files:
 - lib/args-parser.rb
 - lib/jekyll-hackclub.rb
+- lib/pipes/arrays.rb
+- lib/pipes/numbers.rb
+- lib/pipes/strings.rb
 - lib/server-bridge.rb
 - lib/tags/channel-tag.rb
 - lib/tags/emoji.rb
+- 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:
 - MIT
 metadata: {}