From d51441d508c8dad5c8e00f5f9dda1b084a89aa8b Mon Sep 17 00:00:00 2001
From: Krateng <git.noreply@krateng.ch>
Date: Fri, 26 Apr 2019 17:27:23 +0200
Subject: [PATCH] Performance view on artist page now considers countas rules

---
 website/artist.html | 2 +-
 website/artist.py   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/website/artist.html b/website/artist.html
index 4e40e92..dcfc666 100644
--- a/website/artist.html
+++ b/website/artist.html
@@ -35,7 +35,7 @@
 					KEY_PULSE
 				</td>
 				<td>
-					<h2><a href='/performance?artist=KEY_ENC_ARTISTNAME&step=year&trail=1'>Performance</a></h2>
+					<h2><a href='/performance?artist=KEY_ENC_CREDITEDARTISTNAME&step=year&trail=1'>Performance</a></h2>
 					KEY_PERFORMANCE
 				</td>
 			</tr>
diff --git a/website/artist.py b/website/artist.py
index e114c28..d271eed 100644
--- a/website/artist.py
+++ b/website/artist.py
@@ -34,6 +34,8 @@ def instructions(keys):
 	if credited is not None:
 		includestr = "Competing under " + artistLink(credited) + " (" + pos + ")"
 		pos = ""
+	else:
+		credited = artist
 	included = data.get("associated")
 	if included is not None and included != []:
 		includestr = "associated: "
@@ -45,11 +47,12 @@ def instructions(keys):
 	html_scrobbles, _, _ = module_scrobblelist(artist=artist,max_=10,earlystop=True)
 
 	html_pulse = module_pulse(**filterkeys,step="year",stepn=1,trail=1)
-	html_performance = module_performance(**filterkeys,step="year",stepn=1,trail=1)
+	html_performance = module_performance(artist=credited,step="year",stepn=1,trail=1)
 
 	replace = {
 		"KEY_ARTISTNAME":keys["artist"],
 		"KEY_ENC_ARTISTNAME":urllib.parse.quote(keys["artist"]),
+		"KEY_ENC_CREDITEDARTISTNAME":urllib.parse.quote(credited),
 		"KEY_IMAGEURL":imgurl,
 		"KEY_DESCRIPTION":"",
 		"KEY_MEDALS":html_medals,