From 982010f804a9a6fecce39516b38d0dbd7893d1b8 Mon Sep 17 00:00:00 2001 From: bobloy Date: Wed, 29 Aug 2018 09:41:08 -0400 Subject: [PATCH 1/4] nudepy bug, waiting for merge --- nudity/info..json | 4 +- nudity/nudity.py | 97 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 90 insertions(+), 11 deletions(-) diff --git a/nudity/info..json b/nudity/info..json index 4384930..e3d64e4 100644 --- a/nudity/info..json +++ b/nudity/info..json @@ -10,7 +10,9 @@ "description": "Keep track of when users were last seen online", "hidden": true, "install_msg": "Thank you for installing LastSeen. Get started with `[p]help LastSeen`", - "requirements": ["nudepy"], + "requirements": [ + "nudepy" + ], "short": "Last seen tracker", "tags": [ "bobloy", diff --git a/nudity/nudity.py b/nudity/nudity.py index be30ee4..d7c4fe8 100644 --- a/nudity/nudity.py +++ b/nudity/nudity.py @@ -1,8 +1,8 @@ -from datetime import datetime +from io import BytesIO import discord -import nude -from nude import Nude +from PIL import Image +from nude import is_nude from redbot.core import Config from redbot.core import commands from redbot.core.bot import Red @@ -13,16 +13,13 @@ class Nudity: V3 Cog Template """ - online_status = discord.Status.online - - offline_status = discord.Status.offline - def __init__(self, bot: Red): self.bot = bot self.config = Config.get_conf(self, identifier=9811198108111121, force_registration=True) default_guild = { - "enabled": False + "enabled": False, + "channel_id": None } self.config.register_guild(**default_guild) @@ -34,12 +31,92 @@ class Nudity: await self.config.guild(ctx.guild).enabled.set(not is_on) await ctx.send("Nude checking is now set to {}".format(not is_on)) + @commands.command() + async def nsfwchannel(self, ctx: commands.Context, channel: discord.TextChannel = None): + if channel is None: + await self.config.guild(ctx.guild).channel_id.set(None) + await ctx.send("NSFW Channel cleared") + else: + if not channel.is_nsfw(): + await ctx.send("This channel isn't NSFW!") + return + else: + await self.config.guild(ctx.guild).channel_id.set(channel.id) + await ctx.send("NSFW channel has been set to {}".format(channel.mention)) + + async def get_nsfw_channel(self, guild: discord.Guild): + channel_id = self.config.guild(guild).channel_id() + + if channel_id is None: + return None + else: + return await guild.get_channel(channel_id=channel_id) + + async def nsfw(self, message: discord.Message, image: BytesIO): + content = message.content + guild: discord.Guild = message.guild + if not content: + content = "*`None`*" + try: + await message.delete() + except discord.Forbidden: + await message.channel.send("NSFW Image detected!") + return + + embed = discord.Embed(title="NSFW Image Detected") + embed.add_field(name="Original Message", value=content) + + await message.channel.send(embed=embed) + + nsfw_channel = await self.get_nsfw_channel(guild) + + if nsfw_channel is None: + return + else: + await nsfw_channel.send("NSFW Image from {}".format(message.channel.mention), file=image) + async def on_message(self, message: discord.Message): - is_on = await self.config.guild(message.guild).enabled() + if not message.attachments: + return + + if message.guild is None: + return + + try: + is_on = await self.config.guild(message.guild).enabled() + except AttributeError: + return + if not is_on: return - if not message.attachments: + channel: discord.TextChannel = message.channel + + if channel.is_nsfw(): return + attachment = message.attachments[0] + + # async with aiohttp.ClientSession() as session: + # img = await fetch_img(session, attachment.url) + + temp = BytesIO() + print("Pre attachment save") + await attachment.save(temp) + print("Pre Image open") + temp = Image.open(temp) + + print("Pre nude check") + if is_nude(temp): + print("Is nude") + await message.add_reaction("❌") + await self.nsfw(message, temp) + else: + print("Is not nude") + await message.add_reaction("✅") +# async def fetch_img(session, url): +# with aiohttp.Timeout(10): +# async with session.get(url) as response: +# assert response.status == 200 +# return await response.read() From 9a3a62f451c379aa2350d81353a5ca230b477c87 Mon Sep 17 00:00:00 2001 From: bobloy Date: Tue, 9 Oct 2018 10:08:37 -0400 Subject: [PATCH 2/4] updates --- nudity/__init__.py | 3 ++- nudity/info..json | 2 +- nudity/nudity.py | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nudity/__init__.py b/nudity/__init__.py index 7d32df6..09d9dbf 100644 --- a/nudity/__init__.py +++ b/nudity/__init__.py @@ -2,4 +2,5 @@ from .nudity import Nudity def setup(bot): - bot.add_cog(Nudity(bot)) + n = Nudity(bot) + bot.add_cog(n) diff --git a/nudity/info..json b/nudity/info..json index d5d6e2d..1d66cf7 100644 --- a/nudity/info..json +++ b/nudity/info..json @@ -17,4 +17,4 @@ "utils", "tools" ] -} \ No newline at end of file +} diff --git a/nudity/nudity.py b/nudity/nudity.py index d7c4fe8..a7290a5 100644 --- a/nudity/nudity.py +++ b/nudity/nudity.py @@ -17,14 +17,11 @@ class Nudity: self.bot = bot self.config = Config.get_conf(self, identifier=9811198108111121, force_registration=True) - default_guild = { - "enabled": False, - "channel_id": None - } + default_guild = {"enabled": False, "channel_id": None} self.config.register_guild(**default_guild) - @commands.command(aliases=['togglenudity'], name='nudity') + @commands.command(aliases=["togglenudity"], name="nudity") async def nudity(self, ctx: commands.Context): """Toggle nude-checking on or off""" is_on = await self.config.guild(ctx.guild).enabled() @@ -73,7 +70,9 @@ class Nudity: if nsfw_channel is None: return else: - await nsfw_channel.send("NSFW Image from {}".format(message.channel.mention), file=image) + await nsfw_channel.send( + "NSFW Image from {}".format(message.channel.mention), file=image + ) async def on_message(self, message: discord.Message): if not message.attachments: @@ -115,6 +114,7 @@ class Nudity: print("Is not nude") await message.add_reaction("✅") + # async def fetch_img(session, url): # with aiohttp.Timeout(10): # async with session.get(url) as response: From 361265b9832f757e6a236f368d320e295990d393 Mon Sep 17 00:00:00 2001 From: bobloy Date: Wed, 12 Aug 2020 14:57:36 -0400 Subject: [PATCH 3/4] Functioning nudity detection --- nudity/info..json | 22 ++++++++----- nudity/nudity.py | 83 ++++++++++++++++++++++++++++++----------------- 2 files changed, 68 insertions(+), 37 deletions(-) diff --git a/nudity/info..json b/nudity/info..json index 1d66cf7..34c4804 100644 --- a/nudity/info..json +++ b/nudity/info..json @@ -2,19 +2,25 @@ "author": [ "Bobloy" ], - "bot_version": [ + "min_bot_version": [ 3, - 0, - 0 + 3, + 11 ], - "description": "Keep track of when users were last seen online", - "hidden": true, + "description": "Monitor images for NSFW content and moves them to a nsfw channel if possible", + "hidden": false, "install_msg": "Thank you for installing Nudity. Get started with `[p]load nudity`, then `[p]help Nudity`", - "requirements": ["nudepy"], - "short": "Last seen tracker", + "requirements": [ + "nudenet", + "tensorflow>=1.14,<2.0", + "keras>=2.4" + ], + "short": "NSFW image tracker and mover", "tags": [ "bobloy", "utils", - "tools" + "tools", + "nude", + "nsfw" ] } diff --git a/nudity/nudity.py b/nudity/nudity.py index a7290a5..6eb4221 100644 --- a/nudity/nudity.py +++ b/nudity/nudity.py @@ -1,19 +1,19 @@ -from io import BytesIO +import pathlib import discord -from PIL import Image -from nude import is_nude -from redbot.core import Config -from redbot.core import commands +from nudenet import NudeClassifier +from redbot.core import Config, commands from redbot.core.bot import Red +from redbot.core.data_manager import cog_data_path -class Nudity: +class Nudity(commands.Cog): """ V3 Cog Template """ def __init__(self, bot: Red): + super().__init__() self.bot = bot self.config = Config.get_conf(self, identifier=9811198108111121, force_registration=True) @@ -21,6 +21,17 @@ class Nudity: self.config.register_guild(**default_guild) + # self.detector = NudeDetector() + self.classifier = NudeClassifier() + + self.data_path: pathlib.Path = cog_data_path(self) + + self.current_processes = 0 + + async def red_delete_data_for_user(self, **kwargs): + """Nothing to delete""" + return + @commands.command(aliases=["togglenudity"], name="nudity") async def nudity(self, ctx: commands.Context): """Toggle nude-checking on or off""" @@ -42,14 +53,14 @@ class Nudity: await ctx.send("NSFW channel has been set to {}".format(channel.mention)) async def get_nsfw_channel(self, guild: discord.Guild): - channel_id = self.config.guild(guild).channel_id() + channel_id = await self.config.guild(guild).channel_id() if channel_id is None: return None else: - return await guild.get_channel(channel_id=channel_id) + return guild.get_channel(channel_id=channel_id) - async def nsfw(self, message: discord.Message, image: BytesIO): + async def nsfw(self, message: discord.Message, images: dict): content = message.content guild: discord.Guild = message.guild if not content: @@ -62,7 +73,7 @@ class Nudity: embed = discord.Embed(title="NSFW Image Detected") embed.add_field(name="Original Message", value=content) - + embed.set_author(name=message.author.name, icon_url=message.author.avatar_url) await message.channel.send(embed=embed) nsfw_channel = await self.get_nsfw_channel(guild) @@ -70,15 +81,19 @@ class Nudity: if nsfw_channel is None: return else: - await nsfw_channel.send( - "NSFW Image from {}".format(message.channel.mention), file=image - ) - + for image, r in images.items(): + if r["unsafe"] > 0.7: + await nsfw_channel.send( + "NSFW Image from {}".format(message.channel.mention), + file=discord.File(image,), + ) + + @commands.Cog.listener() async def on_message(self, message: discord.Message): - if not message.attachments: - return + is_private = isinstance(message.channel, discord.abc.PrivateChannel) - if message.guild is None: + if not message.attachments or is_private or message.author.bot: + # print("did not qualify") return try: @@ -87,31 +102,41 @@ class Nudity: return if not is_on: + print("Not on") return channel: discord.TextChannel = message.channel if channel.is_nsfw(): + print("nsfw channel is okay") return - attachment = message.attachments[0] + check_list = [] + for attachment in message.attachments: + # async with aiohttp.ClientSession() as session: + # img = await fetch_img(session, attachment.url) + + ext = attachment.filename - # async with aiohttp.ClientSession() as session: - # img = await fetch_img(session, attachment.url) + temp_name = self.data_path / f"nudecheck{self.current_processes}_{ext}" - temp = BytesIO() - print("Pre attachment save") - await attachment.save(temp) - print("Pre Image open") - temp = Image.open(temp) + self.current_processes += 1 + + print("Pre attachment save") + await attachment.save(temp_name) + check_list.append(temp_name) print("Pre nude check") - if is_nude(temp): - print("Is nude") + # nude_results = self.detector.detect(temp_name) + nude_results = self.classifier.classify([str(n) for n in check_list]) + # print(nude_results) + + if True in [r["unsafe"] > 0.7 for r in nude_results.values()]: + # print("Is nude") await message.add_reaction("❌") - await self.nsfw(message, temp) + await self.nsfw(message, nude_results) else: - print("Is not nude") + # print("Is not nude") await message.add_reaction("✅") From a7878359154b51642d13fdfc67ea56d433ff04a5 Mon Sep 17 00:00:00 2001 From: bobloy Date: Wed, 12 Aug 2020 15:00:03 -0400 Subject: [PATCH 4/4] Add Nudity to README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 980e762..c37f84f 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Cog Function | infochannel | **Beta** |
Create a channel to display server infoJust released, please report bugs
| | lovecalculator | **Alpha** |
Calculate the love between two users[Snap-Ons] Just updated to V3
| | lseen | **Alpha** |
Track when a member was last onlineAlpha release, please report bugs
| -| nudity | **Incomplete** |
Checks for NSFW images posted in non-NSFW channelsLibrary this is based on has a bug, waiting for author to merge my PR
| +| nudity | **Alpha** |
Checks for NSFW images posted in non-NSFW channelsSwitched libraries, now functional
| | planttycoon | **Alpha** |
Grow your own plants![Snap-Ons] Updated to V3, likely to contain bugs
| | qrinvite | **Alpha** |
Create a QR code invite for the serverAlpha release, please report any bugs
| | reactrestrict | **Alpha** |
Removes reactions by role per channelA bit clunky, but functional
|