diff --git a/chatchart/chatchart.py b/chatchart/chatchart.py index d337892..0092dc4 100644 --- a/chatchart/chatchart.py +++ b/chatchart/chatchart.py @@ -19,43 +19,53 @@ class ChatChart: def __init__(self, bot): self.bot = bot - - def create_chart(self, top, others): + def create_chart(self, top, others, channel): plt.clf() sizes = [x[1] for x in top] labels = ["{} {:g}%".format(x[0], x[1]) for x in top] - if len(top) >= 10: + if len(top) >= 20: sizes = sizes + [others] labels = labels + ["Others {:g}%".format(others)] - - title = plt.title('User activity in the last 5000 messages') + if len(channel.name) >= 19: + channel_name = '{}...'.format(channel.name[:19]) + else: + channel_name = channel.name + title = plt.title("Stats in #{}".format(channel_name), color="white") title.set_va("top") - title.set_ha("left") + title.set_ha("center") plt.gca().axis("equal") - colors = ['r', 'darkorange', 'gold', 'y', 'olivedrab', 'green', 'darkcyan', 'mediumblue', 'darkblue', 'blueviolet', 'indigo'] + colors = ['r', 'darkorange', 'gold', 'y', 'olivedrab', 'green', 'darkcyan', 'mediumblue', 'darkblue', 'blueviolet', 'indigo', 'orchid', 'mediumvioletred', 'crimson', 'chocolate', 'yellow', 'limegreen','forestgreen','dodgerblue','slateblue','gray'] pie = plt.pie(sizes, colors=colors, startangle=0) plt.legend(pie[0], labels, bbox_to_anchor=(0.7, 0.5), loc="center", fontsize=10, - bbox_transform=plt.gcf().transFigure) + bbox_transform=plt.gcf().transFigure, facecolor='#ffffff') plt.subplots_adjust(left=0.0, bottom=0.1, right=0.45) image_object = BytesIO() - plt.savefig(image_object, format='PNG') + plt.savefig(image_object, format='PNG', facecolor='#36393E') image_object.seek(0) return image_object @commands.command(pass_context=True) @commands.cooldown(1, 10, commands.BucketType.channel) - async def chatchart(self, ctx): + async def chatchart(self, ctx, channel: discord.Channel=None): """ - Generates a pie chart, representing the last 5000 messages in this channel. + Generates a pie chart, representing the last 5000 messages in the specified channel. """ - channel = ctx.message.channel e = discord.Embed(description="Loading...", colour=0x00ccff) e.set_thumbnail(url="https://i.imgur.com/vSp4xRk.gif") em = await self.bot.say(embed=e) - + + if channel is None: + channel = ctx.message.channel history = [] - async for msg in self.bot.logs_from(channel, 5000): - history.append(msg) + if not channel.permissions_for(ctx.message.author).read_messages == True: + await self.bot.delete_message(em) + return await self.bot.say("You're not allowed to access that channel.") + try: + async for msg in self.bot.logs_from(channel, 5000): + history.append(msg) + except discord.errors.Forbidden: + await self.bot.delete_message(em) + return await self.bot.say("No permissions to read that channel.") msg_data = {'total count': 0, 'users': {}} for msg in history: @@ -73,14 +83,14 @@ class ChatChart: pd = float(msg_data['users'][usr]['msgcount']) / float(msg_data['total count']) msg_data['users'][usr]['percent'] = round(pd * 100, 1) - top_ten = heapq.nlargest(10, [(x, msg_data['users'][x][y]) + top_ten = heapq.nlargest(20, [(x, msg_data['users'][x][y]) for x in msg_data['users'] for y in msg_data['users'][x] if y == 'percent'], key=lambda x: x[1]) others = 100 - sum(x[1] for x in top_ten) - img = self.create_chart(top_ten, others) + img = self.create_chart(top_ten, others, channel) await self.bot.delete_message(em) - await self.bot.send_file(channel, img, filename="chart.png") + await self.bot.send_file(ctx.message.channel, img, filename="chart.png") def check_folders():