finished function

4 files changed, 38 insertions, 25 deletions

diff --git a/Pipfile b/Pipfile
index e7e01a31..1a2d464e 100644
--- a/Pipfile
+++ b/Pipfile
@@ -15,6 +15,7 @@ PyYAML = "~=5.3.1"
 "discord.py" = {extras = ["voice"], version = "~=1.5.1"}
 async-rediscache = {extras = ["fakeredis"], version = "~=0.1.4"}
 emojis = "~=0.6.0"
+requests = "~=2.25.1"
 
 [dev-packages]
 flake8 = "~=3.8"
diff --git a/Pipfile.lock b/Pipfile.lock
index ec801979..34cd08cf 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "b4aaaacbab13179145e36d7b86c736db512286f6cce8e513cc30c48d68fe3810"
+            "sha256": "53409f1c6726e95cf348740b1dc55124b77a1f327aea273dce041b5056270b2e"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -238,11 +238,11 @@
         },
         "idna": {
             "hashes": [
-                "sha256:5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16",
-                "sha256:c5b02147e01ea9920e6b0a3f1f7bb833612d507592c837a6c49552768f4054e1"
+                "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6",
+                "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0"
             ],
-            "markers": "python_version >= '3.4'",
-            "version": "==3.1"
+            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
+            "version": "==2.10"
         },
         "multidict": {
             "hashes": [
@@ -412,6 +412,14 @@
             "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'",
             "version": "==3.5.3"
         },
+        "requests": {
+            "hashes": [
+                "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804",
+                "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e"
+            ],
+            "index": "pypi",
+            "version": "==2.25.1"
+        },
         "sentry-sdk": {
             "hashes": [
                 "sha256:4ae8d1ced6c67f1c8ea51d82a16721c166c489b76876c9f2c202b8a50334b237",
@@ -585,11 +593,11 @@
         },
         "identify": {
             "hashes": [
-                "sha256:de7129142a5c86d75a52b96f394d94d96d497881d2aaf8eafe320cdbe8ac4bcc",
-                "sha256:e0dae57c0397629ce13c289f6ddde0204edf518f557bfdb1e56474aa143e77c3"
+                "sha256:9cdd81e5d2b6e76c3006d5226316dd947bd6324fbeebb881bec489202fa09d3a",
+                "sha256:b99aa309329c4fea679463eb35d169f3fbe13e66e9dd6162ad1856cbeb03dcbd"
             ],
-            "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
-            "version": "==1.5.14"
+            "markers": "python_full_version >= '3.6.1'",
+            "version": "==2.0.0"
         },
         "mccabe": {
             "hashes": [
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))