publify_core 9.2.10 → 10.0.0

data/lib/publify_textfilter_twitterfilter.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require "text_filter_plugin"
+require "html/pipeline"
+require "html/pipeline/hashtag/hashtag_filter"
 
 class PublifyApp
   class Textfilter
@@ -8,31 +10,47 @@ class PublifyApp
       plugin_display_name "HTML Filter"
       plugin_description "Strip HTML tags"
 
-      def self.filtertext(text)
-        # First, autolink
-        text = text.to_s
-        URI.extract(text, %w(http https mailto gopher)) do |item|
-          text = text.gsub(item, "<a href='#{item}'>#{item}</a>")
+      class TwitterHashtagFilter < HTML::Pipeline::HashtagFilter
+        def initialize(text)
+          super(text,
+                tag_url: "https://twitter.com/search?q=%%23%<tag>s&src=tren&mode=realtime",
+                tag_link_attr: "")
         end
+      end
 
-        # hashtags
-        text.split.grep(/^#\w+/) do |item|
-          # strip_html because Ruby considers "#prouddad</p>" as a word
-          item = item.strip_html
-          search_item = URI.encode_www_form_component(item)
+      class TwitterMentionFilter < HTML::Pipeline::MentionFilter
+        def initialize(text)
+          super(text, base_url: "https://twitter.com")
+        end
 
-          uri = "https://twitter.com/search?q=#{search_item}&src=tren&mode=realtime"
-          text = text.gsub(item, "<a href='#{uri}'>#{item}</a>")
+        # Override base mentions finder, treating @mention just like any other @foo.
+        def self.mentioned_logins_in(text, username_pattern = UsernamePattern)
+          text.gsub MentionPatterns[username_pattern] do |match|
+            login = Regexp.last_match(1)
+            yield match, login, false
+          end
         end
 
-        # @mention
-        text.to_s.split.grep(/@\w+/) do |item|
-          item = item.strip_html
-          uri = html_escape("https://twitter.com/#{item.delete("@")}")
-          text = text.gsub(item, "<a href='#{uri}'>#{item}</a>")
+        # Override base link creator, removing the class
+        def link_to_mentioned_user(login)
+          result[:mentioned_usernames] |= [login]
+
+          url = base_url.dup
+          url << "/" unless %r{[/~]\z}.match?(url)
+
+          "<a href='#{url << login}'>" \
+            "@#{login}" \
+            "</a>"
         end
+      end
+
+      def self.filtertext(text)
+        # First, autolink
+        helper = PublifyCore::ContentTextHelpers.new
+        text = helper.auto_link(text)
 
-        text
+        text = TwitterHashtagFilter.new(text).call
+        TwitterMentionFilter.new(text).call.to_s
       end
     end
   end

data/lib/sidebar_field.rb

@@ -51,8 +51,8 @@ class SidebarField
 
   class TextAreaField < self
     def input_html(sidebar)
-      html_options = { "rows" => "10", "class" => "form-control" }.
-        update(options.stringify_keys)
+      html_options = { "rows" => "10", "class" => "form-control" }
+        .update(options.stringify_keys)
       text_area_tag(input_name(sidebar), current_value(sidebar), html_options)
     end
   end

data/lib/sidebar_registry.rb

@@ -14,18 +14,6 @@ class SidebarRegistry
       registered_sidebars.sort
     end
 
-    def register_sidebar_directory(plugins_root, paths)
-      separator = plugins_root.include?("/") ? "/" : '\\'
-
-      Dir.glob(File.join(plugins_root, "*_sidebar")).select do |file|
-        plugin_name = file.split(separator).last
-        register_sidebar plugin_name.classify
-        # TODO: Move Sidebars to app/models, and views to app/views so this can
-        # be simplified.
-        paths << File.join(plugins_root, plugin_name, "lib")
-      end
-    end
-
     private
 
     def registered_sidebars

data/lib/text_filter_plugin.rb

@@ -13,7 +13,7 @@ class TextFilterPlugin
   def self.inherited(sub)
     super
 
-    if sub.to_s.start_with?("Plugin", "PublifyApp::Textfilter")
+    if sub.to_s.start_with?("Plugin", "PublifyTextfilter", "PublifyApp::Textfilter")
       name = sub.short_name
       @@filter_map[name] = sub
     end
@@ -43,7 +43,28 @@ class TextFilterPlugin
   end
 
   def self.macro_filters
-    available_filters.select { |filter| TextFilterPlugin::Macro > filter }
+    macro_pre_filters + macro_post_filters
+  end
+
+  def self.macro_pre_filters
+    available_filter_types["macropre"]
+  end
+
+  def self.macro_post_filters
+    available_filter_types["macropost"]
+  end
+
+  def self.expand_filter_list(filter_list)
+    filter_list.flat_map do |key|
+      case key
+      when :macropost
+        macro_post_filters
+      when :macropre
+        macro_pre_filters
+      else
+        filter_map[key.to_s]
+      end
+    end.compact
   end
 
   plugin_display_name "Unknown Text Filter"
@@ -153,31 +174,3 @@ class TextFilterPlugin::Markup < TextFilterPlugin
     "markup"
   end
 end
-
-class PublifyApp
-  class Textfilter
-    class MacroPost < TextFilterPlugin
-      plugin_display_name "MacroPost"
-      plugin_description "Macro expansion meta-filter (post-markup)"
-
-      def self.filtertext(text)
-        macros = TextFilterPlugin.available_filter_types["macropost"]
-        macros.reduce(text) do |new_text, macro|
-          macro.filtertext(new_text)
-        end
-      end
-    end
-
-    class MacroPre < TextFilterPlugin
-      plugin_display_name "MacroPre"
-      plugin_description "Macro expansion meta-filter (pre-markup)"
-
-      def self.filtertext(text)
-        macros = TextFilterPlugin.available_filter_types["macropre"]
-        macros.reduce(text) do |new_text, macro|
-          macro.filtertext(new_text)
-        end
-      end
-    end
-  end
-end