aboutsummaryrefslogtreecommitdiffstats
path: root/bot
diff options
context:
space:
mode:
Diffstat (limited to 'bot')
-rw-r--r--bot/constants.py1
-rw-r--r--bot/exts/easter/earth_photos.py35
2 files changed, 20 insertions, 16 deletions
diff --git a/bot/constants.py b/bot/constants.py
index db34b55a..f8ea5743 100644
--- a/bot/constants.py
+++ b/bot/constants.py
@@ -271,6 +271,7 @@ class Tokens(NamedTuple):
igdb_client_id = environ.get("IGDB_CLIENT_ID")
igdb_client_secret = environ.get("IGDB_CLIENT_SECRET")
github = environ.get("GITHUB_TOKEN")
+ unsplash_key = environ.get("UNSPLASH_KEY")
class Wolfram(NamedTuple):
diff --git a/bot/exts/easter/earth_photos.py b/bot/exts/easter/earth_photos.py
index 436b39a7..478502eb 100644
--- a/bot/exts/easter/earth_photos.py
+++ b/bot/exts/easter/earth_photos.py
@@ -1,8 +1,5 @@
-import asyncio
import logging
-import random
-from unsplash.api import Api as uApi
-from unsplash.auth import Auth as uAuth
+import requests
import discord
from discord.ext import commands
@@ -11,27 +8,33 @@ from bot.constants import Tokens
log = logging.getLogger(__name__)
-UnClient_id = Tokens.UNSPLASH_API
+UnClient_id = Tokens.unsplash_key
-UnClient_secret = Tokens.UNSPLASH_SECRET
-
-redirect_uri = "urn:ietf:wg:oauth:2.0:oob"
-
-unsplash_auth = uAuth(client_id,
class EarthPhotos(commands.Cog):
"""This cog contains the command for earth photos."""
-
+
def init(self, bot: commands.Bot):
self.bot = bot
self.current_channel = None
-
+
@commands.command(aliases=["earth"])
async def earth_photos(self, ctx: commands.Context):
"""
Returns a random photo of earth, sourced from Unsplash.
"""
-
-
-
-
+ photorequest = requests.get("https://api.unsplash.com/photos/random?query=earth&client_id=" + UnClient_id)
+ photojson = photorequest.json()
+ photourls = photojson.get('urls')
+ urltosend = photourls.get('regular')
+ userjson = photojson.get('user')
+ userName = userjson.get('name')
+ embed = discord.Embed(title="Earth Photo", description="A photo of Earth from Unsplash.", color=0x66ff00)
+ embed.set_image(url=urltosend)
+ embed.set_footer(text="Image by " + userName + " on Unsplash.")
+ await ctx.send(embed=embed)
+
+
+def setup(bot: commands.Bot) -> None:
+ """Cog load"""
+ bot.add_cog(EarthPhotos(bot))