Skip to content
Browse files

Conflicts fixed github-credentials / working-on

 - I am Bob AND I am working on Foo conflict with each other
 - Credentials should follow a stricter match
  • Loading branch information...
1 parent 64d78a6 commit 47c4136882481e3fc4fedae4b73892c72020375d @Iristyle Iristyle committed Jan 10, 2013
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/scripts/github-credentials.coffee
View
6 src/scripts/github-credentials.coffee
@@ -19,7 +19,7 @@
module.exports = (robot) ->
- robot.respond /who do you know/i, (msg) ->
+ robot.respond /who do you know(\?)?$/i, (msg) ->
theReply = "Here is who I know:\n"
for own key, user of robot.brain.data.users
@@ -28,12 +28,12 @@ module.exports = (robot) ->
msg.send theReply
- robot.respond /i am ([a-z0-9-]+)/i, (msg) ->
+ robot.respond /i am ([a-z0-9-]+)\s*$/i, (msg) ->
githubLogin = msg.match[1]
msg.message.user.githubLogin = githubLogin
msg.send "Ok, you are " + githubLogin + " on GitHub"
- robot.respond /who am i/i, (msg) ->
+ robot.respond /who am i\s*$/i, (msg) ->
user = msg.message.user
if user.githubLogin
msg.reply "You are known as " + user.githubLogin + " on GitHub"

0 comments on commit 47c4136

Please sign in to comment.
Something went wrong with that request. Please try again.