Refactor patreon+twitch data to be linked to /datum/player_details …

…rather than `/client`

code/controllers/subsystem/vote.dm

@@ -106,13 +106,14 @@ SUBSYSTEM_DEF(vote)
 	// monkestation start
 	if(!current_vote.can_vote(voter))
 		return
+	var/patreon_rank = get_player_details(voter)?.patreon?.access_rank
 	// monkestation end
 
 	// If user has already voted, remove their specific vote
 	if(voter.ckey in current_vote.choices_by_ckey)
 		var/their_old_vote = current_vote.choices_by_ckey[voter.ckey]
 		//monkestation edit start
-		if(current_vote.donator_multiplier && voter?.client?.patreon?.access_rank >= 3)
+		if(current_vote.donator_multiplier && patreon_rank >= 3)
 			current_vote.choices[their_old_vote] -= current_vote.donator_multiplier
 		else
 			current_vote.choices[their_old_vote]--
@@ -122,7 +123,7 @@ SUBSYSTEM_DEF(vote)
 
 	current_vote.choices_by_ckey[voter.ckey] = their_vote
 	//monkestation edit start
-	if(current_vote.donator_multiplier && voter?.client?.patreon?.access_rank >= 3)
+	if(current_vote.donator_multiplier && patreon_rank >= 3)
 		current_vote.choices[their_vote] += current_vote.donator_multiplier
 	else
 		current_vote.choices[their_vote]++
@@ -140,6 +141,7 @@ SUBSYSTEM_DEF(vote)
 	// monkestation start
 	if(!current_vote.can_vote(voter))
 		return
+	var/patreon_rank = get_player_details(voter)?.patreon?.access_rank
 	// monkestation end
 	if(CONFIG_GET(flag/no_dead_vote) && voter.stat == DEAD && !voter.client?.holder)
 		return
@@ -149,7 +151,7 @@ SUBSYSTEM_DEF(vote)
 	if(current_vote.choices_by_ckey[voter.ckey + their_vote] == 1)
 		current_vote.choices_by_ckey[voter.ckey + their_vote] = 0
 		//monkestation edit start
-		if(current_vote.donator_multiplier && voter?.client?.patreon?.access_rank >= 3)
+		if(current_vote.donator_multiplier && patreon_rank >= 3)
 			current_vote.choices[their_vote] -= current_vote.donator_multiplier
 		else
 			current_vote.choices[their_vote]--
@@ -158,7 +160,7 @@ SUBSYSTEM_DEF(vote)
 	else
 		current_vote.choices_by_ckey[voter.ckey + their_vote] = 1
 		//monkestation edit start
-		if(current_vote.donator_multiplier && voter?.client?.patreon?.access_rank >= 3)
+		if(current_vote.donator_multiplier && patreon_rank >= 3)
 			current_vote.choices[their_vote] += current_vote.donator_multiplier
 		else
 			current_vote.choices[their_vote]++

code/datums/mocking/client.dm

@@ -29,6 +29,10 @@
 	var/datum/interaction_mode/imode
 	var/context_menu_requires_shift = FALSE
 
+	///these persist between logins/logouts during the same round.
+	var/datum/player_details/player_details
+	var/reconnecting = FALSE
+
 /datum/client_interface/proc/IsByondMember()
 	return FALSE
 
@@ -37,6 +41,14 @@
 	if(key)
 		src.key = key
 		ckey = ckey(key)
+		if(GLOB.player_details[ckey])
+			reconnecting = TRUE
+			player_details = GLOB.player_details[ckey]
+		else
+			player_details = new(ckey)
+			player_details.byond_version = world.byond_version
+			player_details.byond_build = world.byond_build
+			GLOB.player_details[ckey] = player_details
 
 /datum/client_interface/proc/set_macros()
 	return

code/modules/client/player_details.dm

@@ -3,6 +3,8 @@
 GLOBAL_LIST_EMPTY_TYPED(player_details, /datum/player_details)
 
 /datum/player_details
+	/// The ckey of the player this is tied to.
+	var/ckey
 	/// Action datums assigned to this player
 	var/list/datum/action/player_actions = list()
 	/// Tracks client action logging
