diff options
| -rw-r--r-- | data/rbot/plugins/lastfm.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/data/rbot/plugins/lastfm.rb b/data/rbot/plugins/lastfm.rb index 7fc256a5..030c5e07 100644 --- a/data/rbot/plugins/lastfm.rb +++ b/data/rbot/plugins/lastfm.rb @@ -399,18 +399,14 @@ plugin = LastFmPlugin.new plugin.map 'lastfm [:num] event[s] in *location', :action => :find_events, :requirements => { :num => /\d+/ }, :thread => true plugin.map 'lastfm [:num] event[s] by *who', :action => :find_events, :requirements => { :num => /\d+/ }, :thread => true plugin.map 'lastfm [:num] event[s] [for] *who', :action => :find_events, :requirements => { :num => /\d+/ }, :thread => true -plugin.map 'lastfm now :who', :action => :now_playing, :thread => true -plugin.map 'lastfm now', :action => :now_playing, :thread => true +plugin.map 'lastfm [now] [:who]', :action => :now_playing, :thread => true plugin.map 'np :who', :action => :now_playing, :thread => true plugin.map 'lastfm artist *artist', :action => :find_artist, :thread => true plugin.map 'lastfm album *album [by *artist]', :action => :find_album plugin.map 'lastfm track *track', :action => :find_track, :thread => true -plugin.map 'lastfm set nick :who', :action => :set_user, :thread => true -plugin.map 'lastfm set user :who', :action => :set_user, :thread => true -plugin.map 'lastfm set username :who', :action => :set_user, :thread => true +plugin.map 'lastfm set user[name] :who', :action => :set_user, :thread => true plugin.map 'lastfm set verb *present, *past', :action => :set_verb, :thread => true -plugin.map 'lastfm who :who', :action => :get_user, :thread => true -plugin.map 'lastfm who', :action => :get_user, :thread => true +plugin.map 'lastfm who [:who]', :action => :get_user, :thread => true plugin.map 'lastfm compare to :user2', :action => :tasteometer, :thread => true plugin.map 'lastfm compare [:user1] [to] :user2', :action => :tasteometer, :thread => true plugin.map 'np', :action => :now_playing, :thread => true @@ -418,4 +414,3 @@ plugin.map "lastfm [user] :action [:user]", :thread => true, :requirements => { :action => /^(?:events|friends|neighbou?rs|playlists|recent?tracks|top(?:album|artist|tag)s?|weekly(?:album|artist|track)chart|weeklychartlist)$/ } -plugin.map "lastfm [:who]", :action => :now_playing, :thread => true |