feat: update lastfm & weather to use internal API

1 files changed, 7 insertions, 8 deletions

diff --git a/resources/views/components/lastfm.blade.php b/resources/views/components/lastfm.blade.php
index 92b2c9c..75ec064 100644
--- a/resources/views/components/lastfm.blade.php
+++ b/resources/views/components/lastfm.blade.php
@@ -1,26 +1,25 @@
 @php
 
 $cfg = app('config')->get('services')['lastfm'];
+$api_root = app('config')->get('app')['api_root'];
 
-$current_response = json_decode(file_get_contents("https://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=".$cfg['user']."&nowplaying=true&format=json&api_key=".$cfg['key']));
-$nowplaying = $current_response->recenttracks->track[0];
-$toptracks = json_decode(file_get_contents("https://ws.audioscrobbler.com/2.0/?method=user.gettoptracks&user=".$cfg['user']."&format=json&period=7day&api_key=".$cfg['key']));
-$tracks = $toptracks->toptracks->track;
+$current_track = json_decode(file_get_contents($api_root.'/lastfm/current'));
+$toptracks = json_decode(file_get_contents($api_root.'/lastfm/top'));
 $count = 0;
 @endphp
 
 <h1>Last.fm <small>(<a href="https://www.last.fm/user/{{ $cfg['user']}}">Profile</a>)</small></h1>
-        <b>Last/Current Track:</b> <a href="{{ $nowplaying->url }}">{{ $nowplaying->name }} • {{ $nowplaying->artist->{"#text"} }}</a>
+        <b>Last/Current Track:</b> <a href="{{ $current_track->url }}">{{ $current_track->name }} • {{ $current_track->artist }}</a>
         <h2>Top {{ $cfg['toptracks'] }} Tracks (Last 7 days)</h2>
         <ol>
-@foreach ($tracks as $track)
+@foreach ($toptracks as $track)
     @if ($count >= $cfg['toptracks'])
     </ol>
         @break
     @endif
         <li>
-                <a href="{{ $track->url }}">{{ $track->name }} • {{ $track->artist->name }}</a>
-                <small>({{ $track->playcount }} plays)</small>
+                <a href="{{ $track->url }}">{{ $track->name }} • {{ $track->artist }}</a>
+                <small>({{ $track->plays }} plays)</small>
             </li>
 @php $count++ @endphp
 @endforeach