@@ -21,8 +23,9 @@ GLOBAL_LIST_EMPTY_TYPED(player_details, /datum/player_details)
 	/// Tracks achievements they have earned
 	var/datum/achievement_data/achievements
 
-/datum/player_details/New(key)
-	achievements = new(key)
+/datum/player_details/New(player_key)
+	src.ckey = ckey(player_key)
+	achievements = new(src.ckey)
 
 /// Returns the full version string (i.e 515.1642) of the BYOND version and build.
 /datum/player_details/proc/full_byond_version()
@@ -31,13 +34,10 @@ GLOBAL_LIST_EMPTY_TYPED(player_details, /datum/player_details)
 	return "[byond_version].[byond_build || "xxx"]"
 
 /proc/log_played_names(ckey, ...)
-	if(!ckey)
-		return
-	if(args.len < 2)
+	if(!ckey || length(args) < 2)
 		return
 	var/list/names = args.Copy(2)
-	var/datum/player_details/P = GLOB.player_details[ckey]
-	if(P)
-		for(var/name in names)
-			if(name)
-				P.played_names |= name
+	var/datum/player_details/details = GLOB.player_details[ckey]
+	for(var/name in names)
+		if(name)
+			details.played_names |= name

code/modules/client/verbs/ooc.dm

@@ -81,11 +81,11 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8")
 		var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
 		keyname = "[sheet.icon_tag("emoji-heart")][keyname]"
 
-	if(patreon.access_rank > 0)
+	if(player_details.patreon.access_rank > 0)
 		var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
 		keyname = "[sheet.icon_tag("patreon")][keyname]"
 
-	if(twitch.access_rank > 0)
+	if(player_details.twitch.access_rank > 0)
 		var/datum/asset/spritesheet/sheet = get_asset_datum(/datum/asset/spritesheet/chat)
 		keyname = "[sheet.icon_tag("twitch")][keyname]"
 

monkestation/code/datums/meta_tokens.dm

