ayadn 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6276f752eb491dd844708b87857de9e31ce9e908
-  data.tar.gz: 53d08a3828136827d3125f47cdd340d924b6d55f
+  metadata.gz: 08a202fea9f47db0c64d1c9d0b1a12b809a25650
+  data.tar.gz: f620955c6f10034e69ee9969e51e1601d146275e
 SHA512:
-  metadata.gz: 7b629af3a71e42b0e9fa1b4d6082dba04cc744ba5effa5609eca9d0cc3f8bbd8ad14ca5eab57144323c6c1acd9f03806250d00009f8bc816fec2d52611365964
-  data.tar.gz: a4c36beb941ee96e3215783ec75fca897e62e0708e09a4238016d4ea2e6088b0073adf7c1d4e1447ecf407b39077b0d7e171f723101c49fcaf24cec5275ef86d
+  metadata.gz: 9790a6fdc3958a4329ac873d3aefeddbe86291215eca8e07cd8b863903673721062d166d2ff876703447b28902b1970c17c14679acc5e21ec780baa5209220b5
+  data.tar.gz: b167b9aae1d9f9535a380dd51d96823efd375356465ee055aeefe6b27c01d32a769e8755bc085875784864bfaf24aeb59293824468ddb41da26f9891b1a2ee07

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.4.1 - Fixes
+
+- A few fixes here and there
+
 # 1.4.0 - 'Florian'
 
 - New feature: embed one or several pictures within a post (in write, post, reply, and pm)

data/lib/ayadn/action.rb

@@ -932,7 +932,11 @@ module Ayadn
         @view.show_posted(Post.new.send_nowplaying(dic))
       rescue => e
         puts Status.wtf
-        Errors.global_error("action/nowplaying", itunes, e)
+        if options['no_url']
+          Errors.global_error("action/nowplaying", itunes, e)
+        else
+          Errors.global_error("action/nowplaying", [itunes, store, options], e)
+        end
       end
     end
 
@@ -972,11 +976,8 @@ module Ayadn
     private
 
     def itunes_request itunes
-      regex_exotics = /[~:-;,?!\'&`^=+<>*%()\/"“”’°£$€.…]/
-      store_artist = itunes.artist.gsub(regex_exotics, ' ').split(' ').join('+')
-      store_track = itunes.track.gsub(regex_exotics, ' ').split(' ').join('+')
-      #store_album = itunes.album.gsub(regex_exotics, ' ').split(' ').join('+')
-      itunes_url = "https://itunes.apple.com/search?term=#{store_artist}&term=#{store_track}&media=music&entity=musicTrack"
+      infos = itunes_reg([itunes.artist, itunes.track, itunes.album])
+      itunes_url = "https://itunes.apple.com/search?term=#{infos[0]}&term=#{infos[1]}&term=#{infos[2]}&media=music&entity=musicTrack"
       results = JSON.load(CNX.download(itunes_url))['results']
       candidate = results[0]
       {
@@ -989,6 +990,13 @@ module Ayadn
       }
     end
 
+    def itunes_reg arr_of_itunes
+      regex_exotics = /[~:-;,?!\'&`^=+<>*%()\/"“”’°£$€.…]/
+      arr_of_itunes.map do |itune|
+        itune.gsub(regex_exotics, ' ').split(' ').join('+')
+      end
+    end
+
     def splitter_all words
       [words].collect {|w| w.split(' ')}
     end

data/lib/ayadn/fileops.rb

@@ -43,7 +43,8 @@ module Ayadn
 
     def self.upload(path, token)
       begin
-        file = Regexp.escape(path).gsub!('\.', '.')
+        temp = Regexp.escape(path).gsub('\.', '.')
+        file = temp.gsub('\-', '-')
         case File.extname(path).downcase
         when ".png"
           `curl -k -H 'Authorization: BEARER #{token}' https://api.app.net/files -F 'type=com.ayadn.files' -F "content=@#{file};type=image/png" -F 'public=true' -X POST`

data/lib/ayadn/post.rb

@@ -42,9 +42,7 @@ module Ayadn
     end
 
     def send_pm_embedded_pictures dic
-      url = Endpoints.new.pm_url
-      url << "?include_annotations=1&access_token=#{Ayadn::Settings.user_token}"
-      send_content(url, payload_pm_embedded(dic))
+      send_content(Endpoints.new.pm_url, payload_pm_embedded(dic))
     end
 
     def send_nowplaying dic

data/lib/ayadn/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Ayadn
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Eric Dejonckheere