From 0c2bab4a94e56e387942f7e851913192c69b9320 Mon Sep 17 00:00:00 2001 From: flashwave Date: Fri, 19 May 2017 01:04:45 +0200 Subject: [PATCH] debug stuff i think --- Maki/Discord.cs | 27 ++++++++++++++++++--------- Maki/DiscordServer.cs | 4 +++- Maki/Rest/RestClient.cs | 4 ++-- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Maki/Discord.cs b/Maki/Discord.cs index 877f0ae..46a31bc 100644 --- a/Maki/Discord.cs +++ b/Maki/Discord.cs @@ -21,6 +21,12 @@ namespace Maki /// public class Discord : IDisposable { + // temporary, whether gateway data should be written to a file + public bool LogGateway = false; + + // temporary, whether rest data should be written to the console + public bool LogRest = false; + /// /// Discord Gateway/API version we're targeting /// @@ -810,16 +816,19 @@ namespace Maki private void ShardManager_OnSocketMessage(GatewayShard shard, string text) { - if (!Directory.Exists("Json")) - Directory.CreateDirectory("Json"); + if (LogGateway) + { + if (!Directory.Exists("Json")) + Directory.CreateDirectory("Json"); - File.WriteAllText( - $"Json/{DateTime.Now:yyyy-MM-dd HH-mm-ss.fffffff}.json", - JsonConvert.SerializeObject( - JsonConvert.DeserializeObject(text), - Formatting.Indented - ) - ); + File.WriteAllText( + $"Json/{DateTime.Now:yyyy-MM-dd HH-mm-ss.fffffff}.json", + JsonConvert.SerializeObject( + JsonConvert.DeserializeObject(text), + Formatting.Indented + ) + ); + } } #region IDisposable diff --git a/Maki/DiscordServer.cs b/Maki/DiscordServer.cs index f3f06b1..f8fdc80 100644 --- a/Maki/DiscordServer.cs +++ b/Maki/DiscordServer.cs @@ -15,8 +15,10 @@ namespace Maki public string Name { get; internal set; } public ulong OwnerId { get; internal set; } - public DiscordMember Owner => Members.Where(x => x.User.Id == OwnerId).FirstOrDefault(); public DiscordMember[] Members => client.members.Where(x => x.Server == this).ToArray(); + public DiscordMember Owner => Members.Where(x => x.User.Id == OwnerId).FirstOrDefault(); + public DiscordMember Me => Members.Where(x => x.User == client.Me).FirstOrDefault(); + public DiscordRole[] Roles => client.roles.Where(x => x.Server == this).ToArray(); internal DiscordServer(Discord discord, Guild guild) diff --git a/Maki/Rest/RestClient.cs b/Maki/Rest/RestClient.cs index 00227f9..2bccdf1 100644 --- a/Maki/Rest/RestClient.cs +++ b/Maki/Rest/RestClient.cs @@ -1,7 +1,6 @@ using Maki.Structures.Rest; using Newtonsoft.Json; using System; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Net; @@ -112,7 +111,8 @@ namespace Maki.Rest response.ErrorMessage = error.Message; } - Console.WriteLine(response.RawResponse); + if (client.LogRest) + Console.WriteLine(response.RawResponse); if (response.Status == 200) response.Response = JsonConvert.DeserializeObject(response.RawResponse);