@@ -88,15 +88,14 @@ GLOBAL_LIST_INIT(patreon_etoken_values, list(
 	owner.prefs.save_preferences()
 
 /datum/meta_token_holder/proc/check_for_donator_token()
-	if(!owner.patreon)
+	var/datum/patreon_data/patreon = owner?.player_details?.patreon
+	if(!patreon?.has_access(ACCESS_COMMAND_RANK))
 		return FALSE
-	if(!owner.patreon.has_access(ACCESS_COMMAND_RANK))
-		return
 	var/month_number = text2num(time2text(world.time, "MM"))
 	owner.prefs.token_month = month_number
 	if(owner.prefs.token_month != month_number)
 		owner.prefs.adjust_metacoins(owner?.ckey, 10000, "Monthly Monkecoin rations.", TRUE, FALSE, FALSE)
-	if(!owner.patreon.has_access(ACCESS_TRAITOR_RANK))
+	if(!patreon.has_access(ACCESS_TRAITOR_RANK))
 		owner.prefs.save_preferences()
 		return FALSE
 	if(owner.prefs.token_month == month_number)
@@ -193,7 +192,7 @@ GLOBAL_LIST_INIT(patreon_etoken_values, list(
 	var/month_number = text2num(time2text(world.time, "MM"))
 	if(event_token_month != month_number)
 		event_token_month = month_number
-		event_tokens = GLOB.patreon_etoken_values[checked_client.patreon.owned_rank]
+		event_tokens = GLOB.patreon_etoken_values[checked_client.player_details.patreon.owned_rank]
 		convert_tokens_to_list()
 
 /datum/meta_token_holder/proc/approve_token_event()

monkestation/code/datums/patreon_data.dm

@@ -1,9 +1,6 @@
-/client
-	var/datum/patreon_data/patreon
-
 /datum/patreon_data
-	///the client that owns this data
-	var/client/owner
+	/// The details of the linked player.
+	var/datum/player_details/owner
 	///the stored patreon client key for the information
 	var/client_key
 	///the stored patreon rank collected from the server
@@ -12,42 +9,27 @@
 	var/access_rank = 0
 
 
-/datum/patreon_data/New(client/created_client)
+/datum/patreon_data/New(datum/player_details/owner)
 	. = ..()
-	if(!created_client)
+	if(!owner)
 		return
-
+	src.owner = owner
 	if(!SSdbcore.IsConnected())
 		owned_rank = NUKIE_RANK ///this is a testing variable
 		return
 
-	owner = created_client
-
-	fetch_key(owner.ckey)
-	fetch_rank(owner.ckey)
-
+	fetch_key_and_rank()
 	assign_access_rank()
 
-
-/datum/patreon_data/proc/fetch_key(ckey)
-	var/datum/db_query/query_get_key = SSdbcore.NewQuery("SELECT patreon_key FROM [format_table_name("player")] WHERE ckey = '[ckey]'")
+/datum/patreon_data/proc/fetch_key_and_rank()
+	var/datum/db_query/query_get_key = SSdbcore.NewQuery("SELECT patreon_key, patreon_rank FROM [format_table_name("player")] WHERE ckey = :ckey", list("ckey" = owner.ckey))
 	if(query_get_key.warn_execute())
 		if(query_get_key.NextRow())
 			client_key = query_get_key.item[1]
-	qdel(query_get_key)
-
-/datum/patreon_data/proc/fetch_rank(ckey)
-	var/datum/db_query/query_get_rank = SSdbcore.NewQuery("SELECT patreon_rank FROM [format_table_name("player")] WHERE ckey = '[ckey]'")
-	if(query_get_rank.warn_execute())
-		if(query_get_rank.NextRow())
-			if(query_get_rank.item[1])
-				owned_rank = query_get_rank.item[1]
-				if(owned_rank == "UNSUBBED2")
-					owned_rank = NO_RANK
-			else
+			owned_rank = query_get_key.item[2]
+			if(owned_rank == "UNSUBBED2")
 				owned_rank = NO_RANK
-	qdel(query_get_rank)
-
+	qdel(query_get_key)
 
 /datum/patreon_data/proc/assign_access_rank()
 	switch(owned_rank)
@@ -70,6 +52,4 @@
 	return FALSE
 
 /datum/patreon_data/proc/is_donator()
-	if((owned_rank == NO_RANK) || !owned_rank || (owned_rank == UNSUBBED))
-		return FALSE
-	return TRUE
+	return owned_rank && owned_rank != NO_RANK && owned_rank != UNSUBBED

monkestation/code/datums/twitch_data.dm

@@ -1,45 +1,30 @@
-/client
-	var/datum/twitch_data/twitch
-
 /datum/twitch_data
-	///the client that owns this data
-	var/client/owner
+	/// The details of the linked player.
+	var/datum/player_details/owner
 	///the stored twitch client key for the information
 	var/client_key
 	///the stored twitch rank collected from the server
 	var/owned_rank = NO_TWITCH_SUB
 	///access rank in numbers
 	var/access_rank = 0
 
-
-
-
-/datum/twitch_data/New(client/created_client)
+/datum/twitch_data/New(datum/player_details/owner)
 	. = ..()
-	if(!created_client)
+	if(!owner)
 		return
-
+	src.owner = owner
 	if(!SSdbcore.IsConnected())
 		owned_rank = ACCESS_TWITCH_SUB_TIER_3 ///this is a testing variable
 		return
 
-	owner = created_client
-
-	fetch_rank(owner.ckey)
-
+	fetch_rank()
 	assign_twitch_rank()
 
-
-/datum/twitch_data/proc/fetch_rank(ckey)
-	var/datum/db_query/query_get_rank = SSdbcore.NewQuery("SELECT twitch_rank FROM [format_table_name("player")] WHERE ckey = '[ckey]'")
+/datum/twitch_data/proc/fetch_rank()
+	var/datum/db_query/query_get_rank = SSdbcore.NewQuery("SELECT twitch_rank FROM [format_table_name("player")] WHERE ckey = :ckey", list("ckey" = owner.ckey))
 	if(query_get_rank.warn_execute())
 		if(query_get_rank.NextRow())
-			if(query_get_rank.item[1])
-				owned_rank = query_get_rank.item[1]
-				if(owned_rank == "")
-					owned_rank = NO_TWITCH_SUB
-			else
-				owned_rank = NO_TWITCH_SUB
+			owned_rank = query_get_rank.item[1] || NO_TWITCH_SUB
 	qdel(query_get_rank)
 
 
@@ -60,6 +45,4 @@
 	return FALSE
 
 /datum/twitch_data/proc/is_donator()
-	if(owned_rank != NO_TWITCH_SUB)
-		return TRUE
-	return FALSE
+	return owned_rank != NO_TWITCH_SUB

monkestation/code/modules/client/player_details.dm

@@ -0,0 +1,32 @@
+/datum/player_details
+	/// Patreon data for this player.
+	var/datum/patreon_data/patreon
+	/// Twitch subscription data for this player.
+	var/datum/twitch_data/twitch
+
+/datum/player_details/New(player_key)
+	. = ..()
+	patreon = new(src)
+	twitch = new(src)
+
+/**
+ * Gets a player details instance from a variable, whether it be a mob, a client, or a ckey.
+ */
+/proc/get_player_details(target) as /datum/player_details
+	RETURN_TYPE(/datum/player_details)
+	if(istext(target))
+		return GLOB.player_details[ckey(target)]
+	else if(ismob(target))
+		var/mob/mob_target = target
+		// Check to see if there's a client first.
+		. = mob_target.client?.player_details
+		if(!. && mob_target.ckey)
+			// Do they have a ckey? Let's try that.
+			var/mob_ckey = replacetext(mob_target.ckey, "@", "")
+			return GLOB.player_details[mob_ckey]
+	else if(IS_CLIENT_OR_MOCK(target))
+		var/datum/client_interface/client_target = target
+		return client_target.player_details
+	else if(istype(target, /datum/player_details))
+		return target // well, that was easy
+

monkestation/code/modules/client/preferences/inventory.dm

@@ -44,16 +44,16 @@
 		max_round_coins -= amount
 
 	//Patreon Flat Roundend Bonus
-	if((parent.patreon?.has_access(2)) && donator_multipler)
+	if((parent.player_details.patreon?.has_access(2)) && donator_multipler)
 		amount += DONATOR_ROUNDEND_BONUS
 
 	//Twitch Flat Roundend Bonus
-	if((parent.twitch?.has_access(1)) && donator_multipler)
+	if((parent.player_details.twitch?.has_access(1)) && donator_multipler)
 		amount += DONATOR_ROUNDEND_BONUS
 
 	//Donator Multiplier
 	if(amount > 0 && donator_multipler)
-		switch(parent.patreon.access_rank)
+		switch(parent.player_details.patreon.access_rank)
 			if(ACCESS_COMMAND_RANK)
 				amount *= 1.5
 			if(ACCESS_TRAITOR_RANK)

monkestation/code/modules/ghost_critters/client_addons.dm

@@ -15,7 +15,7 @@
 
 	mobs_to_pick += return_donator_mobs()
 
-	if(!patreon.has_access(ACCESS_ASSISTANT_RANK) && !is_admin(src) && !length(mobs_to_pick))
+	if(!player_details.patreon.has_access(ACCESS_ASSISTANT_RANK) && !is_admin(src) && !length(mobs_to_pick))
 		return pick(basic_list)
 
 	mobs_to_pick += basic_list
@@ -47,7 +47,7 @@
 	var/cooldown_time = get_critter_cooldown()
 	ghost_critter_cooldown = cooldown_time
 
-	if(patreon.has_access(ACCESS_NUKIE_RANK) || is_admin(src))
+	if(player_details.patreon.has_access(ACCESS_NUKIE_RANK) || is_admin(src))
 		created_mob.AddComponent(/datum/component/basic_inhands, y_offset = -6)
 		created_mob.AddComponent(/datum/component/max_held_weight, WEIGHT_CLASS_SMALL)
 		created_mob.AddElement(/datum/element/dextrous)
@@ -64,7 +64,7 @@
 /client/proc/get_critter_cooldown()
 	var/base_time = 25 MINUTES
 
-	switch(patreon.access_rank)
+	switch(player_details.patreon.access_rank)
 		if(0, 1)
 			return base_time
 		if(2)