Unify this shit

This commit is contained in:
Jordan Brown
2018-07-16 19:45:08 -04:00
parent 4298c81d07
commit dc0e4f1232
2 changed files with 11 additions and 15 deletions
+10 -7
View File
@@ -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
+1 -8
View File
@@ -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)