searchlink 2.3.76 → 2.3.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be4b0bed0468171691989a3253680ad36237420963132e4ee7696b4ca529be78
-  data.tar.gz: d83e1b707146106f42557b551368831a6d09bb953ab94c9f52008f01f113978c
+  metadata.gz: 529bd69f890aa6ee030706db4f66a1be5935513048aff397b8d2eb602f870f62
+  data.tar.gz: d5900f17c460e90554575e93e787c5c7c7781f3dd5cc3be5db6ebe25b6b2f098
 SHA512:
-  metadata.gz: 538c8a40d2faf7deb9a228a4f05804a80dd84ee59fb1aadfc43d2e903bb7529e03358d07dc7f559508a57be5fab13ede66b342931f17e640039123f8feefe4c2
-  data.tar.gz: 39c52a0f44a142fa5e165bb5b2f05cc4e81446ef4ff04ae369e9cf6f181c401d8602f6bbf4958f49db4d49714beae51d77bead32ed16cff9b5ccd1ef183d048d
+  metadata.gz: 55f45d757d279b85f884b92d8d4a89d34ea74bbe095c20781b628e188a15ab349064f1558bd8819b4a16345c4a69cfbcee10fb7b2dfd6739634d4c852224ee4b
+  data.tar.gz: e1d30f640035634907b17bacb2ce9796d6ee833947194abf7bd5412380f2b6c8889c5e61fc6ababf8721f16aabf32e4e87bcb788724e31e4e6d6b96f2d9b2811

data/lib/searchlink/parse.rb

@@ -325,7 +325,7 @@ module SL
               link_info.sub!(/\s*:\s*$/, "")
             end
 
-            unless !@link_text.empty? || !link_info.sub(/^[!\^]\S+/, "").strip.empty?
+            if @link_text.empty? && link_info.sub(/^[!\^]\S+/, "").strip.empty?
               SL.add_error("No input", match)
               counter_errors += 1
               invalid_search = true
@@ -399,7 +399,6 @@ module SL
                   search_terms = @link_text
                 elsif search_word && search_word[1] =~ /^(\S+\.)+\S+$/
                   search_type = SL::GoogleSearch.api_key? ? "gg" : "g"
-                  puts SL::GoogleSearch.api_key?
                   search_terms = "site:#{search_word[1]} #{@link_text}"
                 else
                   SL.add_error("Invalid search#{SL::Searches.did_you_mean(search_word[1])}", match)
@@ -424,10 +423,9 @@ module SL
 
               if (search_type && search_terms) || @url
                 # warn "Searching #{search_type} for #{search_terms}"
-                unless @url
-                  @search_count += 1
-                  @url, title, @link_text = do_search(search_type, search_terms, @link_text, @search_count)
-                end
+
+                @search_count += 1
+                @url, title, @link_text = do_search(search_type, search_terms, @link_text, @search_count)
 
                 if (@link_text == "" || @link_text == "%") && @url
                   if title

data/lib/searchlink/searches/isgd.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module SL
+  # is.gd link shortening
+  class IsgdSearch
+    class << self
+      def settings
+        {
+          trigger: "isgd",
+          searches: [
+            ["isgd", "is.gd Shorten"]
+          ]
+        }
+      end
+
+      def search(_, search_terms, link_text)
+        if SL::URL.url?(search_terms)
+          link = search_terms
+        else
+          link, rtitle = SL.ddg(search_terms, link_text)
+        end
+
+        url, title = isgd_shorten(link, rtitle)
+        link_text = title || url
+        [url, title, link_text]
+      end
+
+      def isgd_shorten(url, title = nil)
+        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]
+        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]
+      end
+    end
+
+    SL::Searches.register "isgd", :search, self
+  end
+end

data/lib/searchlink/searches.rb

@@ -208,6 +208,9 @@ require_relative "searches/history"
 # import
 require_relative "searches/hook"
 
+# import
+require_relative "searches/isgd"
+
 # import
 require_relative "searches/lastfm"
 

data/lib/searchlink/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module SL
-  VERSION = "2.3.76"
+  VERSION = '2.3.78'
 end
 
 # Main module

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchlink
 version: !ruby/object:Gem::Version
-  version: 2.3.76
+  version: 2.3.78
 platform: ruby
 authors:
 - Brett Terpstra
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-06 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -284,6 +284,7 @@ files:
 - lib/searchlink/searches/helpers/safari.rb
 - lib/searchlink/searches/history.rb
 - lib/searchlink/searches/hook.rb
+- lib/searchlink/searches/isgd.rb
 - lib/searchlink/searches/itunes.rb
 - lib/searchlink/searches/lastfm.rb
 - lib/searchlink/searches/linkding.rb