/img and /gif should fail less now.

Images and gifs save to system_temp directory, where they should be deleted by the OS.
upload_image now has an option for deleting the image (but this sometimes results in a race condition; needs more testing)

Author: wardellbagby

Core/Bot.py

@@ -5,6 +5,7 @@
 import random
 import sys
 import asyncio
+import tempfile
 import time
 import signal
 import traceback
@@ -13,14 +14,16 @@
 
 import hangups
 from hangups.ui.utils import get_conv_name
-import io
 from Core.Commands.Dispatcher import DispatcherSingleton
 
 from Core.Util import ConfigDict, UtilDB
 from Core import Handlers
 
+
 class HangoutsBotOpener(FancyURLopener):
     version = 'Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2049.0 Safari/537.36'
+
+
 request.urlretrieve = HangoutsBotOpener().retrieve
 
 __version__ = '1.1'
@@ -238,13 +241,16 @@ def send_message_segments(self, conversation, segments, image_id=None):
 
 
     @asyncio.coroutine
-    def upload_image(self, url):
-        filename = '{}.png'.format(random.randint(0, 9999999999))
+    def upload_image(self, url, filename=None, delete=False):
+        if not filename:
+            tempdir = tempfile.gettempdir()
+            filename = tempdir + os.sep + '{}.png'.format(random.randint(0, 9999999999))
         request.urlretrieve(url, filename)
         file = open(filename, "rb")
         image_id = yield from self._client.upload_image(file)
-        file.close()
-        os.remove(filename)
+        if delete:
+            file.close()
+            os.remove(filename)
         return image_id
 
     def list_conversations(self):

Core/Commands/DefaultCommands.py

@@ -727,7 +727,7 @@ def karma(bot, event, name=None, *args):
         bot.send_message_segments(event.conv, segments)
 
 
-@DispatcherSingleton.register_aliases(["img", "image"])
+@DispatcherSingleton.register_aliases(["img"])
 def image(bot, event, *args):
     query = ' '.join(args)
     url = 'http://ajax.googleapis.com/ajax/services/search/images?v=1.0&rsz=8&safe=active&' \
@@ -747,7 +747,6 @@ def send_image(bot, event, url):
     yield from send_image(bot, event, url)
 
 
-# TODO ASYNC ASAP
 @DispatcherSingleton.register
 def gif(bot, event, *args):
     query = ' '.join(args)

Core/Commands/Dispatcher.py

@@ -71,30 +71,45 @@ def run(self, bot, event, bot_command_char, *args, **kwds):
             log.close()
             print(traceback.format_exc())
 
-    # def register(self, func, aliases=None):
-    #     """Decorator for registering command"""
-    #     if aliases is None or len(aliases) == 0:
-    #         self.commands[func.__name__] = func
-    #     else:
-    #         for alias in aliases:
-    #             self.commands[alias] = func
-    #     return func
-
-
     def register_aliases(self, aliases=None):
+        """Registers a command under the function name & any names specified in aliases.
+        """
+
         def func_wrapper(func):
+            self.commands[func.__name__] = func
             for alias in aliases:
                 self.commands[alias] = func
             return func
+
         return func_wrapper
 
+    def register_extras(self, is_hidden=False, aliases=None):
+        """Registers a function as hidden with aliases, or any combination of that."""
+
+        def func_wrapper(func):
+            if is_hidden and aliases:
+                self.hidden_commands[func.__name__] = func
+                for alias in aliases:
+                    self.hidden_commands[alias] = func
+            elif aliases:
+                self.commands[func.__name__] = func
+                for alias in aliases:
+                    self.commands[alias] = func
+            elif is_hidden:
+                self.hidden_commands[func.__name__] = func
+            else:
+                self.commands[func.__name__] = func
+            return func
+
+        return func_wrapper
 
     def register(self, func):
         """Decorator for registering command"""
         self.commands[func.__name__] = func
         return func
 
     def register_hidden(self, func):
+        """Registers a command as hidden (This makes it only runnable by the Bot and it won't appear in the help menu)"""
         self.hidden_commands[func.__name__] = func
         return func