From 66f6e29e87360312f8c8b344f00af5512f236eb0 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sat, 26 Sep 2015 21:02:10 +0200
Subject: [PATCH] Avoid redirects and change error message

---
 scripts/memes.coffee | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/memes.coffee b/scripts/memes.coffee
index 68e0941..3a8e5ce 100644
--- a/scripts/memes.coffee
+++ b/scripts/memes.coffee
@@ -11,13 +11,15 @@
 #   Enrico Fasoli (fazo96)
 
 module.exports = (robot) ->
-  escape = (str) -> (str.replace /\ /g, '_').replace /-/g, '--'
+  escape = (str) -> (str.replace /-/g, '--').replace /\ /g, '-'
+
+  usage = 'non si usa così: prova a chiedermi "asjon help meme" per
+           sapere sapere come funziona il comando'
 
   robot.respond /meme (.+)/i, (res) ->
     text = res.match[1]
-    if(text.split(',').length != 3)
-      res.send 'richiesta malformata: prova a chiedermi "asjon help meme" per sapere sapere come funziona il comando'
-    else
-      meme = (escape i.trim() for i in text.split ',').join '/'
-      url  = 'http://memegen.link/' + meme + '.jpg'
-      res.send url
+    return res.send usage if text.split(',').length != 3
+    
+    meme = (escape i.trim() for i in text.split ',').join '/'
+    url  = 'http://memegen.link/' + meme + '.jpg'
+    res.send url