searchlink 2.3.83 → 2.3.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9d44b58260a556b6834758e6782fe1b0b0d6ebb43ed79c88b3ecee9d53d124
-  data.tar.gz: a10d673938b4a58c907b2588fedaf4e71f021d5f85d392cbc17c144dea91c3b8
+  metadata.gz: 02b111da9ce13f8646d7357ae5560a1c6b84bb45fd506dca8fafe96e1c844bea
+  data.tar.gz: 02fd69545df789fdf1105dea4971b53f02bfc33ac0da20a3f25454c11f9a9ae7
 SHA512:
-  metadata.gz: e1a3d23ee5be311f69772b5f46a72a9c18b9684a22d62af561d6c1421ab13343df8b6f233e00ba6811748d5b2cf31c91886d45fae4fff94e797ecca10a285b65
-  data.tar.gz: 8100ed794563d9747bce2be4b1b2a13e6475331769ee5411a7c4c186089b01bde9536c17002bffdd8c4821db11d185590b9de3d6b8c42b27175540e2cdae945c
+  metadata.gz: 7af24cad60ca01ead8ab4a76f82c6d6fa9be6aa30752f088c23cfe387d9a3adf8f076e5e4d1f1dc25d9eeda8879d1ae7e83bbee3bcea250de6914dc67d35cf0c
+  data.tar.gz: '089fb329c4c7be4cf30bf929b8c4309374a0b8055f42eb2adeb2c62d29f7a9ef84d9e45527a5c0a13c7e0061345ee814cfd431bc6f33614ad034f8d8c970250a'

data/lib/searchlink/curl/html.rb

