Move Superstarify to moderation sub-package

* Read names from JSON instead of a module
* Move get_nick function inside the Superstarify cog
* Load Superstarify cog through the moderation extension
* Define __all__ for moderation module

5 files changed, 100 insertions, 175 deletions

diff --git a/bot/__main__.py b/bot/__main__.py
index 7d8cf6d6d..d0924be78 100644
--- a/bot/__main__.py
+++ b/bot/__main__.py
@@ -63,7 +63,6 @@ bot.load_extension("bot.cogs.reddit")
 bot.load_extension("bot.cogs.reminders")
 bot.load_extension("bot.cogs.site")
 bot.load_extension("bot.cogs.snekbox")
-bot.load_extension("bot.cogs.superstarify")
 bot.load_extension("bot.cogs.sync")
 bot.load_extension("bot.cogs.tags")
 bot.load_extension("bot.cogs.token_remover")
diff --git a/bot/cogs/moderation/__init__.py b/bot/cogs/moderation/__init__.py
index bf0a14c29..25400306e 100644
--- a/bot/cogs/moderation/__init__.py
+++ b/bot/cogs/moderation/__init__.py
@@ -2,15 +2,19 @@ import logging
 
 from discord.ext.commands import Bot
 
+from . import utils
 from .infractions import Infractions
 from .management import ModManagement
 from .modlog import ModLog
+from .superstarify import Superstarify
+
+__all__ = ("utils", "Infractions", "ModManagement", "ModLog", "Superstarify")
 
 log = logging.getLogger(__name__)
 
 
 def setup(bot: Bot) -> None:
-    """Load the moderation extension with the Infractions, ModManagement, and ModLog cogs."""
+    """Load the moderation extension (Infractions, ModManagement, ModLog, & Superstarify cogs)."""
     bot.add_cog(Infractions(bot))
     log.info("Cog loaded: Infractions")
 
@@ -19,3 +23,6 @@ def setup(bot: Bot) -> None:
 
     bot.add_cog(ModManagement(bot))
     log.info("Cog loaded: ModManagement")
+
+    bot.add_cog(Superstarify(bot))
+    log.info("Cog loaded: Superstarify")
diff --git a/bot/cogs/superstarify/__init__.py b/bot/cogs/moderation/superstarify.py
index 576de2d31..194f22dd9 100644
--- a/bot/cogs/superstarify/__init__.py
+++ b/bot/cogs/moderation/superstarify.py
@@ -1,5 +1,7 @@
+import json
 import logging
 import random
+from pathlib import Path
 
 from discord import Colour, Embed, Member
 from discord.errors import Forbidden
@@ -7,7 +9,6 @@ from discord.ext.commands import Bot, Cog, Context, command
 
 from bot.cogs.moderation import Infractions, ModLog
 from bot.cogs.moderation.utils import post_infraction
-from bot.cogs.superstarify.stars import get_nick
 from bot.constants import Icons, MODERATION_ROLES, POSITIVE_REPLIES
 from bot.converters import Duration
 from bot.decorators import with_role
@@ -16,6 +17,9 @@ from bot.utils.time import format_infraction
 log = logging.getLogger(__name__)
 NICKNAME_POLICY_URL = "https://pythondiscord.com/pages/rules/#wiki-toc-nickname-policy"
 
+with Path("resources/stars.json").open(encoding="utf-8") as stars_file:
+    STAR_NAMES = json.load(stars_file)
+
 
 class Superstarify(Cog):
     """A set of commands to moderate terrible nicknames."""
@@ -61,7 +65,7 @@ class Superstarify(Cog):
 
         if active_superstarifies:
             [infraction] = active_superstarifies
-            forced_nick = get_nick(infraction['id'], before.id)
+            forced_nick = self.get_nick(infraction['id'], before.id)
             if after.display_name == forced_nick:
                 return  # Nick change was triggered by this event. Ignore.
 
@@ -107,7 +111,7 @@ class Superstarify(Cog):
 
         if active_superstarifies:
             [infraction] = active_superstarifies
