diff options
| author | Michael <[email protected]> | 2017-02-13 13:12:51 -0500 |
|---|---|---|
| committer | Michael <[email protected]> | 2017-02-13 13:12:58 -0500 |
| commit | d3a70b7a39bf1c73ff0463a8f06c82359a672bb0 (patch) | |
| tree | 9133ed712cafeec872ca5010bc4e1823726fcc5d | |
| parent | 15cf720b7e0042f8e0fc30d23ac4c468a39a5a42 (diff) | |
| download | shiftos_thereturn-d3a70b7a39bf1c73ff0463a8f06c82359a672bb0.tar.gz shiftos_thereturn-d3a70b7a39bf1c73ff0463a8f06c82359a672bb0.tar.bz2 shiftos_thereturn-d3a70b7a39bf1c73ff0463a8f06c82359a672bb0.zip | |
Discord Integration client-side
| -rw-r--r-- | ShiftOS.WinForms/Applications/Chat.cs | 17 | ||||
| -rw-r--r-- | ShiftOS_TheReturn/Shiftorium.cs | 9 |
2 files changed, 21 insertions, 5 deletions
diff --git a/ShiftOS.WinForms/Applications/Chat.cs b/ShiftOS.WinForms/Applications/Chat.cs index 14eb023..48b40de 100644 --- a/ShiftOS.WinForms/Applications/Chat.cs +++ b/ShiftOS.WinForms/Applications/Chat.cs @@ -50,10 +50,17 @@ namespace ShiftOS.WinForms.Applications { this.Invoke(new Action(() => { - - var cmsg = JsonConvert.DeserializeObject<ShiftOS.Objects.ChatMessage>(msg.Contents); - if(id == cmsg.Channel) - rtbchat.AppendText($"[{cmsg.Username}@{cmsg.SystemName}] {cmsg.Message}{Environment.NewLine}"); + try + { + var args = JsonConvert.DeserializeObject<Dictionary<string, string>>(msg.Contents); + var cmsg = new ShiftOS.Objects.ChatMessage(args["Username"] as string, args["SystemName"] as string, args["Message"] as string, args["Channel"] as string); + if (id == cmsg.Channel) + rtbchat.AppendText($"[{cmsg.Username}@{cmsg.SystemName}] {cmsg.Message}{Environment.NewLine}"); + } + catch (Exception ex) + { + rtbchat.AppendText($"[system@multiuserdomain] Exception thrown by client: {ex}"); + } })); } catch { } @@ -63,6 +70,8 @@ namespace ShiftOS.WinForms.Applications public void SendMessage(string msg) { + rtbchat.AppendText($"[{SaveSystem.CurrentSave.Username}@{SaveSystem.CurrentSave.SystemName}] {msg}{Environment.NewLine}"); + ServerManager.SendMessage("chat_send", JsonConvert.SerializeObject(new ShiftOS.Objects.ChatMessage(SaveSystem.CurrentSave.Username, SaveSystem.CurrentSave.SystemName, msg, id))); } diff --git a/ShiftOS_TheReturn/Shiftorium.cs b/ShiftOS_TheReturn/Shiftorium.cs index 8350dc3..b91e421 100644 --- a/ShiftOS_TheReturn/Shiftorium.cs +++ b/ShiftOS_TheReturn/Shiftorium.cs @@ -136,7 +136,14 @@ namespace ShiftOS.Engine { if (!SaveSystem.CurrentSave.Upgrades.ContainsKey(itm.ID)) { - SaveSystem.CurrentSave.Upgrades.Add(itm.ID, false); + try + { + SaveSystem.CurrentSave.Upgrades.Add(itm.ID, false); + } + catch + { + + } } } } |