@@ -111,7 +111,7 @@ module Curl
     def extract_tag_contents(tag, source: false)
       return @body.scan(%r{<#{tag}.*?>(?:.*?</#{tag}>)?}) if source
 
-      @body.scan(/<#{tag}.*?>(.*?)</).map { |t| t[0] }
+      @body.scan(/<#{tag}.*?>(.*?)</).map { |t| t[1] }
     end
 
     ##

data/lib/searchlink/output.rb

@@ -3,7 +3,8 @@
 module SL
   class << self
     attr_writer :titleize, :clipboard, :output, :footer, :line_num,
-                :match_column, :match_length, :originput, :errors, :report, :printout
+                :match_column, :match_length, :originput, :errors, :report, :printout,
+                :shortener
 
     # Whether or not to add a title to the output
     def titleize
@@ -60,6 +61,16 @@ module SL
       @errors ||= {}
     end
 
+    # Stores query parameters
+    def query
+      @query ||= {}
+    end
+
+    # The shortener to use
+    def shortener
+      @shortener ||= :none
+    end
+
     # Posts macOS notifications
     #
     # @param      title     [String]   The title of the notification
@@ -102,6 +113,19 @@ module SL
 
       title = title.gsub(/[ \t]+/, " ")
 
+      url.add_query_string!
+
+      url = case SL.shortener
+            when :isgd
+              SL::IsgdSearch.shorten(url)
+            when :tinyurl
+              SL::TinyurlSearch.shorten(url)
+            when :bitly
+              SL::BitlySearch.shorten(url)
+            else
+              url
+            end
+
       case type.to_sym
       when :ref_title
         %(\n[#{text}]: #{url}#{title})
@@ -141,7 +165,6 @@ module SL
     #
     def print_footer
       unless SL.footer.empty?
-
         footnotes = []
         SL.footer.delete_if do |note|
           note.strip!
@@ -202,6 +225,14 @@ module SL
       SL.errors[type].push("(#{position}): #{str}")
     end
 
+    # Add to query string
+    # @param      hsh   [Hash] The queries to add
+    # @return     [nil]
+    def add_query(hsh)
+      SL.query ||= {}
+      SL.query.merge!(hsh)
+    end
+
     # Prints the report.
     #
     # @return     [String] The report.

data/lib/searchlink/parse.rb

@@ -2,194 +2,6 @@
 
 module SL
   class SearchLink
-    # Parse arguments in the input string
-    #
-    # @param      string  [String] the string to parse
-    # @param      opt     [Hash] the options to parse
-    # @option opt [Boolean] :only_meta (false) whether to skip flags
-    # @option opt [Boolean] :no_restore (false) whether to restore previous config
-    # @return     [String] the parsed string
-    #
-    def parse_arguments(string, opt = {})
-      input = string.dup
-      return "" if input.nil?
-
-      skip_flags = opt[:only_meta] || false
-      no_restore = opt[:no_restore] || false
-      restore_prev_config unless no_restore
-
-      input.parse_flags! unless skip_flags
-
-      options = %w[debug country_code inline prefix_random include_titles remove_seo validate_links complete_bare]
-      options.each do |o|
-        if input =~ /^ *#{o}:\s+(\S+)$/
-          val = Regexp.last_match(1).strip
-
-          if val.is_a?(String)
-            value = true if val =~ /true/i
-            value = false if val =~ /false/i
-          end
-          val = value if value
-          SL.config[o] = val
-          warn "\r\033[0KGlobal config: #{o} = #{SL.config[o]}\n" unless SILENT
-        end
-
-        next if skip_flags
-
-        while input =~ /^#{o}:\s+(.*?)$/ || input =~ /--(no-)?#{o}/
-          next unless input =~ /--(no-)?#{o}/ && !skip_flags
-
-          unless SL.prev_config.key? o
-            SL.prev_config[o] = SL.config[o]
-            bool = Regexp.last_match(1).nil? || Regexp.last_match(1) == "" ? true : false
-            SL.config[o] = bool
-            $stderr.print "\r\033[0KLine config: #{o} = #{SL.config[o]}\n" unless SILENT
-          end
-          input.sub!(/\s?--(no-)?#{o}/, "")
-        end
-      end
-      SL.clipboard ? string : input
-    end
-
-    # Parse commands from the given input string
-    #
-    # @param      input  [String] the input string
-    def parse_commands(input)
-      # Handle commands like help or docs
-      return unless input.strip =~ /^!?(h(elp)?|wiki|docs?|v(er(s(ion)?)?)?|up(date|grade))$/
-
-      case input.strip
-      when /^!?help$/i
-        if SILENT
-          help_dialog
-        else
-          $stdout.puts SL.version_check.to_s
-          $stdout.puts "See https://github.com/ttscoff/searchlink/wiki for help"
-        end
-        print input
-      when /^!?(wiki|docs)$/i
-        warn "Opening wiki in browser"
-        `open https://github.com/ttscoff/searchlink/wiki`
-      when /^!?v(er(s(ion)?)?)?$/
-        print "[#{SL.version_check}]"
-      when /^!?up(date|grade)$/
-        SL.update_searchlink
-        print SL.output.join("")
-      end
-      Process.exit 0
-    end
-
-    def create_footnote(mtch)
-      if mtch[1].nil? || mtch[1] == ""
-        match
-      else
-        note = mtch[1].strip
-        @footnote_counter += 1
-        ref = if !@link_text.empty? && @link_text.scan(/\s/).empty?
-            @link_text
-          else
-            format("%<p>sfn%<c>04d", p: @prefix, c: @footnote_counter)
-          end
-        SL.add_footer "[^#{ref}]: #{note}"
-        res = "[^#{ref}]"
-        @cursor_difference += (SL.match_length - res.length)
-        SL.match_length = res.length
-        SL.add_report("#{@match_string} => Footnote #{ref}")
-        res
-      end
-    end
-
-    def add_title(link_info)
-      @url = link_info
-      title = SL::URL.title(@url)
-      @link_text = title
-
-      if @ref_title
-        unless @links.key? @url
-          @links[@url] = @link_text
-          SL.add_footer SL.make_link(:ref_title, @link_text, @url, title: title, force_title: false)
-        end
-        @delete_line = true
-      elsif SL.config["inline"]
-        res = SL.make_link(:inline, @link_text, @url, title: title, force_title: false)
-        @cursor_difference += SL.match_length - res.length
-        SL.match_length = res.length
-        SL.add_report("#{@match_string} => #{@url}")
-        res
-      else
-        unless @links.key? @url
-          @highest_marker += 1
-          @links[@url] = format("%<pre>s%<m>04d", pre: @prefix, m: @highest_marker)
-          SL.add_footer SL.make_link(:ref_title, @links[@url], @url, title: title, force_title: false)
-        end
-
-        type = SL.config["inline"] ? :inline : :ref_link
-        res = SL.make_link(type, @link_text, @links[@url], title: false, force_title: false)
-        @cursor_difference += SL.match_length - res.length
-        SL.match_length = res.length
-        SL.add_report("#{@match_string} => #{@url}")
-        res
-      end
-    end
-
-    def custom_search(search_type, search_terms)
-      SL.config["custom_site_searches"].each do |k, v|
-        next unless search_type == k
-
-        @link_text = search_terms if !SL.titleize && @link_text == ""
-        v = parse_arguments(v, { no_restore: true })
-        if v =~ %r{^(/|http)}i
-          search_type = "r"
-          tokens = v.scan(/\$term\d+[ds]?/).sort.uniq
-
-          if !tokens.empty?
-            highest_token = 0
-            tokens.each do |token|
-              if token =~ /(\d+)[ds]?$/ && Regexp.last_match(1).to_i > highest_token
-                highest_token = Regexp.last_match(1).to_i
-              end
-            end
-            terms_p = search_terms.split(/ +/)
-            if terms_p.length > highest_token
-              remainder = terms_p[highest_token - 1..].join(" ")
-              terms_p = terms_p[0..highest_token - 2]
-              terms_p.push(remainder)
-            end
-            tokens.each do |t|
-              next unless t =~ /(\d+)[ds]?$/
-
-              int = Regexp.last_match(1).to_i - 1
-              replacement = terms_p[int]
-              case t
-              when /d$/
-                replacement.downcase!
-                re_down = ""
-              when /s$/
-                replacement.slugify!
-                re_down = ""
-              else
-                re_down = "(?!d|s)"
-              end
-              v.gsub!(/#{Regexp.escape(t) + re_down}/, replacement.url_encode)
-            end
-            search_terms = v
-          else
-            search_terms = v.gsub(/\$term[ds]?/i) do |mtch|
-              search_terms.downcase! if mtch =~ /d$/i
-              search_terms.slugify! if mtch =~ /s$/i
-              search_terms.url_encode
-            end
-          end
-        else
-          search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
-          search_terms = "site:#{v} #{search_terms}"
-        end
-
-        break
-      end
-      [search_type, search_terms]
-    end
-
     def parse(input)
       SL.output = []
       return false if input.empty?
@@ -202,6 +14,7 @@ module SL
       SL.config["inline"] = true if input.scan(/\]\(/).length == 1 && input.split(/\n/).length == 1
       SL.errors = {}
       SL.report = []
+      SL.shortener = :none
 
       # Check for new version
       latest_version = SL.new_version?
@@ -274,6 +87,7 @@ module SL
         end
       end
 
+      # Handle links in the form of [text](url) or [text](url "title")
       if input =~ /\[(.*?)\]\((.*?)\)/
         lines = input.split(/\n/)
         out = []
@@ -330,6 +144,7 @@ module SL
 
             @link_text = this_match[1] || ""
             link_info = parse_arguments(this_match[2].strip).strip || ""
+            query, link_info = link_info.extract_query({})
 
             if @link_text.strip == "" && link_info =~ /".*?"/
               link_info.gsub!(/"(.*?)"/) do
@@ -355,7 +170,7 @@ module SL
             end
 
             if link_info =~ /^!(\S+)/
-              search_type = Regexp.last_match(1)
+              search_type = Regexp.last_match(1).extract_shortener
               unless SL::Searches.valid_search?(search_type) || search_type =~ /^(\S+\.)+\S+$/
                 SL.add_error("Invalid search#{SL::Searches.did_you_mean(search_type)}", match)
                 invalid_search = true
@@ -391,6 +206,8 @@ module SL
                     m[1]
                   end
 
+                search_type.extract_shortener!
+
                 search_terms = m[2].gsub(/(^["']|["']$)/, "")
                 search_terms.strip!
 
@@ -414,17 +231,22 @@ module SL
                 link_only = true if search_terms =~ /!!\^?$/
 
                 search_terms = search_terms.sub(/(!!)?\^?(!!)?$/, "")
+
+                if search_type =~ /^(\S+\.)+\S+$/
+                  search_type = "g"
+                  search_terms = "site:#{m[1]} #{search_terms}"
+                end
               elsif link_info =~ /^!/
                 search_word = link_info.match(/^!(\S+)/)
-
-                if search_word && SL::Searches.valid_search?(search_word[1])
-                  search_type = search_word[1] unless search_word.nil?
+                st = search_word[1].extract_shortener
+                if search_word && SL::Searches.valid_search?(st)
+                  search_type = st unless search_word.nil?
                   search_terms = @link_text
-                elsif search_word && search_word[1] =~ /^(\S+\.)+\S+$/
+                elsif search_word && st =~ /^(\S+\.)+\S+$/
                   search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
                   search_terms = "site:#{search_word[1]} #{@link_text}"
                 else
-                  SL.add_error("Invalid search#{SL::Searches.did_you_mean(search_word[1])}", match)
+                  SL.add_error("Invalid search#{SL::Searches.did_you_mean(st)}", match)
                   search_type = false
                   search_terms = false
                 end
@@ -444,6 +266,8 @@ module SL
                 search_type, search_terms = custom_search(search_type, search_terms)
               end
 
+              SL.add_query(query) if query
+
               if (search_type && search_terms) || @url
                 # warn "Searching #{search_type} for #{search_terms}"
 
@@ -538,12 +362,13 @@ module SL
         SL.add_report("Processed: #{total_links} links, #{counter_errors} errors.")
         SL.print_report
         SL.print_errors
-      else
+      else # Assume single line input
         link_only = false
         SL.clipboard = false
 
         res = parse_arguments(input.strip!).strip
         input = res.nil? ? input.strip : res
+        query, input = input.extract_query({})
 
         # if the end of input contain "^", copy to clipboard instead of STDOUT
         SL.clipboard = true if input =~ /\^[!~:\s]*$/
@@ -602,8 +427,9 @@ module SL
 
         case input
         when /^!(\S+)\s+(.*)$/
-          type = Regexp.last_match(1)
+          type = Regexp.last_match(1).extract_shortener
           link_info = Regexp.last_match(2).strip
+
           @link_text ||= link_info
           terms = link_info + additional_terms
           terms.strip!
@@ -611,60 +437,7 @@ module SL
           if SL::Searches.valid_search?(type) || type =~ /^(\S+\.)+\S+$/
             if type && terms && !terms.empty?
               # Iterate through custom searches for a match, perform search if matched
-              SL.config["custom_site_searches"].each do |k, v|
-                next unless type == k
-
-                @link_text = terms if @link_text == ""
-                v = parse_arguments(v, { no_restore: true })
-                if v =~ %r{^(/|http)}i
-                  type = "r"
-                  tokens = v.scan(/\$term\d+[ds]?/).sort.uniq
-
-                  if !tokens.empty?
-                    highest_token = 0
-                    tokens.each do |token|
-                      t = Regexp.last_match(1)
-                      highest_token = t.to_i if token =~ /(\d+)d?$/ && t.to_i > highest_token
-                    end
-                    terms_p = terms.split(/ +/)
-                    if terms_p.length > highest_token
-                      remainder = terms_p[highest_token - 1..].join(" ")
-                      terms_p = terms_p[0..highest_token - 2]
-                      terms_p.push(remainder)
-                    end
-                    tokens.each do |t|
-                      next unless t =~ /(\d+)d?$/
-
-                      int = Regexp.last_match(1).to_i - 1
-                      replacement = terms_p[int]
-
-                      re_down = case t
-                        when /d$/
-                          replacement.downcase!
-                          ""
-                        when /s$/
-                          replacement.slugify!
-                          ""
-                        else
-                          "(?!d|s)"
-                        end
-                      v.gsub!(/#{Regexp.escape(t) + re_down}/, replacement.url_encode)
-                    end
-                    terms = v
-                  else
-                    terms = v.gsub(/\$term[ds]?/i) do |mtch|
-                      terms.downcase! if mtch =~ /d$/i
-                      terms.slugify! if mtch =~ /s$/i
-                      terms.url_encode
-                    end
-                  end
-                else
-                  type = SL::GoogleSearch.api_key? ? "gg" : "g"
-                  terms = "site:#{v} #{terms}"
-                end
-
-                break
-              end
+              type, terms = custom_search(type, terms)
             end
 
             # if contains TLD, use site-specific search
@@ -675,6 +448,7 @@ module SL
             @search_count ||= 0
             @search_count += 1
 
+            SL.add_query(query) if query
             @url, title, @link_text = do_search(type, terms, @link_text, @search_count)
           else
             SL.add_error("Invalid search#{SL::Searches.did_you_mean(type)}", input)
@@ -689,9 +463,11 @@ module SL
               "t"
             end
           @link_text = input.sub(/^[tfilm]/, "")
+          SL.add_query(query) if query
           @url, title = SL::SocialSearch.social_handle(type, @link_text)
           @link_text = title
         else
+          SL.add_query(query) if query
           @link_text ||= input
           @url, title, @link_text = SL.ddg(input, @link_text)
         end
@@ -725,5 +501,199 @@ module SL
         end
       end
     end
+
+    private
+
+    def add_title(link_info)
+      @url = link_info
+      title = SL::URL.title(@url)
+      @link_text = title
+
+      if @ref_title
+        unless @links.key? @url
+          @links[@url] = @link_text
+          SL.add_footer SL.make_link(:ref_title, @link_text, @url, title: title, force_title: false)
+        end
+        @delete_line = true
+      elsif SL.config["inline"]
+        res = SL.make_link(:inline, @link_text, @url, title: title, force_title: false)
+        @cursor_difference += SL.match_length - res.length
+        SL.match_length = res.length
+        SL.add_report("#{@match_string} => #{@url}")
+        res
+      else
+        unless @links.key? @url
+          @highest_marker += 1
+          @links[@url] = format("%<pre>s%<m>04d", pre: @prefix, m: @highest_marker)
+          SL.add_footer SL.make_link(:ref_title, @links[@url], @url, title: title, force_title: false)
+        end
+
+        type = SL.config["inline"] ? :inline : :ref_link
+        res = SL.make_link(type, @link_text, @links[@url], title: false, force_title: false)
+        @cursor_difference += SL.match_length - res.length
+        SL.match_length = res.length
+        SL.add_report("#{@match_string} => #{@url}")
+        res
+      end
+    end
+
+    # Parse arguments in the input string
+    #
+    # @param      string  [String] the string to parse
+    # @param      opt     [Hash] the options to parse
+    # @option opt [Boolean] :only_meta (false) whether to skip flags
+    # @option opt [Boolean] :no_restore (false) whether to restore previous config
+    # @return     [String] the parsed string
+    #
+    def parse_arguments(string, opt = {})
+      input = string.dup
+      return "" if input.nil?
+
+      skip_flags = opt[:only_meta] || false
+      no_restore = opt[:no_restore] || false
+      restore_prev_config unless no_restore
+
+      input.parse_flags! unless skip_flags
+
+      options = %w[debug country_code inline prefix_random include_titles remove_seo validate_links complete_bare]
+      options.each do |o|
+        if input =~ /^ *#{o}:\s+(\S+)$/
+          val = Regexp.last_match(1).strip
+
+          if val.is_a?(String)
+            value = true if val =~ /true/i
+            value = false if val =~ /false/i
+          end
+          val = value if value
+          SL.config[o] = val
+          warn "\r\033[0KGlobal config: #{o} = #{SL.config[o]}\n" unless SILENT
+        end
+
+        next if skip_flags
+
+        while input =~ /^#{o}:\s+(.*?)$/ || input =~ /--(no-)?#{o}/
+          next unless input =~ /--(no-)?#{o}/ && !skip_flags
+
+          unless SL.prev_config.key? o
+            SL.prev_config[o] = SL.config[o]
+            bool = Regexp.last_match(1).nil? || Regexp.last_match(1) == "" ? true : false
+            SL.config[o] = bool
+            $stderr.print "\r\033[0KLine config: #{o} = #{SL.config[o]}\n" unless SILENT
+          end
+          input.sub!(/\s?--(no-)?#{o}/, "")
+        end
+      end
+      SL.clipboard ? string : input
+    end
+
+    # Parse commands from the given input string
+    #
+    # @param      input  [String] the input string
+    def parse_commands(input)
+      # Handle commands like help or docs
+      return unless input.strip =~ /^!?(h(elp)?|wiki|docs?|v(er(s(ion)?)?)?|up(date|grade))$/
+
+      case input.strip
+      when /^!?help$/i
+        if SILENT
+          help_dialog
+        else
+          $stdout.puts SL.version_check.to_s
+          $stdout.puts "See https://github.com/ttscoff/searchlink/wiki for help"
+        end
+        print input
+      when /^!?(wiki|docs)$/i
+        warn "Opening wiki in browser"
+        `open https://github.com/ttscoff/searchlink/wiki`
+      when /^!?v(er(s(ion)?)?)?$/
+        print "[#{SL.version_check}]"
+      when /^!?up(date|grade)$/
+        SL.update_searchlink
+        print SL.output.join("")
+      end
+      Process.exit 0
+    end
+
+    def create_footnote(mtch)
+      if mtch[1].nil? || mtch[1] == ""
+        match
+      else
+        note = mtch[1].strip
+        @footnote_counter += 1
+        ref = if !@link_text.empty? && @link_text.scan(/\s/).empty?
+            @link_text
+          else
+            format("%<p>sfn%<c>04d", p: @prefix, c: @footnote_counter)
+          end
+        SL.add_footer "[^#{ref}]: #{note}"
+        res = "[^#{ref}]"
+        @cursor_difference += (SL.match_length - res.length)
+        SL.match_length = res.length
+        SL.add_report("#{@match_string} => Footnote #{ref}")
+        res
+      end
+    end
+
+    def custom_search(search_type, search_terms)
+      SL.config["custom_site_searches"].each do |k, v|
+        next unless search_type == k
+
+        @link_text = search_terms if !SL.titleize && @link_text == ""
+        v = parse_arguments(v, { no_restore: true })
+        query, v = v.extract_query({})
+
+        SL.add_query(query)
+
+        if v =~ %r{^(/|http)}i
+          search_type = "r"
+          tokens = v.scan(/\$term\d+[ds]?/).sort.uniq
+
+          if !tokens.empty?
+            highest_token = 0
+            tokens.each do |token|
+              if token =~ /(\d+)[ds]?$/ && Regexp.last_match(1).to_i > highest_token
+                highest_token = Regexp.last_match(1).to_i
+              end
+            end
+            terms_p = search_terms.split(/ +/)
+            if terms_p.length > highest_token
+              remainder = terms_p[highest_token - 1..].join(" ")
+              terms_p = terms_p[0..highest_token - 2]
+              terms_p.push(remainder)
+            end
+            tokens.each do |t|
+              next unless t =~ /(\d+)[ds]?$/
+
+              int = Regexp.last_match(1).to_i - 1
+              replacement = terms_p[int]
+              case t
+              when /d$/
+                replacement.downcase!
+                re_down = ""
+              when /s$/
+                replacement.slugify!
+                re_down = ""
+              else
+                re_down = "(?!d|s)"
+              end
+              v.gsub!(/#{Regexp.escape(t) + re_down}/, replacement.url_encode)
+            end
+            search_terms = v
+          else
+            search_terms = v.gsub(/\$term[ds]?/i) do |mtch|
+              search_terms.downcase! if mtch =~ /d$/i
+              search_terms.slugify! if mtch =~ /s$/i
+              search_terms.url_encode
+            end
+          end
+        else
+          search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
+          search_terms = "site:#{v} #{search_terms}"
+        end
+
+        break
+      end
+      [search_type, search_terms]
+    end
   end
 end

data/lib/searchlink/searches/bitly.rb

@@ -14,11 +14,12 @@ module SL
           config: [
             {
               key: "bitly_access_token",
-              value: "xxxx",
-              required: false,
+              value: "",
+              required: true,
               description: "Generate an access token at https://app.bitly.com/settings/api/"
             },
             {
+              description: "Bit.ly domain (optional).",
               key: "bitly_domain",
               value: "bit.ly",
               required: false
@@ -31,32 +32,55 @@ module SL
         if SL::URL.url?(search_terms)
           link = search_terms
         else
-          link, rtitle = SL.ddg(search_terms, link_text)
+          link, title, link_text = SL.ddg(search_terms, link_text)
         end
 
-        url, title = bitly_shorten(link, rtitle)
-        link_text = title || url
-        [url, title, link_text]
-      end
+        url = shorten(link)
 
-      def bitly_shorten(url, title = nil)
-        unless SL.config.key?("bitly_access_token") && !SL.config["bitly_access_token"].empty?
-          SL.add_error("Bit.ly not configured", "Missing access token")
-          return [false, title]
+        unless url
+          SL.add_error("Result is not a valid URL", "URL error")
+          return [false, title, link_text]
         end
 
+        format_response(url, link, link_text)
+      end
+
+      def shorten(url)
+        return false unless bitly_config?
+
         domain = SL.config.key?("bitly_domain") ? SL.config["bitly_domain"] : "bit.ly"
-        long_url = url.dup
-        curl = TTY::Which.which("curl")
-        cmd = [
-          %(#{curl} -SsL -H 'Authorization: Bearer #{SL.config['bitly_access_token']}'),
-          %(-H 'Content-Type: application/json'),
-          "-X POST", %(-d '{ "long_url": "#{url}", "domain": "#{domain}" }'), "https://api-ssl.bitly.com/v4/shorten"
-        ]
-        data = JSON.parse(`#{cmd.join(" ")}`.strip)
-        link = data["link"]
-        title ||= SL::URL.title(long_url)
-        [link, title]
+
+        headers = {
+          "Content-Type" => "application/json",
+          "Authorization" => "Bearer #{SL.config['bitly_access_token']}"
+        }
+        data_obj = {
+          "long_url" => url,
+          "domain" => domain
+        }
+        data = Curl::Json.new("https://api-ssl.bitly.com/v4/shorten", data: data_obj.to_json, headers: headers, symbolize_names: true)
+
+        return false unless data.json.key?(:link)
+
+        link = data.json[:link]
+
+        return false unless SL::URL.valid_link?(link)
+
+        link
+      end
+
+      private
+
+      def bitly_config?
+        return true if SL.config["bitly_access_token"] && !SL.config["bitly_access_token"].empty?
+
+        SL.add_error("Bit.ly not configured", "Missing access token")
+        false
+      end
+
+      def format_response(link, original_url, link_text)
+        rtitle = SL::URL.title(original_url)
+        [link, rtitle, link_text == "" && !SL.titleize ? rtitle : link_text]
       end
     end
 

data/lib/searchlink/searches/github.rb

@@ -25,6 +25,9 @@ module SL
       end
 
       def search(search_type, search_terms, link_text)
+        @auth_token = Secrets::GH_AUTH_TOKEN if defined? Secrets::GH_AUTH_TOKEN
+        @auth_token = SL.config["github_token"] if SL.config.key?("github_token") && !SL.config["github_token"].empty?
+
         case search_type
         when /^gist/
           url, title, link_text = gist(search_terms, search_type, link_text)
@@ -46,7 +49,7 @@ module SL
           "Accept" => "application/vnd.github+json",
           "X-GitHub-Api-Version" => "2022-11-28"
         }
-        headers["Authorization"] = "Bearer #{Secrets::GH_AUTH_TOKEN}" if defined? Secrets::GH_AUTH_TOKEN
+        headers["Authorization"] = "Bearer #{@auth_token}" if defined? @auth_token
 
         url = "https://api.github.com/search/#{endpoint}?q=#{query.url_encode}&per_page=1&page=1&order=desc"
         res = Curl::Json.new(url, headers: headers)
@@ -163,6 +166,8 @@ module SL
       end
 
       def filter_gists(gists, search_terms)
+        return false if gists.is_a?(Hash)
+
         score = 0
         gists.map! do |g|
           {
@@ -238,7 +243,7 @@ module SL
         end
 
         # Assuming we retrieved a full gist URL
-        if url =~ %r{https://gist.github.com/(?:(?<user>[^/]+)/)?(?<id>[a-z0-9]+?)(?:[#/](?<file>(?:file-)?.*?))?$}
+        if url && url =~ %r{https://gist.github.com/(?:(?<user>[^/]+)/)?(?<id>[a-z0-9]+?)(?:[#/](?<file>(?:file-)?.*?))?$}
           m = Regexp.last_match
           user = m["user"]
           id = m["id"]

data/lib/searchlink/searches/google.rb

@@ -43,7 +43,7 @@ module SL
           return false
         end
 
-        url = "https://customsearch.googleapis.com/customsearch/v1?cx=338419ee5ac894523&q=#{ERB::Util.url_encode(search_terms)}&num=1&key=#{@api_key}"
+        url = "https://customsearch.googleapis.com/customsearch/v1?cx=338419ee5ac894523&q=#{ERB::Util.url_encode(search_terms.gsub(/%22/, '"'))}&num=1&key=#{@api_key}"
         json = Curl::Json.new(url).json
 
         if json["error"] && json["error"]["code"].to_i == 429

data/lib/searchlink/searches/helpers/safari.rb

@@ -68,8 +68,13 @@ module SL
       ## @return     [Array] [url, title, date]
       ##
       def search_safari_bookmarks(terms)
-        data = `plutil -convert xml1 -o - ~/Library/Safari/Bookmarks.plist`.strip
+        data = `plutil -extract Children xml1 -o - ~/Library/Safari/Bookmarks.plist`.strip
+
+        data.gsub!(%r{<key>Data</key>\s+<data>(.+?)</data>\n}m, "")
+        data.gsub!(/\t/, "")
+
         parent = Plist.parse_xml(data)
+
         results = get_safari_bookmarks(parent, terms)
         return false if results.empty?
 

data/lib/searchlink/searches/history.rb

@@ -45,12 +45,11 @@ module SL
           ],
           config: [
             {
-              description:
-                ["Remove or comment (with #) history searches you don't want",
-                 "performed by `!h`. You can force-enable them per search, e.g.",
-                 "`!hsh` (Safari History only), `!hcb` (Chrome Bookmarks only)",
-                 "etc. Multiple types can be strung together: !hshcb (Safari",
-                 "History and Chrome bookmarks)"].join(" "),
+              description: ["Remove or comment (with #) history searches you don't want",
+                            "performed by `!h`. You can force-enable them per search, e.g.",
+                            "`!hsh` (Safari History only), `!hcb` (Chrome Bookmarks only)",
+                            "etc. Multiple types can be strung together: !hshcb (Safari",
+                            "History and Chrome bookmarks)"].join(" "),
               required: false,
               key: "history_types",
               value: %w[

data/lib/searchlink/searches/isgd.rb

@@ -17,29 +17,26 @@ module SL
         if SL::URL.url?(search_terms)
           link = search_terms
         else
-          link, rtitle = SL.ddg(search_terms, link_text)
+          link, title, link_text = SL.ddg(search_terms, link_text)
         end
 
-        url, title = isgd_shorten(link, rtitle)
-        link_text = title || url
+        url = shorten(link)
+        title = SL::URL.title(link) if title.nil? || title.empty?
+        link_text = title if (link_text.nil? || link_text.empty?) && !SL.titleize
         [url, title, link_text]
       end
 
-      def isgd_shorten(url, title = nil)
+      def shorten(url)
         long_url = url.dup
 
         data = Curl::Json.new("https://is.gd/create.php?format=json&url=#{CGI.escape(long_url)}", symbolize_names: true)
 
         if data.json.key?("errorcode")
           SL.add_error("Error creating is.gd url", data.json[:errorcode])
-          return [false, title, link_text]
+          return false
         end
 
-        link = data.json[:shorturl]
-        rtitle = SL::URL.title(long_url)
-        title = rtitle
-        link_text = rtitle if link_text == "" && !SL.titleize
-        [link, title, link_text]
+        data.json[:shorturl]
       end
     end
 

data/lib/searchlink/searches/linkding.rb

@@ -10,6 +10,20 @@ module SL
           trigger: "(ld|ding)",
           searches: [
             [%w[ld ding], "Linkding Bookmark Search"]
+          ],
+          config: [
+            {
+              description: "Linkding server URL.",
+              key: "linkding_server",
+              value: "''",
+              required: true
+            },
+            {
+              description: "Linkding API key.\nYou can find your api key here: https://your_server/settings/integrations",
+              key: "linkding_api_key",
+              value: "''",
+              required: true
+            }
           ]
         }
       end
@@ -108,7 +122,7 @@ module SL
         cache
       end
 
-      # Search pinboard bookmarks
+      # Search linkding bookmarks
       # Begin query with '' to force exact matching (including description text)
       # Regular matching searches for each word of query and scores the bookmarks
       # exact matches in title get highest score
@@ -120,13 +134,13 @@ module SL
       #
       # Exact matching is case and punctuation insensitive
       def search(_, search_terms, link_text)
-        unless SL.config["linkding_server"]
+        unless SL.config["linkding_server"] && !SL.config["linkding_server"].empty?
           SL.add_error("Missing Linkding server",
                        "add it to your configuration (linkding_server: https://YOUR_SERVER)")
           return false
         end
 
-        unless SL.config["linkding_api_key"]
+        unless SL.config["linkding_api_key"] && !SL.config["linkding_api_key"].empty?
           SL.add_error("Missing Linkding API token",
                        "Find your api key at https://your_server/settings/integrations and add it
                         to your configuration (linkding_api_key: YOURKEY)")

data/lib/searchlink/searches/setapp.rb

@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+
+# Setapp Plugin
+# Takes an app name or Setapp URL, adds an affiliate string,
+# and outputs a URL, optionally shortened with is.gd or bit.ly
+#
+# Optional config:
+#
+# ```yaml
+# setapp_affiliate_string: xxxxxxxxx # see below
+# bitly_domain: bit.ly # or custom domain
+# bitly_access_token: xxxxxxxxxxxx # see below
+# ```
+#
+# To get your Setapp affiliate string
+#
+# 1. You must have a Setapp affiliate account through impact.com
+# 2. Generate a campaign url for an app landing page
+# 3. Follow the short link provided
+# 4. The browser URL bar will now show the expanded link
+# 5. Copy everything after the & symbol in the url to
+#    the `setapp_affiliate_string` config line
+#
+# Run a search with !set, !seti, or !setb. The input can either be
+# a Setapp app landing page url, or an app name, e.g. `!seti marked`,
+# `[jump desktop](!seti)`, or `!setb https://setapp.com/apps/marked`
+#
+module SL
+  # is.gd link shortening
+  class SetappSearch
+    class << self
+      def settings
+        {
+          trigger: "set[ib]?",
+          searches: [
+            ["set", "Setapp Link with optional affiliate string"],
+            ["seti", "Shorten Setapp Affiliate Link with is.gd"],
+            ["setb", "Shorten Setapp Affiliate Link with bit.ly"]
+          ],
+          config: [
+            {
+              description: "Setapp affiliate string (optional).\nYou can find your affiliate string here: https://www.impact.com/affiliate/links",
+              key: "setapp_affiliate_string",
+              value: "''",
+              required: false
+            }
+          ]
+        }
+      end
+
+      def search(search_type, search_terms, link_text)
+        link = build_link(search_terms)
+        link, rtitle, link_text = process_link(link, search_terms, link_text)
+        return [false, rtitle, link_text] unless valid_setapp_url?(link)
+
+        process_search_type(search_type, link, rtitle, link_text)
+      end
+
+      private
+
+      def build_link(search_terms)
+        return search_terms if SL::URL.url?(search_terms)
+
+        "https://setapp.com/apps/#{CGI.escape(search_terms.gsub(/ \d+$/, '').gsub(/ +/, '-').downcase)}"
+      end
+
+      def process_link(link, search_terms, link_text)
+        SL::URL.valid_link?(link, 2) && [link, search_terms, link_text] || SL.ddg("site:setapp.com #{search_terms}", link_text)
+      end
+
+      def process_search_type(search_type, link, title, link_text)
+        link_text = link_text.nil? || link_text.empty? ? Curl::Html.new(link).title.sub(/ on Setapp.*/, "") : link_text
+        link = build_affiliate_url(link)
+        case search_type
+        when "set"
+          format_response(link, link_text)
+        when "seti"
+          shorten(:isgd, link, title, link_text)
+        when "setb"
+          shorten(:bitly, link, title, link_text)
+        else
+          SL.add_error("Invalid search type", "Search error")
+          [false, title, link_text]
+        end
+      end
+
+      def shorten(type, url, title = nil, link_text = nil)
+        return [false, title, link_text] unless valid_setapp_url?(url)
+
+        shortened_url = case type
+                        when :isgd
+                          SL::IsgdSearch.shorten(url)
+                        when :bitly
+                          SL::BitlySearch.shorten(url)
+                        end
+        return [false, title, link_text] unless shortened_url
+
+        format_response(shortened_url, link_text)
+      end
+
+      def valid_setapp_url?(url)
+        return true if SL::URL.valid_link?(url, 2) && url =~ %r{^https://setapp.com}
+
+        SL.add_error("URL is not a valid Setapp link", "URL error")
+        false
+      end
+
+      def valid_affiliate_config?
+        return true if SL.config.key?("setapp_affiliate_string") && !SL.config["setapp_affiliate_string"].empty?
+
+        # SL.add_error("Setapp affiliate string not configured", "Missing affiliate string")
+        false
+      end
+
+      def build_affiliate_url(url)
+        return url unless valid_affiliate_config?
+
+        separator = url =~ /\?/ ? "&" : "?"
+        "#{url}#{SL.config['setapp_affiliate_string'].sub(/^[?&]?/, separator)}"
+      end
+
+      def format_response(link, link_text)
+        title = SL::URL.title(link)
+
+        [link, title, link_text.nil? || link_text.empty? && !SL.titleize ? title : link_text]
+      end
+    end
+
+    SL::Searches.register "setapp", :search, self
+  end
+end

data/lib/searchlink/searches/tinyurl.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module SL
+  # is.gd link shortening
+  class TinyurlSearch
+    class << self
+      def settings
+        {
+          trigger: "tiny",
+          searches: [
+            ["tiny", "TinyURL Shorten"]
+          ],
+          config: [
+            {
+              key: "tinyurl_access_token",
+              value: "",
+              required: true,
+              description: "Generate a tinyurl API key at https://tinyurl.ph/developers (login required)"
+            }
+          ]
+        }
+      end
+
+      def search(_, search_terms, link_text)
+        if SL::URL.url?(search_terms)
+          link = search_terms
+        else
+          link, title, link_text = SL.ddg(search_terms, link_text)
+        end
+
+        url = shorten(link)
+        title = SL::URL.title(link) if title.nil? || title.empty?
+        link_text = title if (link_text.nil? || link_text.empty?) && !SL.titleize
+        format_response(url, link, link_text)
+      end
+
+      def shorten(url)
+        return false unless tinyurl_config?
+
+        headers = {
+          "Content-Type" => "application/json",
+          "Authorization" => "Bearer #{SL.config['tinyurl_access_token']}"
+        }
+        data_obj = {
+          "url" => url
+        }
+        data = Curl::Json.new("https://tinyurl.ph/api/url/add", data: data_obj.to_json, headers: headers, symbolize_names: true)
+
+        if data.json[:error].positive?
+          SL.add_error("Error creating tinyurl", data.json[:error])
+          return false
+        end
+
+        data.json[:shorturl]
+      end
+
+      def tinyurl_config?
+        return true if SL.config["tinyurl_access_token"] && !SL.config["tinyurl_access_token"].empty?
+
+        SL.add_error("TinyURL not configured", "Missing access token")
+        false
+      end
+
+      def format_response(link, original_url, link_text)
+        rtitle = SL::URL.title(original_url)
+        [link, rtitle, link_text == "" && !SL.titleize ? rtitle : link_text]
+      end
+    end
+
+    SL::Searches.register "tiny", :search, self
+  end
+end

data/lib/searchlink/searches.rb

@@ -218,6 +218,9 @@ require_relative "searches/lastfm"
 # import
 require_relative "searches/pinboard"
 
+# import
+require_relative "searches/setapp"
+
 # import
 require_relative "searches/social"
 
@@ -245,5 +248,8 @@ require_relative "searches/youtube"
 # import
 require_relative "searches/stackoverflow"
 
+# import
+require_relative "searches/tinyurl"
+
 # import
 require_relative "searches/linkding"

data/lib/searchlink/string.rb

@@ -37,6 +37,73 @@ module SL
       replace scrub
     end
 
+    # Extract query string from search string
+    def extract_query(known_queries = {})
+      string = gsub(/\?((\S+?)=(\S+?)(?=&|$|\s))+/) do |mtch|
+        tokens = mtch.sub(/^\?/, "").split("&")
+        tokens.each do |token|
+          key, value = token.split("=")
+
+          known_queries[key] = value
+        end
+
+        ""
+      end.gsub(/ +/, " ").strip
+
+      [known_queries, string]
+    end
+
+    # Extract a shortner from a string
+    def extract_shortener
+      return self unless self =~ /_[ibt]$/i
+
+      shortener = split(/_/).last
+      SL.shortener = case shortener
+                     when /i/i
+                       :isgd
+                     when /b/i
+                       :bitly
+                     when /t/i
+                       :tinyurl
+                     else
+                       :none
+                     end
+
+      sub(/_[ibt]$/i, "")
+    end
+
+    # Destructive version of #extract_shortener
+    # @see #extract_shortener
+    # @return     [String] The string without the shortener
+    def extract_shortener!
+      replace extract_shortener
+    end
+
+    # Format and append a query string
+    #
+    # @return     [String] The formatted query string
+    #
+    def add_query_string
+      return self if SL.query.empty?
+
+      query = SL.query.map { |k, v| "#{k}=#{v}" }.join("&")
+
+      query = if self =~ /\?[^= ]+=\S+/
+                "&#{query}"
+              else
+                "?#{query}"
+              end
+
+      "#{self}#{query}"
+    end
+
+    # Destructive version of #add_query_string
+    # @see #add_query_string
+    # @return     [String] The formatted query string
+    def add_query_string!
+      replace add_query_string
+    end
+
     # URL Encode string
     #
     # @return     [String] url encoded string
@@ -157,6 +224,30 @@ module SL
       input + append
     end
 
+    ##
+    ## Append an affiliate string to a URL
+    ##
+    ## @param      aff_string   [String]  The affiliate string
+    ## @return     [String]  The URL with the affiliate string
+    ##
+    ## @see        #append_affiliate_string!
+    ##
+    def append_affiliate_string(aff_string)
+      separator = self =~ /\?/ ? "&" : "?"
+      "#{self}#{aff_string.sub(/^[?&]?/, separator)}"
+    end
+
+    ## Destructively append an affiliate string to a URL
+    ##
+    ## @param      aff_string   [String]  The affiliate string
+    ## @return     [String]  The URL with the affiliate string
+    ##
+    ## @see        #append_affiliate_string
+    ##
+    def append_affiliate_string!(aff_string)
+      replace append_affiliate_string(aff_string)
+    end
+
     ##
     ## Remove the protocol from a URL
     ##

data/lib/searchlink/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SL
-  VERSION = '2.3.83'
+  VERSION = "2.3.85"
 end
 
 # Main module
@@ -47,7 +47,7 @@ module SL
       if defined? Secrets::GH_AUTH_TOKEN
         headers["Authorization"] = "Bearer #{Secrets::GH_AUTH_TOKEN}"
       elsif SL.config["github_token"]
-        headers["Authorization"] = "Bearer #{SL.settings["github_token"]}"
+        headers["Authorization"] = "Bearer #{SL.config["github_token"]}"
       end
 
       url = "https://api.github.com/repos/ttscoff/searchlink/releases/latest"

data/lib/tokens.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Secrets
-  GH_AUTH_TOKEN = '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'
+  GH_AUTH_TOKEN = "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"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: searchlink
 version: !ruby/object:Gem::Version
-  version: 2.3.83
+  version: 2.3.85
 platform: ruby
 authors:
 - Brett Terpstra
 bindir: bin
 cert_chain: []
-date: 2025-03-26 00:00:00.000000000 Z
+date: 2025-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -141,14 +141,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.1
+        version: 3.7.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -303,11 +303,13 @@ files:
 - lib/searchlink/searches/linkding.rb
 - lib/searchlink/searches/lyrics.rb
 - lib/searchlink/searches/pinboard.rb
+- lib/searchlink/searches/setapp.rb
 - lib/searchlink/searches/social.rb
 - lib/searchlink/searches/software.rb
 - lib/searchlink/searches/spelling.rb
 - lib/searchlink/searches/spotlight.rb
 - lib/searchlink/searches/stackoverflow.rb
+- lib/searchlink/searches/tinyurl.rb
 - lib/searchlink/searches/tmdb.rb
 - lib/searchlink/searches/twitter.rb
 - lib/searchlink/searches/wikipedia.rb