shiftos-archive/ShiftOS_TheReturn
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Discord Integration client-side

Browse source
This commit is contained in:
Michael 2017-02-13 13:12:51 -05:00
parent 15cf720b7e
commit d3a70b7a39
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ShiftOS.WinForms/Applications/Chat.cs
View file

@ -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)));
}

9
ShiftOS_TheReturn/Shiftorium.cs
View file

@ -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
{
}
}
}
}