-            forced_nick = get_nick(infraction['id'], member.id)
+            forced_nick = self.get_nick(infraction['id'], member.id)
             await member.edit(nick=forced_nick)
             end_timestamp_human = format_infraction(infraction['expires_at'])
 
@@ -176,7 +180,7 @@ class Superstarify(Cog):
             type='superstar', reason=reason or ('old nick: ' + member.display_name),
             expires_at=expiration
         )
-        forced_nick = get_nick(infraction['id'], member.id)
+        forced_nick = self.get_nick(infraction['id'], member.id)
 
         embed = Embed()
         embed.title = "Congratulations!"
@@ -256,6 +260,12 @@ class Superstarify(Cog):
         log.trace(f"{member.display_name} was successfully released from superstar-prison.")
         await ctx.send(embed=embed)
 
+    @staticmethod
+    def get_nick(infraction_id: int, member_id: int) -> str:
+        """Randomly select a nickname from the Superstarify nickname list."""
+        rng = random.Random(str(infraction_id) + str(member_id))
+        return rng.choice(STAR_NAMES)
+
 
 def setup(bot: Bot) -> None:
     """Superstarify cog load."""
diff --git a/bot/cogs/superstarify/stars.py b/bot/cogs/superstarify/stars.py
deleted file mode 100644
index dbac86770..000000000
--- a/bot/cogs/superstarify/stars.py
+++ /dev/null
@@ -1,87 +0,0 @@
-import random
-
-
-STAR_NAMES = (
-    "Adele",
-    "Aerosmith",
-    "Aretha Franklin",
-    "Ayumi Hamasaki",
-    "B'z",
-    "Barbra Streisand",
-    "Barry Manilow",
-    "Barry White",
-    "Beyonce",
-    "Billy Joel",
-    "Bob Dylan",
-    "Bob Marley",
-    "Bob Seger",
-    "Bon Jovi",
-    "Britney Spears",
-    "Bruce Springsteen",
-    "Bruno Mars",
-    "Bryan Adams",
-    "Celine Dion",
-    "Cher",
-    "Christina Aguilera",
-    "David Bowie",
-    "Donna Summer",
-    "Drake",
-    "Ed Sheeran",
-    "Elton John",
-    "Elvis Presley",
-    "Eminem",
-    "Enya",
-    "Flo Rida",
-    "Frank Sinatra",
-    "Garth Brooks",
-    "George Michael",
-    "George Strait",
-    "James Taylor",
-    "Janet Jackson",
-    "Jay-Z",
-    "Johnny Cash",
-    "Johnny Hallyday",
-    "Julio Iglesias",
-    "Justin Bieber",
-    "Justin Timberlake",
-    "Kanye West",
-    "Katy Perry",
-    "Kenny G",
-    "Kenny Rogers",
-    "Lady Gaga",
-    "Lil Wayne",
-    "Linda Ronstadt",
-    "Lionel Richie",
-    "Madonna",
-    "Mariah Carey",
-    "Meat Loaf",
-    "Michael Jackson",
-    "Neil Diamond",
-    "Nicki Minaj",
-    "Olivia Newton-John",
-    "Paul McCartney",
-    "Phil Collins",
-    "Pink",
-    "Prince",
-    "Reba McEntire",
-    "Rihanna",
-    "Robbie Williams",
-    "Rod Stewart",
-    "Santana",
-    "Shania Twain",
-    "Stevie Wonder",
-    "Taylor Swift",
-    "Tim McGraw",
-    "Tina Turner",
-    "Tom Petty",
-    "Tupac Shakur",
-    "Usher",
-    "Van Halen",
-    "Whitney Houston",
-)
-
-
-def get_nick(infraction_id: int, member_id: int) -> str:
-    """Randomly select a nickname from the Superstarify nickname list."""
-    rng = random.Random(str(infraction_id) + str(member_id))
-    return rng.choice(STAR_NAMES)
diff --git a/bot/resources/stars.json b/bot/resources/stars.json
index 8071b9626..c0b253120 100644
--- a/bot/resources/stars.json
+++ b/bot/resources/stars.json
@@ -1,82 +1,78 @@
-{
-  "Adele": "https://upload.wikimedia.org/wikipedia/commons/thumb/7/7c/Adele_2016.jpg/220px-Adele_2016.jpg",
-  "Steven Tyler": "https://upload.wikimedia.org/wikipedia/commons/thumb/a/a8/Steven_Tyler_by_Gage_Skidmore_3.jpg/220px-Steven_Tyler_by_Gage_Skidmore_3.jpg",
-  "Alex Van Halen": "https://upload.wikimedia.org/wikipedia/commons/thumb/b/b3/Alex_Van_Halen_-_Van_Halen_Live.jpg/220px-Alex_Van_Halen_-_Van_Halen_Live.jpg",
-  "Aretha Franklin": "https://upload.wikimedia.org/wikipedia/commons/thumb/c/c6/Aretha_Franklin_1968.jpg/220px-Aretha_Franklin_1968.jpg",
-  "Ayumi Hamasaki": "https://upload.wikimedia.org/wikipedia/commons/thumb/5/50/Ayumi_Hamasaki_2007.jpg/220px-Ayumi_Hamasaki_2007.jpg",
-  "Koshi Inaba": "https://upload.wikimedia.org/wikipedia/commons/thumb/a/af/B%27Z_at_Best_Buy_Theater_NYC_-_9-30-12_-_18.jpg/220px-B%27Z_at_Best_Buy_Theater_NYC_-_9-30-12_-_18.jpg",
-  "Barbra Streisand": "https://upload.wikimedia.org/wikipedia/en/thumb/a/a3/Barbra_Streisand_-_1966.jpg/220px-Barbra_Streisand_-_1966.jpg",
-  "Barry Manilow": "https://upload.wikimedia.org/wikipedia/commons/thumb/2/2b/BarryManilow.jpg/220px-BarryManilow.jpg",
-  "Barry White": "https://upload.wikimedia.org/wikipedia/commons/thumb/b/b7/Barry_White%2C_Bestanddeelnr_927-0099.jpg/220px-Barry_White%2C_Bestanddeelnr_927-0099.jpg",
-  "Beyonce": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/f2/Beyonce_-_The_Formation_World_Tour%2C_at_Wembley_Stadium_in_London%2C_England.jpg/220px-Beyonce_-_The_Formation_World_Tour%2C_at_Wembley_Stadium_in_London%2C_England.jpg",
-  "Billy Joel": "https://upload.wikimedia.org/wikipedia/commons/thumb/1/19/Billy_Joel_Shankbone_NYC_2009.jpg/220px-Billy_Joel_Shankbone_NYC_2009.jpg",
-  "Bob Dylan": "https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/Bob_Dylan_-_Azkena_Rock_Festival_2010_2.jpg/220px-Bob_Dylan_-_Azkena_Rock_Festival_2010_2.jpg",
-  "Bob Marley": "https://upload.wikimedia.org/wikipedia/commons/thumb/5/5e/Bob-Marley.jpg/220px-Bob-Marley.jpg",
-  "Bob Seger": "https://upload.wikimedia.org/wikipedia/commons/thumb/1/16/Bob_Seger_2013.jpg/220px-Bob_Seger_2013.jpg",
-  "Jon Bon Jovi": "https://upload.wikimedia.org/wikipedia/commons/thumb/4/49/Jon_Bon_Jovi_at_the_2009_Tribeca_Film_Festival_3.jpg/220px-Jon_Bon_Jovi_at_the_2009_Tribeca_Film_Festival_3.jpg",
-  "Britney Spears": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/da/Britney_Spears_2013_%28Straighten_Crop%29.jpg/200px-Britney_Spears_2013_%28Straighten_Crop%29.jpg",
-  "Bruce Springsteen": "https://upload.wikimedia.org/wikipedia/commons/thumb/3/3b/Bruce_Springsteen_-_Roskilde_Festival_2012.jpg/210px-Bruce_Springsteen_-_Roskilde_Festival_2012.jpg",
-  "Bruno Mars": "https://upload.wikimedia.org/wikipedia/commons/thumb/b/b0/BrunoMars24KMagicWorldTourLive_%28cropped%29.jpg/220px-BrunoMars24KMagicWorldTourLive_%28cropped%29.jpg",
-  "Bryan Adams": "https://upload.wikimedia.org/wikipedia/commons/thumb/7/7e/Bryan_Adams_Hamburg_MG_0631_flickr.jpg/300px-Bryan_Adams_Hamburg_MG_0631_flickr.jpg",
-  "Celine Dion": "https://upload.wikimedia.org/wikipedia/commons/thumb/4/42/Celine_Dion_Concert_Singing_Taking_Chances_2008.jpg/220px-Celine_Dion_Concert_Singing_Taking_Chances_2008.jpg",
-  "Cher": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Cher_-_Casablanca.jpg/220px-Cher_-_Casablanca.jpg",
-  "Christina Aguilera": "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e7/Christina_Aguilera_in_2016.jpg/220px-Christina_Aguilera_in_2016.jpg",
-  "David Bowie": "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e8/David-Bowie_Chicago_2002-08-08_photoby_Adam-Bielawski-cropped.jpg/220px-David-Bowie_Chicago_2002-08-08_photoby_Adam-Bielawski-cropped.jpg",
-  "David Lee Roth": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/fb/David_Lee_Roth_-_Van_Halen.jpg/220px-David_Lee_Roth_-_Van_Halen.jpg",
-  "Donna Summer": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dd/Nobel_Peace_Price_Concert_2009_Donna_Summer3.jpg/220px-Nobel_Peace_Price_Concert_2009_Donna_Summer3.jpg",
-  "Drake": "https://upload.wikimedia.org/wikipedia/commons/thumb/8/81/Drake_at_the_Velvet_Underground_-_2017_%2835986086223%29_%28cropped%29.jpg/220px-Drake_at_the_Velvet_Underground_-_2017_%2835986086223%29_%28cropped%29.jpg",
-  "Ed Sheeran": "https://upload.wikimedia.org/wikipedia/commons/thumb/5/55/Ed_Sheeran_2013.jpg/220px-Ed_Sheeran_2013.jpg",
-  "Eddie Van Halen": "https://upload.wikimedia.org/wikipedia/commons/thumb/a/a7/Eddie_Van_Halen.jpg/300px-Eddie_Van_Halen.jpg",
-  "Elton John": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/d1/Elton_John_2011_Shankbone_2.JPG/220px-Elton_John_2011_Shankbone_2.JPG",
-  "Elvis Presley": "https://upload.wikimedia.org/wikipedia/commons/thumb/9/99/Elvis_Presley_promoting_Jailhouse_Rock.jpg/220px-Elvis_Presley_promoting_Jailhouse_Rock.jpg",
-  "Eminem": "https://upload.wikimedia.org/wikipedia/commons/thumb/4/4a/Eminem_-_Concert_for_Valor_in_Washington%2C_D.C._Nov._11%2C_2014_%282%29_%28Cropped%29.jpg/220px-Eminem_-_Concert_for_Valor_in_Washington%2C_D.C._Nov._11%2C_2014_%282%29_%28Cropped%29.jpg",
-  "Enya": "https://enya.com/wp-content/themes/enya%20full%20site/images/enya-about.jpg",
-  "Flo Rida": "https://upload.wikimedia.org/wikipedia/commons/thumb/8/8b/Flo_Rida_%286924266548%29.jpg/220px-Flo_Rida_%286924266548%29.jpg",
-  "Frank Sinatra": "https://upload.wikimedia.org/wikipedia/commons/thumb/a/af/Frank_Sinatra_%2757.jpg/220px-Frank_Sinatra_%2757.jpg",
-  "Garth Brooks": "https://upload.wikimedia.org/wikipedia/commons/thumb/b/bc/Garth_Brooks_on_World_Tour_%28crop%29.png/220px-Garth_Brooks_on_World_Tour_%28crop%29.png",
-  "George Michael": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/f2/George_Michael.jpeg/220px-George_Michael.jpeg",
-  "George Strait": "https://upload.wikimedia.org/wikipedia/commons/thumb/0/0c/George_Strait_2014_1.jpg/220px-George_Strait_2014_1.jpg",
-  "James Taylor": "https://upload.wikimedia.org/wikipedia/commons/thumb/c/cf/James_Taylor_-_Columbia.jpg/220px-James_Taylor_-_Columbia.jpg",
-  "Janet Jackson": "https://upload.wikimedia.org/wikipedia/commons/thumb/0/02/JanetJacksonUnbreakableTourSanFran2015.jpg/220px-JanetJacksonUnbreakableTourSanFran2015.jpg",
-  "Jay-Z": "https://upload.wikimedia.org/wikipedia/commons/thumb/b/b6/Jay-Z.png/220px-Jay-Z.png",
-  "Johnny Cash": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/f2/JohnnyCash1969.jpg/220px-JohnnyCash1969.jpg",
-  "Johnny Hallyday": "https://upload.wikimedia.org/wikipedia/commons/thumb/a/a1/Johnny_Hallyday_Cannes.jpg/220px-Johnny_Hallyday_Cannes.jpg",
-  "Julio Iglesias": "https://upload.wikimedia.org/wikipedia/commons/thumb/e/ef/Julio_Iglesias09.jpg/220px-Julio_Iglesias09.jpg",
-  "Justin Bieber": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/da/Justin_Bieber_in_2015.jpg/220px-Justin_Bieber_in_2015.jpg",
-  "Justin Timberlake": "https://upload.wikimedia.org/wikipedia/commons/thumb/e/ed/Justin_Timberlake_by_Gage_Skidmore_2.jpg/220px-Justin_Timberlake_by_Gage_Skidmore_2.jpg",
-  "Kanye West": "https://upload.wikimedia.org/wikipedia/commons/thumb/1/11/Kanye_West_at_the_2009_Tribeca_Film_Festival.jpg/220px-Kanye_West_at_the_2009_Tribeca_Film_Festival.jpg",
-  "Katy Perry": "https://upload.wikimedia.org/wikipedia/commons/thumb/8/8a/Katy_Perry_at_Madison_Square_Garden_%2837436531092%29_%28cropped%29.jpg/220px-Katy_Perry_at_Madison_Square_Garden_%2837436531092%29_%28cropped%29.jpg",
-  "Kenny G": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/f4/KennyGHWOFMay2013.jpg/220px-KennyGHWOFMay2013.jpg",
-  "Kenny Rogers": "https://upload.wikimedia.org/wikipedia/commons/thumb/8/8c/KennyRogers.jpg/220px-KennyRogers.jpg",
-  "Lady Gaga": "https://upload.wikimedia.org/wikipedia/commons/thumb/2/2c/Lady_Gaga_interview_2016.jpg/220px-Lady_Gaga_interview_2016.jpg",
-  "Lil Wayne": "https://upload.wikimedia.org/wikipedia/commons/thumb/a/a6/Lil_Wayne_%2823513397583%29.jpg/220px-Lil_Wayne_%2823513397583%29.jpg",
-  "Linda Ronstadt": "https://upload.wikimedia.org/wikipedia/commons/thumb/5/50/LindaRonstadtPerforming.jpg/220px-LindaRonstadtPerforming.jpg",
-  "Lionel Richie": "https://upload.wikimedia.org/wikipedia/commons/thumb/c/cd/Lionel_Richie_2017.jpg/220px-Lionel_Richie_2017.jpg",
-  "Madonna": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/d1/Madonna_Rebel_Heart_Tour_2015_-_Stockholm_%2823051472299%29_%28cropped_2%29.jpg/220px-Madonna_Rebel_Heart_Tour_2015_-_Stockholm_%2823051472299%29_%28cropped_2%29.jpg",
-  "Mariah Carey": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/f2/Mariah_Carey_WBLS_2018_Interview_4.jpg/220px-Mariah_Carey_WBLS_2018_Interview_4.jpg",
-  "Meat Loaf": "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e7/Meat_Loaf.jpg/220px-Meat_Loaf.jpg",
-  "Michael Jackson": "https://upload.wikimedia.org/wikipedia/commons/thumb/3/31/Michael_Jackson_in_1988.jpg/220px-Michael_Jackson_in_1988.jpg",
-  "Neil Diamond": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/f4/Neil_Diamond_HWOF_Aug_2012_other_%28levels_adjusted_and_cropped%29.jpg/220px-Neil_Diamond_HWOF_Aug_2012_other_%28levels_adjusted_and_cropped%29.jpg",
-  "Nicki Minaj": "https://upload.wikimedia.org/wikipedia/commons/thumb/5/54/Nicki_Minaj_MTV_VMAs_4.jpg/250px-Nicki_Minaj_MTV_VMAs_4.jpg",
-  "Olivia Newton-John": "https://upload.wikimedia.org/wikipedia/commons/thumb/c/c7/Olivia_Newton-John_2.jpg/220px-Olivia_Newton-John_2.jpg",
-  "Paul McCartney": "https://upload.wikimedia.org/wikipedia/commons/thumb/5/5d/Paul_McCartney_-_Out_There_Concert_-_140420-5941-jikatu_%2813950091384%29.jpg/220px-Paul_McCartney_-_Out_There_Concert_-_140420-5941-jikatu_%2813950091384%29.jpg",
-  "Phil Collins": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/f3/1_collins.jpg/220px-1_collins.jpg",
-  "Pink": "https://upload.wikimedia.org/wikipedia/commons/thumb/1/1a/P%21nk_Live_2013.jpg/220px-P%21nk_Live_2013.jpg",
-  "Prince": "https://upload.wikimedia.org/wikipedia/commons/thumb/b/b2/Prince_1983_1st_Avenue.jpg/220px-Prince_1983_1st_Avenue.jpg",
-  "Reba McEntire": "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e0/Reba_McEntire_by_Gage_Skidmore.jpg/220px-Reba_McEntire_by_Gage_Skidmore.jpg",
-  "Rihanna": "https://upload.wikimedia.org/wikipedia/commons/thumb/4/47/Rihanna_concert_in_Washington_DC_%282%29.jpg/250px-Rihanna_concert_in_Washington_DC_%282%29.jpg",
-  "Robbie Williams": "https://upload.wikimedia.org/wikipedia/commons/thumb/2/21/Robbie_Williams.jpg/220px-Robbie_Williams.jpg",
-  "Rod Stewart": "https://upload.wikimedia.org/wikipedia/commons/thumb/5/57/Rod_stewart_05111976_12_400.jpg/220px-Rod_stewart_05111976_12_400.jpg",
-  "Carlos Santana": "https://upload.wikimedia.org/wikipedia/commons/thumb/5/54/Santana_2010.jpg/220px-Santana_2010.jpg",
-  "Shania Twain": "https://upload.wikimedia.org/wikipedia/commons/thumb/e/ee/ShaniaTwainJunoAwardsMar2011.jpg/220px-ShaniaTwainJunoAwardsMar2011.jpg",
-  "Stevie Wonder": "https://upload.wikimedia.org/wikipedia/commons/thumb/5/54/Stevie_Wonder_1973.JPG/220px-Stevie_Wonder_1973.JPG",
-  "Tak Matsumoto": "https://upload.wikimedia.org/wikipedia/commons/thumb/d/da/B%27Z_at_Best_Buy_Theater_NYC_-_9-30-12_-_22.jpg/220px-B%27Z_at_Best_Buy_Theater_NYC_-_9-30-12_-_22.jpg",
-  "Taylor Swift": "https://upload.wikimedia.org/wikipedia/commons/thumb/2/25/Taylor_Swift_112_%2818119055110%29_%28cropped%29.jpg/220px-Taylor_Swift_112_%2818119055110%29_%28cropped%29.jpg",
-  "Tim McGraw": "https://upload.wikimedia.org/wikipedia/commons/thumb/5/5f/Tim_McGraw_October_24_2015.jpg/220px-Tim_McGraw_October_24_2015.jpg",
-  "Tina Turner": "https://upload.wikimedia.org/wikipedia/commons/thumb/1/10/Tina_turner_21021985_01_350.jpg/250px-Tina_turner_21021985_01_350.jpg",
-  "Tom Petty": "https://upload.wikimedia.org/wikipedia/commons/thumb/5/5a/Tom_Petty_Live_in_Horsens_%28cropped2%29.jpg/220px-Tom_Petty_Live_in_Horsens_%28cropped2%29.jpg",
-  "Tupac Shakur": "https://upload.wikimedia.org/wikipedia/en/thumb/b/b5/Tupac_Amaru_Shakur2.jpg/220px-Tupac_Amaru_Shakur2.jpg",
-  "Usher": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/fa/Usher_Cannes_2016_retusche.jpg/220px-Usher_Cannes_2016_retusche.jpg",
-  "Whitney Houston": "https://upload.wikimedia.org/wikipedia/commons/thumb/a/a7/Whitney_Houston_Welcome_Home_Heroes_1_cropped.jpg/220px-Whitney_Houston_Welcome_Home_Heroes_1_cropped.jpg",
-  "Wolfgang Van Halen": "https://upload.wikimedia.org/wikipedia/commons/thumb/0/0c/Wolfgang_Van_Halen_Different_Kind_of_Truth_2012.jpg/220px-Wolfgang_Van_Halen_Different_Kind_of_Truth_2012.jpg"
-}
+[
+  "Adele",
+  "Aerosmith",
+  "Aretha Franklin",
+  "Ayumi Hamasaki",
+  "B'z",
+  "Barbra Streisand",
+  "Barry Manilow",
+  "Barry White",
+  "Beyonce",
+  "Billy Joel",
+  "Bob Dylan",
+  "Bob Marley",
+  "Bob Seger",
+  "Bon Jovi",
+  "Britney Spears",
+  "Bruce Springsteen",
+  "Bruno Mars",
+  "Bryan Adams",
+  "Celine Dion",
+  "Cher",
+  "Christina Aguilera",
+  "David Bowie",
+  "Donna Summer",
+  "Drake",
+  "Ed Sheeran",
+  "Elton John",
+  "Elvis Presley",
+  "Eminem",
+  "Enya",
+  "Flo Rida",
+  "Frank Sinatra",
+  "Garth Brooks",
+  "George Michael",
+  "George Strait",
+  "James Taylor",
+  "Janet Jackson",
+  "Jay-Z",
+  "Johnny Cash",
+  "Johnny Hallyday",
+  "Julio Iglesias",
+  "Justin Bieber",
+  "Justin Timberlake",
+  "Kanye West",
+  "Katy Perry",
+  "Kenny G",
+  "Kenny Rogers",
+  "Lady Gaga",
+  "Lil Wayne",
+  "Linda Ronstadt",
+  "Lionel Richie",
+  "Madonna",
+  "Mariah Carey",
+  "Meat Loaf",
+  "Michael Jackson",
+  "Neil Diamond",
+  "Nicki Minaj",
+  "Olivia Newton-John",
+  "Paul McCartney",
+  "Phil Collins",
+  "Pink",
+  "Prince",
+  "Reba McEntire",
+  "Rihanna",
+  "Robbie Williams",
+  "Rod Stewart",
+  "Santana",
+  "Shania Twain",
+  "Stevie Wonder",
+  "Taylor Swift",
+  "Tim McGraw",
+  "Tina Turner",
+  "Tom Petty",
+  "Tupac Shakur",
+  "Usher",
+  "Van Halen",
+  "Whitney Houston"
+]