Pyva: Disable google commands. Add unshorten alias for expand. Closes #16 and #53

diff --git a/pyva/pyva/src/main/python/internets/cmd_user.py b/pyva/pyva/src/main/python/internets/cmd_user.py
index 8825633e189c60a70a008f1f2c23034c8f1a68af..2b687a5fcf3653149edbf5eb4b70f8af03a82cf4 100644 (file)
--- a/pyva/pyva/src/main/python/internets/cmd_user.py
+++ b/pyva/pyva/src/main/python/internets/cmd_user.py
@@ -888,11 +888,11 @@ class UserCommandManager(CommandManager):
                        'u': 'urbandictionary',
                        'urbandictionary': (command_urbandictionary, ARG_YES, 'Search for a definition on Urban Dictionary', [], 'word'),
                        
-                       'g': 'google',
-                       'google': (command_google_search, ARG_YES, 'Search for something on Google', [], 'google_search'),
+                       # 'g': 'google',
+                       # 'google': (command_google_search, ARG_YES, 'Search for something on Google', [], 'google_search'),
                        
-                       'gi': 'google_image',
-                       'google_image': (command_google_image_search, ARG_YES, 'Search for images via Google Image', [], 'google_image_search'),
+                       # 'gi': 'google_image',
+                       # 'google_image': (command_google_image_search, ARG_YES, 'Search for images via Google Image', [], 'google_image_search'),
 
                        't': 'translate',
                        'translate': (command_bing_translate, ARG_YES, 'Translate something from a language to another', [], 'from to text'),
@@ -917,6 +917,7 @@ class UserCommandManager(CommandManager):
                        
                        'shorten': (command_url_shorten, ARG_YES, 'Shortens a URL using http://j.mp', [], 'long_url'),
                        
+                       'unshorten': 'expand',
                        'expand': (command_url_expand, ARG_YES, 'Expands a shortened URL using http://longurl.org', [], 'shortened_url'),
                        
                        'irpg': 'idlerpg',