Skip to content
This repository was archived by the owner on Mar 14, 2021. It is now read-only.

Team 13 #10

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
0aa95cb
Merge pull request #1 from discord-python/master
schwartzadev Mar 23, 2018
c2505ce
add preliminary snake 'get' command
schwartzadev Mar 23, 2018
8c25449
allow user input for snake names
schwartzadev Mar 23, 2018
e3f0c70
change imports order, index format string
schwartzadev Mar 23, 2018
611501f
add interim fancy message formatting, handle special python case
schwartzadev Mar 23, 2018
85bb282
add snake to query string for images
schwartzadev Mar 23, 2018
243b51f
add list of snake facts, sources files
schwartzadev Mar 24, 2018
b4e6468
update sources
schwartzadev Mar 24, 2018
cea4cf3
add snake fact command
schwartzadev Mar 24, 2018
3a37252
clean up code - type hinting, spelling, URL formatting, etc. (thanks …
schwartzadev Mar 24, 2018
6602d02
fix broken URL
schwartzadev Mar 24, 2018
62401e5
resolve PEP E226
schwartzadev Mar 24, 2018
7f63f4f
implement more of @1mn's suggestions
schwartzadev Mar 24, 2018
0137051
use the snake emoji
schwartzadev Mar 24, 2018
1e710db
integrate with the API - thanks @prithajnath - remove message from re…
schwartzadev Mar 24, 2018
5844b02
Merge pull request #2 from discord-python/master
schwartzadev Mar 24, 2018
3656c01
Add search endpoint and auth headers
prithajnath Mar 24, 2018
48f8de4
Merge pull request #3 from discord-python/master
schwartzadev Mar 25, 2018
bf2f9ea
remove repetitive embed code, fix linting errors (hopefully!)
schwartzadev Mar 25, 2018
d8a26ba
resolve flake8 - P103
schwartzadev Mar 25, 2018
9c8a9f4
resolve linting issues
schwartzadev Mar 25, 2018
697f557
implement random api endpoint
schwartzadev Mar 25, 2018
0951f92
implement titlecase for common and scientific names, remove unused al…
schwartzadev Mar 25, 2018
544bed5
return number of matches in searches, add handling of searches with 0…
schwartzadev Mar 25, 2018
a2255e7
add qwant api in favor of unsplash, including handling for small numb…
schwartzadev Mar 25, 2018
9b2f8d0
rm prints
schwartzadev Mar 25, 2018
f30abab
Merge pull request #4 from schwartzadev/qwant-images
schwartzadev Mar 25, 2018
48f2584
add newline between imports (I201) for linting
schwartzadev Mar 25, 2018
e5901b6
Add APIs used
prithajnath Mar 25, 2018
5770c79
Add some GIFs for facts
prithajnath Mar 25, 2018
259c5a6
linting updates
schwartzadev Mar 25, 2018
2d45b2f
add list of zen python sayings
schwartzadev Mar 25, 2018
6776264
use response.json() for qwant access
schwartzadev Mar 25, 2018
03f9b61
handle snakes without a location, reduce variance in photos to three …
schwartzadev Mar 25, 2018
a27582a
Add cat input for GIF
prithajnath Mar 25, 2018
e2d556b
start video command - needs formatting work for embed
schwartzadev Mar 25, 2018
003ace9
remove embed (Discord is finnicky), fix command format
schwartzadev Mar 25, 2018
2366c43
update docstring for get
schwartzadev Mar 25, 2018
ea31798
update video docstring
schwartzadev Mar 25, 2018
a9f8863
fix get_video_json docstring
schwartzadev Mar 25, 2018
01c701b
Add Zen of Python
prithajnath Mar 25, 2018
9d28fa3
Merge pull request #6 from schwartzadev/video-command
prithajnath Mar 25, 2018
c98bc6e
Merge branch 'master' into prithaj_gif_categories
schwartzadev Mar 25, 2018
d2482b2
Merge pull request #5 from schwartzadev/prithaj_gif_categories
schwartzadev Mar 25, 2018
f1b7a2c
Add alias for this
prithajnath Mar 25, 2018
ff361b8
Add descp for zen
prithajnath Mar 25, 2018
13937c1
Merge branch 'prithaj_zen_of_python' of https://github.com/schwartzad…
schwartzadev Mar 25, 2018
3279319
lint, fix spelling
schwartzadev Mar 25, 2018
e0d2bf2
lint, fix spelling
schwartzadev Mar 25, 2018
361cc45
Merge pull request #7 from schwartzadev/prithaj_zen_of_python
schwartzadev Mar 25, 2018
ac33379
Merge branch 'master' of https://github.com/schwartzadev/code-jam-1
schwartzadev Mar 25, 2018
375f4bc
fix arguments, lint, and format for get_snek_fact
schwartzadev Mar 25, 2018
71a0f44
linting
schwartzadev Mar 25, 2018
99f00f2
add information about credentials
schwartzadev Mar 26, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
handle snakes without a location, reduce variance in photos to three …
…photos per snake
  • Loading branch information
schwartzadev committed Mar 25, 2018
commit 03f9b618bdffd5be198d6c5b12efff58159ed6c0
21 changes: 13 additions & 8 deletions bot/cogs/snakes.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,10 @@ async def get_snek_image(self, name: str) -> str:
"""
json_response = await self.get_snek_qwant_json(name)
result_count = len(json_response["data"]["result"]["items"])
if 3 > result_count > 1:
rand = random.randint(0, result_count - 1)
if result_count == 1:
rand = 0
else:
rand = random.randint(0, 3) # prevents returning the same image every time
rand = random.randint(0, 2) # prevents returning the same image every time
try:
choice = str(json_response["data"]["result"]["items"][rand]["media"])
except IndexError:
Expand Down Expand Up @@ -146,12 +144,19 @@ async def get(self, ctx: Context, name: str = None):
)
await ctx.channel.send(embed=embed)
return # break out of rest of method

if snek_info['is_venomous']:
# if the snake is venomous -- use the fancy check icon
venom_info = f":white_check_mark: venomous\n\n"
venom_info = f":white_check_mark: venomous"
else:
# if the snake is not venomous -- use the fancy not allowed icon
venom_info = f":no_entry_sign: NOT venomous\n\n"
venom_info = f":no_entry_sign: NOT venomous"

if not snek_info['locations']:
# if no location field
location_info = ''
else:
location_info = f"\n\n:globe_with_meridians: Found in {snek_info['locations']}"
additional_info = '' # required to prevent referencing before assignment
if snek_info['matches_count'] and snek_info['matches_count'] > 1:
additional_info = f"\n\n" \
Expand All @@ -163,7 +168,7 @@ async def get(self, ctx: Context, name: str = None):
value=(
f":microscope: *{titlecase(snek_info['scientific_name'])}*\n\n"
f"{venom_info}"
f":globe_with_meridians: Found in {snek_info['locations']}"
f"{location_info}"
f"{additional_info}"
),
inline=False
Expand All @@ -187,8 +192,8 @@ async def fact(self, ctx: Context):
_fact = self.get_snek_fact()
em = discord.Embed(color=0x399600)
em.add_field(
name=f"{_fact['cat']} snake fact",
value=f"{_fact['message']}. {random.choice(message_suffix[_fact['cat']])}",
name=titlecase(f"{_fact['cat']} snake fact"),
value=f"{_fact['message']} {random.choice(message_suffix[_fact['cat']])}",
inline=False
)
em.set_image(url=_fact['gif'])
Expand Down