jekyll-hackclub 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de886c16f8e0135c5cf61d9918210a0ea31905bb51f5292d539fcd1ff27aaf4c
-  data.tar.gz: 6649112e691948cb83a94829364d5a4c0b22b617c4c3e5d600aeccab79973200
+  metadata.gz: 1de71437907ec6e92d5b674b42dc745763ffb1f0b4010345df2bd38ae614960f
+  data.tar.gz: 0c04f981eaed4fb3b09f4aef40ed183ea64a95019977f8f407fa97e0f750a432
 SHA512:
-  metadata.gz: 9fef2b54b058eba122b6ef06cf801d271fdefc4d00e71b9a5c554f09a6fe03272f194a5f0d629c45f8a812ba1a1ec0091f0f0795df31cf9df4f99bcbfe0ef6af
-  data.tar.gz: f39585ba8cc849022224092743768f83c8d2864942523526aade46a4326b6de4efcb2603ca1ec81d89572c97c840c808bdc7c581799026d78de2b5d1b4dc63fe
+  metadata.gz: ab656eaeb6afcd5810732d0ca95bf0feb9be3165c6b50101f2f1eac981842fcd9e4ccca73575edab704e50513dad6ee53ef6af8d657d3ab6664453035550f2b6
+  data.tar.gz: 0a7ba5e07b1c95719ee6f407302bd571488e2033b4ccdd6211f6d9ac06d73cb5c927dbd677a57011fac09e2d7620f8bd37e809b67650fc909c1c165aff726016

data/lib/args-parser.rb

@@ -0,0 +1,39 @@
+require_relative "./pipes/strings"
+require_relative "./pipes/numbers"
+require_relative "./pipes/arrays"
+
+module ArgsParser
+    def self.split_args(content)
+        content.split(" ; ").map(&:strip)
+    end
+    
+    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?(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 function '#{func}'"
+            end
+        end
+        value
+    end
+
+    def self.eval_pipes(arg)
+        parts = arg.split(" | ").map(&:strip)
+        value = parts.shift
+        eval_pipes_with_val(value, parts)
+    end
+
+    def self.parse(content)
+        split_args(content).map { |arg| eval_pipes(arg) }
+    end
+end

data/lib/jekyll-hackclub.rb

@@ -1,5 +1,9 @@
-require_relative "./emoji"
-require_relative "./mentions"
-require_relative "./server-bridge"
-require_relative "./user-tag"
-require_relative "./channel-tag"
+require_relative "./tags/emoji"
+require_relative "./tags/mentions"
+require_relative "./tags/user-tag"
+require_relative "./tags/channel-tag"
+require_relative "./tags/usergroup-tag"
+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

@@ -21,6 +21,18 @@ module HackclubRequest
         end
     end
 
+    def self.raw_file(fileid)
+        uri = URI("#{host}/files.info/#{fileid}")
+        res = Net::HTTP.get_response(uri)
+
+        data = JSON.parse(res.body)
+        if res.is_a?(Net::HTTPSuccess)
+            data
+        else
+            {}
+        end
+    end
+
     def self.raw_user(userid)
         uri = URI("#{host}/users.info/#{userid}")
         res = Net::HTTP.get_response(uri)
@@ -33,6 +45,23 @@ module HackclubRequest
         end
     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
+    end
+
+    def self.resolve_usergroup(groupid)
+        data = raw_usergroup(groupid)
+        return data.dig("handle") || "unknown"
+    end
+
     def self.resolve_username(userid)
         uri = URI("#{host}/users.info/#{userid}")
         res = Net::HTTP.get_response(uri)

data/lib/{channel-tag.rb → tags/channel-tag.rb}

@@ -1,14 +1,17 @@
 require "jekyll"
-require_relative "./server-bridge"
+require_relative "../server-bridge"
 
 module Jekyll
     class HackclubChannelTag < Liquid::Tag
         def initialize(tagName, content, tokens)
             super
             content = content.strip()
-            @id, *rest = content.split(" ", 2)
-            keys = rest.join.split(".")
+            @id, keys, pipes = ArgsParser.split_args(content)
+            pipes = pipes || ""
+            keys = keys.split(".")
+
             @data = HackclubRequest.raw_channel(@id).dig("channel").dig(*keys)
+            @data = ArgsParser.eval_pipes_with_val(@data, pipes.split(" | ").map(&:strip))
         end
 
         def render(context)

data/lib/{emoji.rb → tags/emoji.rb}

@@ -1,5 +1,5 @@
 require "jekyll"
-require_relative "./server-bridge"
+require_relative "../server-bridge"
 
 module Jekyll
     class HackclubEmoji < Liquid::Tag

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/{mentions.rb → tags/mentions.rb}

@@ -1,5 +1,6 @@
 require "jekyll"
-require_relative "./server-bridge"
+require_relative "../args-parser"
+require_relative "../server-bridge"
 
 module Jekyll
     class HackclubMention < Liquid::Tag
@@ -10,12 +11,22 @@ module Jekyll
         end
 
         def render(context)
+            parts = @id.split(" | ")
+            @id = parts[0]
+            @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>}
             elsif @id && @id.start_with?("C")
                 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/parser.rb

@@ -0,0 +1,18 @@
+require "jekyll"
+require_relative "../server-bridge"
+require_relative "../args-parser"
+
+module Jekyll
+    class HackclubParser < Liquid::Tag
+        def initialize(tagName, content, tokens)
+            super
+            @content = content
+        end
+
+        def render(context)
+            %Q{#{ArgsParser.parse(@content)}}
+        end
+    end
+
+    Liquid::Template.register_tag "_parser", HackclubParser
+end

data/lib/{user-tag.rb → tags/user-tag.rb}

@@ -1,14 +1,18 @@
 require "jekyll"
-require_relative "./server-bridge"
+require_relative "../args-parser"
+require_relative "../server-bridge"
 
 module Jekyll
     class HackclubUserTag < Liquid::Tag
         def initialize(tagName, content, tokens)
             super
             content = content.strip()
-            @id, *rest = content.split(" ", 2)
-            keys = rest.join.split(".")
+            @id, keys, pipes = ArgsParser.split_args(content)
+            pipes = pipes || ""
+            keys = keys.split(".")
+
             @data = HackclubRequest.raw_user(@id).dig("user").dig(*keys)
+            @data = ArgsParser.eval_pipes_with_val(@data, pipes.split(" | ").map(&:strip))
         end
 
         def render(context)

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.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - MathiasDPX
@@ -41,12 +41,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/channel-tag.rb
-- lib/emoji.rb
+- lib/args-parser.rb
 - lib/jekyll-hackclub.rb
-- lib/mentions.rb
+- lib/pipes/arrays.rb
+- lib/pipes/numbers.rb
+- lib/pipes/strings.rb
 - lib/server-bridge.rb
-- lib/user-tag.rb
+- lib/tags/channel-tag.rb
+- lib/tags/emoji.rb
+- lib/tags/file.rb
+- lib/tags/mentions.rb
+- lib/tags/parser.rb
+- lib/tags/user-tag.rb
+- lib/tags/usergroup-tag.rb
 licenses:
 - MIT
 metadata: {}