diff options
| author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2009-02-14 23:07:40 +0100 |
|---|---|---|
| committer | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2009-02-14 23:07:46 +0100 |
| commit | 3fd5bf9fbacc4866f1aa09b416ad2be4aa5bc5fc (patch) | |
| tree | da0d23e3461bb6c3c8d4d12e57c37a3d7900ff05 | |
| parent | 9e1d8a083f3b0cca42ddcc63c61393dc7377a9f3 (diff) | |
lastfm: move now playing maps to the bottom
This ensures that 'lastfm who' triggers the correct map.
| -rw-r--r-- | data/rbot/plugins/lastfm.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/data/rbot/plugins/lastfm.rb b/data/rbot/plugins/lastfm.rb index 030c5e07..a9ef6bd9 100644 --- a/data/rbot/plugins/lastfm.rb +++ b/data/rbot/plugins/lastfm.rb @@ -399,8 +399,6 @@ 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 '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 @@ -409,8 +407,9 @@ plugin.map 'lastfm set verb *present, *past', :action => :set_verb, :thread => t 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 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 [now] [:who]', :action => :now_playing, :thread => true +plugin.map 'np [:who]', :action => :now_playing, :thread => true |