diff options
| -rw-r--r-- | lfmclient.go | 3 | ||||
| -rw-r--r-- | main.go | 2 | ||||
| -rw-r--r-- | modern.go | 8 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lfmclient.go b/lfmclient.go index 1ce822d..80d6218 100644 --- a/lfmclient.go +++ b/lfmclient.go @@ -91,7 +91,8 @@ type RecentTrack struct { } func (app *App) LfmQuery(payload map[string]string) []byte { - r, _ := http.NewRequest("GET", "http://ws.audioscrobbler.com/2.0/", nil) + r, _ := http.NewRequest("GET", "http://64.30.224.206/2.0/", nil) + r.Host = "ws.audioscrobbler.com" values := r.URL.Query() values.Add("api_key", app.Config.Lfm.ApiKey) values.Add("format", "json") @@ -60,7 +60,7 @@ func (app *App) InitApiServer() *http.Server { sm.HandleFunc("/", logg(app.mainHandler)) sm.HandleFunc("/np", logg(app.nowPlayingHandler)) sm.HandleFunc("/scrobble", logg(app.scrobbleHandler)) - //http.HandleFunc("/2.0/", logg(app.ApiHandler)) + sm.HandleFunc("/2.0/", logg(app.ApiHandler)) apiServer.Addr = ":3001" apiServer.Handler = sm return apiServer @@ -106,16 +106,16 @@ func (store *SqlStore) TrackScrobble(r *http.Request) (ApiResponse, error) { } } -func ApiHandler(ds DataStore, w http.ResponseWriter, r *http.Request) { +func (app *App) ApiHandler(w http.ResponseWriter, r *http.Request) { method := r.FormValue("method") response := LFMResponse{Status: "ok"} switch method { case "auth.getToken": - response.Response = ds.AuthGetToken(r) + response.Response = app.DataStore.AuthGetToken(r) case "auth.getSession": - response.Response = ds.AuthGetSession(r) + response.Response = app.DataStore.AuthGetSession(r) case "track.scrobble": - if r, err := ds.TrackScrobble(r); err != nil { + if r, err := app.DataStore.TrackScrobble(r); err != nil { fmt.Printf("%v\n", err) } else { response.Response = r |