mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-11-06 11:18:54 -05:00
* Temporarily set d.py to use latest git revision
* Remove `bot` param to Client.start
* Switch to aware datetimes
A lot of this is removing `.replace(...)` which while not technically
needed, simplifies the code base. There's only a few changes that are
actually necessary here.
* Update to work with new Asset design
* [threads] Update core ModLog API to support threads
- Added proper support for passing `Thread` to `channel`
when creating/editing case
- Added `parent_channel_id` attribute to Modlog API's Case
- Added `parent_channel` property that tries to get parent channel
- Updated case's content to show both thread and parent information
* [threads] Disallow usage of threads in some of the commands
- announceset channel
- filter channel clear
- filter channel add
- filter channel remove
- GlobalUniqueObjectFinder converter
- permissions addglobalrule
- permissions removeglobalrule
- permissions removeserverrule
- Permissions cog does not perform any validation for IDs
when setting through YAML so that has not been touched
- streamalert twitch/youtube/picarto
- embedset channel
- set ownernotifications adddestination
* [threads] Handle threads in Red's permissions system (Requires)
- Made permissions system apply rules of (only) parent in threads
* [threads] Update embed_requested to support threads
- Threads don't have their own embed settings and inherit from parent
* [threads] Update Red.message_eligible_as_command to support threads
* [threads] Properly handle invocation of [p](un)mutechannel in threads
Usage of a (un)mutechannel will mute/unmute user in the parent channel
if it's invoked in a thread.
* [threads] Update Filter cog to properly handle threads
- `[p]filter channel list` in a threads sends list for parent channel
- Checking for filter hits for a message in a thread checks its parent
channel's word list. There's no separate word list for threads.
* [threads] Support threads in Audio cog
- Handle threads being notify channels
- Update type hint for `is_query_allowed()`
* [threads] Update type hints and documentation to reflect thread support
- Documented that `{channel}` in CCs might be a thread
- Allowed (documented) usage of threads with `Config.channel()`
- Separate thread scope is still in the picture though
if it were to be done, it's going to be in separate in PR
- GuildContext.channel might be Thread
* Use less costy channel check in customcom's on_message_without_command
This isn't needed for d.py 2.0 but whatever...
* Update for in-place edits
* Embed's bool changed behavior, I'm hoping it doesn't affect us
* Address User.permissions_in() removal
* Swap VerificationLevel.extreme with VerificationLevel.highest
* Change to keyword-only parameters
* Change of `Guild.vanity_invite()` return type
* avatar -> display_avatar
* Fix metaclass shenanigans with Converter
* Update Red.add_cog() to be inline with `dpy_commands.Bot.add_cog()`
This means adding `override` keyword-only parameter and causing
small breakage by swapping RuntimeError with discord.ClientException.
* Address all DEP-WARNs
* Remove Context.clean_prefix and use upstream implementation instead
* Remove commands.Literal and use upstream implementation instead
Honestly, this was a rather bad implementation anyway...
Breaking but actually not really - it was provisional.
* Update Command.callback's setter
Support for functools.partial is now built into d.py
* Add new perms in HUMANIZED_PERM mapping (some from d.py 1.7 it seems)
BTW, that should really be in core instead of what we have now...
* Remove the part of do_conversion that has not worked for a long while
* Stop wrapping BadArgument in ConversionFailure
This is breaking but it's best to resolve it like this.
The functionality of ConversionFailure can be replicated with
Context.current_parameter and Context.current_argument.
* Add custom errors for int and float converters
* Remove Command.__call__ as it's now implemented in d.py
* Get rid of _dpy_reimplements
These were reimplemented for the purpose of typing
so it is no longer needed now that d.py is type hinted.
* Add return to Red.remove_cog
* Ensure we don't delete messages that differ only by used sticker
* discord.InvalidArgument->ValueError
* Move from raw <t:...> syntax to discord.utils.format_dt()
* Address AsyncIter removal
* Swap to pos-only for params that are pos-only in upstream
* Update for changes to Command.params
* [threads] Support threads in ignore checks and allow ignoring them
- Updated `[p](un)ignore channel` to accept threads
- Updated `[p]ignore list` to list ignored threads
- Updated logic in `Red.ignored_channel_or_guild()`
Ignores for guild channels now work as follows (only changes for threads):
- if channel is not a thread:
- check if user has manage channels perm in channel
and allow command usage if so
- check if channel is ignored and disallow command usage if so
- allow command usage if none of the conditions above happened
- if channel is a thread:
- check if user has manage channels perm in parent channel
and allow command usage if so
- check if parent channel is ignored and disallow command usage
if so
- check if user has manage thread perm in parent channel
and allow command usage if so
- check if thread is ignored and disallow command usage if so
- allow command usage if none of the conditions above happened
* [partial] Raise TypeError when channel is of PartialMessageable type
- Red.embed_requested
- Red.ignored_channel_or_guild
* [partial] Discard command messages when channel is PartialMessageable
* [threads] Add utilities for checking appropriate perms in both channels & threads
* [threads] Update code to use can_react_in() and @bot_can_react()
* [threads] Update code to use can_send_messages_in
* [threads] Add send_messages_in_threads perm to mute role and overrides
* [threads] Update code to use (bot/user)_can_manage_channel
* [threads] Update [p]diagnoseissues to work with threads
* Type hint fix
* [threads] Patch vendored discord.ext.menus to check proper perms in threads
I guess we've reached time when we have to patch the lib we vendor...
* Make docs generation work with non-final d.py releases
* Update discord.utils.oauth_url() usage
* Swap usage of discord.Embed.Empty/discord.embeds.EmptyEmbed to None
* Update usage of Guild.member_count to work with `None`
* Switch from Guild.vanity_invite() to Guild.vanity_url
* Update startup process to work with d.py's new asynchronous startup
* Use setup_hook() for pre-connect actions
* Update core's add_cog, remove_cog, and load_extension methods
* Update all setup functions to async and add awaits to bot.add_cog calls
* Modernize cogs by using async cog_load and cog_unload
* Address StoreChannel removal
* [partial] Disallow passing PartialMessageable to Case.channel
* [partial] Update cogs and utils to work better with PartialMessageable
- Ignore messages with PartialMessageable channel in CustomCommands cog
- In Filter cog, don't pass channel to modlog.create_case()
if it's PartialMessageable
- In Trivia cog, only compare channel IDs
- Make `.utils.menus.menu()` work for messages
with PartialMessageable channel
- Make checks in `.utils.tunnel.Tunnel.communicate()` more rigid
* Add few missing DEP-WARNs
254 lines
9.4 KiB
Python
254 lines
9.4 KiB
Python
from random import shuffle
|
|
from typing import Optional
|
|
|
|
import aiohttp
|
|
|
|
from redbot.core.i18n import Translator, cog_i18n
|
|
from redbot.core import checks, Config, commands
|
|
from redbot.core.commands import UserInputOptional
|
|
|
|
_ = Translator("Image", __file__)
|
|
|
|
|
|
@cog_i18n(_)
|
|
class Image(commands.Cog):
|
|
"""Image related commands."""
|
|
|
|
default_global = {"imgur_client_id": None}
|
|
|
|
def __init__(self, bot):
|
|
super().__init__()
|
|
self.bot = bot
|
|
self.config = Config.get_conf(self, identifier=2652104208, force_registration=True)
|
|
self.config.register_global(**self.default_global)
|
|
self.session = aiohttp.ClientSession()
|
|
self.imgur_base_url = "https://api.imgur.com/3/"
|
|
|
|
async def cog_load(self) -> None:
|
|
"""Move the API keys from cog stored config to core bot config if they exist."""
|
|
imgur_token = await self.config.imgur_client_id()
|
|
if imgur_token is not None:
|
|
if not await self.bot.get_shared_api_tokens("imgur"):
|
|
await self.bot.set_shared_api_tokens("imgur", client_id=imgur_token)
|
|
await self.config.imgur_client_id.clear()
|
|
|
|
async def cog_unload(self):
|
|
await self.session.close()
|
|
|
|
async def red_delete_data_for_user(self, **kwargs):
|
|
"""Nothing to delete"""
|
|
return
|
|
|
|
@commands.group(name="imgur")
|
|
async def _imgur(self, ctx):
|
|
"""Retrieve pictures from Imgur.
|
|
|
|
Make sure to set the Client ID using `[p]imgurcreds`.
|
|
"""
|
|
pass
|
|
|
|
@_imgur.command(name="search", usage="[count] <terms...>")
|
|
async def imgur_search(self, ctx, count: UserInputOptional[int] = 1, *, term: str):
|
|
"""Search Imgur for the specified term.
|
|
|
|
- `[count]`: How many images should be returned (maximum 5). Defaults to 1.
|
|
- `<terms...>`: The terms used to search Imgur.
|
|
"""
|
|
if count < 1 or count > 5:
|
|
await ctx.send(_("Image count has to be between 1 and 5."))
|
|
return
|
|
url = self.imgur_base_url + "gallery/search/time/all/0"
|
|
params = {"q": term}
|
|
imgur_client_id = (await ctx.bot.get_shared_api_tokens("imgur")).get("client_id")
|
|
if not imgur_client_id:
|
|
await ctx.send(
|
|
_(
|
|
"A Client ID has not been set! Please set one with `{prefix}imgurcreds`."
|
|
).format(prefix=ctx.clean_prefix)
|
|
)
|
|
return
|
|
headers = {"Authorization": "Client-ID {}".format(imgur_client_id)}
|
|
async with self.session.get(url, headers=headers, params=params) as search_get:
|
|
data = await search_get.json()
|
|
|
|
if data["success"]:
|
|
results = data["data"]
|
|
if not results:
|
|
await ctx.send(_("Your search returned no results."))
|
|
return
|
|
shuffle(results)
|
|
msg = _("Search results...\n")
|
|
for r in results[:count]:
|
|
msg += r["gifv"] if "gifv" in r else r["link"]
|
|
msg += "\n"
|
|
await ctx.send(msg)
|
|
else:
|
|
await ctx.send(
|
|
_("Something went wrong. Error code is {code}.").format(code=data["status"])
|
|
)
|
|
|
|
@_imgur.command(name="subreddit")
|
|
async def imgur_subreddit(
|
|
self,
|
|
ctx,
|
|
subreddit: str,
|
|
count: Optional[int] = 1,
|
|
sort_type: str = "top",
|
|
window: str = "day",
|
|
):
|
|
"""Get images from a subreddit.
|
|
|
|
- `<subreddit>`: The subreddit to get images from.
|
|
- `[count]`: The number of images to return (maximum 5). Defaults to 1.
|
|
- `[sort_type]`: New, or top results. Defaults to top.
|
|
- `[window]`: The timeframe, can be the past day, week, month, year or all. Defaults to day.
|
|
"""
|
|
if count < 1 or count > 5:
|
|
await ctx.send(_("Image count has to be between 1 and 5."))
|
|
return
|
|
sort_type = sort_type.lower()
|
|
window = window.lower()
|
|
|
|
if sort_type == "new":
|
|
sort = "time"
|
|
elif sort_type == "top":
|
|
sort = "top"
|
|
else:
|
|
await ctx.send(_("Only 'new' and 'top' are a valid sort type."))
|
|
return
|
|
|
|
if window not in ("day", "week", "month", "year", "all"):
|
|
await ctx.send_help()
|
|
return
|
|
|
|
imgur_client_id = (await ctx.bot.get_shared_api_tokens("imgur")).get("client_id")
|
|
if not imgur_client_id:
|
|
await ctx.send(
|
|
_(
|
|
"A Client ID has not been set! Please set one with `{prefix}imgurcreds`."
|
|
).format(prefix=ctx.clean_prefix)
|
|
)
|
|
return
|
|
|
|
links = []
|
|
headers = {"Authorization": "Client-ID {}".format(imgur_client_id)}
|
|
url = self.imgur_base_url + "gallery/r/{}/{}/{}/0".format(subreddit, sort, window)
|
|
|
|
async with self.session.get(url, headers=headers) as sub_get:
|
|
data = await sub_get.json()
|
|
|
|
if data["success"]:
|
|
items = data["data"]
|
|
if items:
|
|
for item in items[:count]:
|
|
link = item["gifv"] if "gifv" in item else item["link"]
|
|
links.append("{}\n{}".format(item["title"], link))
|
|
|
|
if links:
|
|
await ctx.send("\n".join(links))
|
|
else:
|
|
await ctx.send(_("No results found."))
|
|
else:
|
|
await ctx.send(
|
|
_("Something went wrong. Error code is {code}.").format(code=data["status"])
|
|
)
|
|
|
|
@checks.is_owner()
|
|
@commands.command()
|
|
async def imgurcreds(self, ctx):
|
|
"""Explain how to set imgur API tokens."""
|
|
|
|
message = _(
|
|
"To get an Imgur Client ID:\n"
|
|
"1. Login to an Imgur account.\n"
|
|
"2. Visit this page https://api.imgur.com/oauth2/addclient.\n"
|
|
"3. Enter a name for your application.\n"
|
|
"4. Select *Anonymous usage without user authorization* for the auth type.\n"
|
|
"5. Set the authorization callback URL to `https://localhost`.\n"
|
|
"6. Leave the app website blank.\n"
|
|
"7. Enter a valid email address and a description.\n"
|
|
"8. Check the captcha box and click next.\n"
|
|
"9. Your Client ID will be on the next page.\n"
|
|
"10. Run the command `{prefix}set api imgur client_id <your_client_id_here>`.\n"
|
|
).format(prefix=ctx.clean_prefix)
|
|
|
|
await ctx.maybe_send_embed(message)
|
|
|
|
@commands.guild_only()
|
|
@commands.command(usage="<keywords...>")
|
|
async def gif(self, ctx, *, keywords):
|
|
"""Retrieve the first search result from Giphy.
|
|
|
|
- `<keywords...>`: The keywords used to search Giphy.
|
|
"""
|
|
giphy_api_key = (await ctx.bot.get_shared_api_tokens("GIPHY")).get("api_key")
|
|
if not giphy_api_key:
|
|
await ctx.send(
|
|
_("An API key has not been set! Please set one with `{prefix}giphycreds`.").format(
|
|
prefix=ctx.clean_prefix
|
|
)
|
|
)
|
|
return
|
|
|
|
url = "http://api.giphy.com/v1/gifs/search"
|
|
async with self.session.get(url, params={"api_key": giphy_api_key, "q": keywords}) as r:
|
|
result = await r.json()
|
|
if r.status == 200:
|
|
if result["data"]:
|
|
await ctx.send(result["data"][0]["url"])
|
|
else:
|
|
await ctx.send(_("No results found."))
|
|
else:
|
|
await ctx.send(_("Error contacting the Giphy API."))
|
|
|
|
@commands.guild_only()
|
|
@commands.command(usage="<keywords...>")
|
|
async def gifr(self, ctx, *, keywords):
|
|
"""Retrieve a random GIF from a Giphy search.
|
|
|
|
- `<keywords...>`: The keywords used to generate a random GIF.
|
|
"""
|
|
giphy_api_key = (await ctx.bot.get_shared_api_tokens("GIPHY")).get("api_key")
|
|
if not giphy_api_key:
|
|
await ctx.send(
|
|
_("An API key has not been set! Please set one with `{prefix}giphycreds`.").format(
|
|
prefix=ctx.clean_prefix
|
|
)
|
|
)
|
|
return
|
|
|
|
url = "http://api.giphy.com/v1/gifs/random"
|
|
async with self.session.get(url, params={"api_key": giphy_api_key, "tag": keywords}) as r:
|
|
result = await r.json()
|
|
if r.status == 200:
|
|
if result["data"]:
|
|
await ctx.send(result["data"]["url"])
|
|
else:
|
|
await ctx.send(_("No results found."))
|
|
else:
|
|
await ctx.send(_("Error contacting the API."))
|
|
|
|
@checks.is_owner()
|
|
@commands.command()
|
|
async def giphycreds(self, ctx):
|
|
"""Explains how to set GIPHY API tokens."""
|
|
|
|
message = _(
|
|
"To get a GIPHY API Key:\n"
|
|
"1. Login to (or create) a GIPHY account.\n"
|
|
"2. Visit this page: https://developers.giphy.com/dashboard.\n"
|
|
"3. Press *Create an App*.\n"
|
|
"4. Click *Select API*, then *Next Step*.\n"
|
|
"5. Add an app name, for example *Red*.\n"
|
|
"6. Add an app description, for example *Used for Red's image cog*.\n"
|
|
"7. Click *Create App*. You'll need to agree to the GIPHY API Terms.\n"
|
|
"8. Copy the API Key.\n"
|
|
"9. In Discord, run the command {command}.\n"
|
|
).format(
|
|
command="`{prefix}set api GIPHY api_key {placeholder}`".format(
|
|
prefix=ctx.clean_prefix, placeholder=_("<your_api_key_here>")
|
|
)
|
|
)
|
|
|
|
await ctx.maybe_send_embed(message)
|