From dc0e4f123202218fbe73d301feacf96b4e6553ed Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 16 Jul 2018 19:45:08 -0400 Subject: [PATCH] Unify this shit --- src/DMAPI/tgs/v4/api.dm | 17 ++++++++++------- src/DMAPI/tgs/v4/commands.dm | 9 +-------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/src/DMAPI/tgs/v4/api.dm b/src/DMAPI/tgs/v4/api.dm index 68c95bec92..a6700ab4e5 100644 --- a/src/DMAPI/tgs/v4/api.dm +++ b/src/DMAPI/tgs/v4/api.dm @@ -203,13 +203,16 @@ //no caching cause tgs may change this var/list/json = json_decode(file2text(chat_channels_json_path)) for(var/I in json) - var/datum/tgs_chat_channel/channel = new - channel.id = I["id"] - channel.friendly_name = I["friendly_name"] - channel.connection_name = I["connection_name"] - channel.is_admin_channel = I["is_admin_channel"] - channel.is_private_channel = FALSE //tgs will never send us pm channels - . += channel + . += DecodeChannel(I) + +/datum/tgs_api/v4/proc/DecodeChannel(channel_json) + var/datum/tgs_chat_channel/channel = new + channel.id = channel_json["id"] + channel.friendly_name = channel_json["friendly_name"] + channel.connection_name = channel_json["connection_name"] + channel.is_admin_channel = channel_json["is_admin_channel"] + channel.is_admin_channel = channel_json["is_private_channel"] || FALSE + return channel #undef TGS4_TOPIC_COMMAND #undef TGS4_TOPIC_TOKEN diff --git a/src/DMAPI/tgs/v4/commands.dm b/src/DMAPI/tgs/v4/commands.dm index 6034affe19..48ca6e98de 100644 --- a/src/DMAPI/tgs/v4/commands.dm +++ b/src/DMAPI/tgs/v4/commands.dm @@ -30,14 +30,7 @@ u.id = user["id"] u.friendly_name = user["friendly_name"] u.mention = user["mention"] - var/datum/tgs_chat_channel/channel = new - u.channel = channel - var/channel_json = user["channel"] - channel.id = channel_json["id"] - channel.friendly_name = channel_json["friendly_name"] - channel.server_name = channel_json["server_name"] - channel.is_admin_channel = channel_json["is_admin_channel"] - channel.is_private_channel = channel_json["is_private_channel"] + u.channel = DecodeChannel(user["channel"]) var/datum/tgs_chat_command/sc = custom_commands[command] var/result = sc.Run(u, params)