WordPress.org
Get WordPress

Plugin Directory

Changeset 2404498


Ignore:
Timestamp:
10/22/2020 09:39:08 AM (5 years ago)
Author:
grosbouff
Message:

3.3.9

Location:
wp-soundsystem/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • wp-soundsystem/trunk/classes/wpsstm-post-tracklist-class.php

    r2377957 r2404498  
    806806
    807807        //links
    808         if ( $link_urls = wpsstm_get_array_value('link',$track_arr) ){
     808        if ( $link_urls = wpsstm_get_array_value('location',$track_arr) ){
    809809
    810810          $addlinks = array();
    … …  
    963963        */
    964964
    965         $response = WPSSTM_Core_API::api_request('tracklist/import',$params);
     965        $response = WPSSTM_Core_API::api_request('v2/playlist/import',$params);
    966966        if ( is_wp_error($response) ){
    967967
    … …  
    13791379      if ( !$slug = get_post_meta( $this->post_id,WPSSTM_Core_Radios::$importer_slug_meta_name,true) ){
    13801380
    1381         $response = WPSSTM_Core_API::api_request('importer/',array('url'=>$this->feed_url));
     1381        $response = WPSSTM_Core_API::api_request('v2/importer/',array('url'=>$this->feed_url));
    13821382
    13831383        if ( is_wp_error($response) ) return $response;
    … …  
    14951495      if ( wpsstm_is_local_file($feed_url) ) return $feed_url;
    14961496      if ( !WPSSTM_Core_API::is_premium() ) return;
    1497       return WPSSTM_API_URL . sprintf('tracklist/body?url=%s',urlencode($this->feed_url));
     1497      return WPSSTM_API_URL . sprintf('v2/tracklist/body?url=%s',urlencode($this->feed_url));
    14981498    }
    14991499

  • wp-soundsystem/trunk/readme.txt

    r2375557 r2404498  
    148148
    149149== Changelog ==
     150
     151= 3.3.9 =
     152* API update
    150153
    151154= 3.3.7 =

  • wp-soundsystem/trunk/wp-soundsystem.php

    r2377957 r2404498  
    66Author: G.Breant
    77Author URI: https://profiles.wordpress.org/grosbouff/#content-plugins
    8 Version: 3.3.8
     8Version: 3.3.9
    99License: GPL2
    1010*/
    … …  
    3737    * @public string plugin version
    3838    */
    39     public $version = '3.3.8';
     39    public $version = '3.3.9';
    4040    /**
    4141    * @public string plugin DB version

  • wp-soundsystem/trunk/wpsstm-core-api.php

    r2375557 r2404498  
    1919        WP_SoundSystem::debug_log('get api user datas...');
    2020
    21         $datas = WPSSTM_Core_API::api_request('auth/userdata');
     21        $datas = WPSSTM_Core_API::api_request('v2/auth/userdata');
     22
    2223        if ( is_wp_error($datas) ) return $datas;
    2324
    … …  
    3435
    3536    if ( is_wp_error($membership) ){
    36       WP_SoundSystem::debug_log($membership->get_error_message());
    3737      return false;
    3838    }
    … …  
    5252    if ( false === ( $token = get_transient(self::$token_transient_name ) ) ) {
    5353
    54       $url = WPSSTM_API_URL . 'auth/token';
     54      $url = WPSSTM_API_URL . 'v2/auth/token';
    5555
    5656      //build headers
    … …  
    6363      $request = wp_remote_post($url,$args);
    6464      if ( is_wp_error($request) ) return $request;
     65
     66      $response_code = wp_remote_retrieve_response_code($request);
     67
     68      if ( $response_code == 503 ){
     69        $message = __('API unavailable','wpsstm');
     70        WP_SoundSystem::debug_log($message);
     71        return new WP_Error('api_error',$message );
     72      }
    6573
    6674      $response = wp_remote_retrieve_body( $request );
    … …  
    92100    if (!$endpoint){
    93101        return new WP_Error('wpsstmapi_no_api_url',__("Missing API endpoint",'wpsstm'));
     102    }
     103
     104    //TOUFIX URGENT we don't need this premium check : request should be (or not) accepted at the API url.
     105    $premium_endpoints = array(
     106      'v2/playlist/import',
     107      'v2/track/links'
     108    );
     109
     110    if ( in_array($endpoint,$premium_endpoints) && !self::is_premium() ){
     111      return new WP_Error('api_key_required',__("An API key is required.",'wpsstm'));
    94112    }
    95113
    … …  
    134152    $headers = wp_remote_retrieve_headers($request);
    135153    $response_code = wp_remote_retrieve_response_code($request);
    136     $response = wp_remote_retrieve_body( $request );
    137     $response = json_decode($response, true);
     154
     155    if ( $response_code == 503 ){
     156      $message = __('API unavailable','wpsstm');
     157      WP_SoundSystem::debug_log($message);
     158      return new WP_Error('api_error',$message );
     159    }
    138160
    139161    //invalid token, redo.
    … …  
    143165    }
    144166
     167    $response = wp_remote_retrieve_body( $request );
     168    $response = json_decode($response, true);
     169
    145170    //api error
    146171    if ( $error_msg = wpsstm_get_array_value('error',$response) ){
    147172      $error = sprintf(__('Error %s: %s','wpsstm'),$response_code,$error_msg);
     173      WP_SoundSystem::debug_log($error);
    148174      return new WP_Error('api_error',$error );
    149175    }
    … …  
    176202    }
    177203
    178     $args = array('spotify_id'=>$music_id);
    179     $response = self::api_request('track/links',$args);
     204    $args = [
     205      'track' => [ //jspf track
     206        'creator'=>$track->artist,
     207        'title'=>$track->title,
     208        'identifier'=>(array)sprintf('https://open.spotify.com/track/%s',$music_id)
     209      ]
     210    ];
     211
     212    $response = self::api_request('v2/track/links',$args,'POST');
    180213
    181214    if ( is_wp_error($response) ){
    182215      WP_SoundSystem::debug_log('Error while filtering autolinks');
    183216    }else{
    184       $new_links = wpsstm_get_array_value('items',$response);
     217      $new_links = wpsstm_get_array_value('links',$response);
    185218      $links = array_merge((array)$links,(array)$new_links);
    186219    }

  • wp-soundsystem/trunk/wpsstm-core-importer.php

    r2375557 r2404498  
    652652
    653653      if (false === $importers){
    654         $importers = WPSSTM_Core_API::api_request('importers');
     654        $importers = WPSSTM_Core_API::api_request('v2/importers');
    655655        if ( is_wp_error($importers) || !$importers ) return $importers;
    656656        set_transient( self::$importers_transient_name, $importers, 1 * DAY_IN_SECONDS );

  • wp-soundsystem/trunk/wpsstm-settings.php

    r2375557 r2404498  
    629629      }
    630630
    631         /*
    632         errors
    633         */
    634 
    635         //display errors
    636         settings_errors('api_premium');
     631      /*
     632      errors
     633      */
     634
     635      //display errors
     636      settings_errors('api_premium');
    637637
    638638    }
Note: See TracChangeset for help on using the changeset viewer.