From: CMDR furrycat <elite@furrycat.net>
Date: Wed, 2 Nov 2016 14:25:19 +0000 (+0000)
Subject: Use say() with attachment when blinging.
X-Git-Url: http://git.furryclan.net/?a=commitdiff_plain;h=dc06fd233492fb9e9bdfdf06270256d882cdb0c8;p=furrycat%2Fcatbot.git

Use say() with attachment when blinging.
---

diff --git a/plugin/bling/bling.py b/plugin/bling/bling.py
index 75568eb..40408d2 100644
--- a/plugin/bling/bling.py
+++ b/plugin/bling/bling.py
@@ -118,12 +118,15 @@ class Bling(object):
             filename = other.name
             parsed['mentions'].append(other.mention)
           parsed['url'] = other.avatar_url
+          log.info("Using {}'s avatar.".format(other.name))
       elif re.match(r'https?://', name):
         parsed['url'] = name
+        log.info('Using avatar URL {}.'.format(name))
     elif len(message.attachments):
       parsed['url'] = message.attachments[0]['url']
+      log.info('Using attachment {}.'.format(parsed['url']))
     else:
-      log.info('Using avatar URL {}.'.format(name))
+      log.info("Using {}'s own avatar.".format(message.author.name))
       parsed['url'] = message.author.avatar_url
     return parsed
 
@@ -147,7 +150,8 @@ class Bling(object):
       yield from cat.yelp(message.channel)
       return
 
-    yield from client.send_file(message.channel, data, filename = parsed['filename'] + '.png', content = ' '.join(parsed['mentions']) if parsed['mentions'] is not None else 'purr')
+    text = ' '.join(parsed['mentions']) if parsed['mentions'] is not None else 'purr'
+    yield from bot.say(message.channel, text, attachment = bot.parse_attachment(data, parsed['filename'] + '.png'))
 
   def create_avatar(self, url, bgfile, fgfile):
     # Get Delta images.