From ca1c92b48c0730e16425596e373c5e5b841b4d41 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 12 Jun 2017 06:04:23 -0400 Subject: [PATCH] Fixes Discord Private Message Commands (#44) * Fix log name * Fix these line endings * Fix Discord private messages --- TGServerService/Chat.cs | 2 +- TGServerService/Discord.cs | 2 +- TGServiceInterface/Repository.cs | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/TGServerService/Chat.cs b/TGServerService/Chat.cs index 75343f3a0c..65e1499d3c 100644 --- a/TGServerService/Chat.cs +++ b/TGServerService/Chat.cs @@ -123,7 +123,7 @@ namespace TGServerService //Do stuff with words that were spoken to us string ChatCommand(string command, string speaker, string channel, IList parameters) { - TGServerService.WriteLog(String.Format("IRC Command from {0}: {1} {2}", speaker, command, String.Join(" ", parameters))); + TGServerService.WriteLog(String.Format("Chat Command from {0}: {1} {2}", speaker, command, String.Join(" ", parameters))); switch (command) { case "check": diff --git a/TGServerService/Discord.cs b/TGServerService/Discord.cs index 076d375a84..322037d28b 100644 --- a/TGServerService/Discord.cs +++ b/TGServerService/Discord.cs @@ -140,7 +140,7 @@ namespace TGServerService { var tasks = new List(); var Config = Properties.Settings.Default; - var channel = Convert.ToUInt32(channelname); + var channel = Convert.ToUInt64(channelname); if (SeenPrivateChannels.ContainsKey(channel)) SeenPrivateChannels[channel].SendMessage(message).Wait(); else diff --git a/TGServiceInterface/Repository.cs b/TGServiceInterface/Repository.cs index da6440cf1b..f853ef1004 100644 --- a/TGServiceInterface/Repository.cs +++ b/TGServiceInterface/Repository.cs @@ -72,7 +72,7 @@ namespace TGServiceInterface /// true if the repository is valid, false otherwise [OperationContract] bool Exists(); - + /// /// Deletes whatever may be left over and clones the repo at remote and checks out branch master /// Will move config and data dirs to a backup location if they exist @@ -91,7 +91,7 @@ namespace TGServiceInterface /// The sha of the current HEAD on success, null on failure [OperationContract] string GetHead(out string error); - + /// /// Gets the name of the current branch /// @@ -99,7 +99,7 @@ namespace TGServiceInterface /// The name of the current branch on success, null on failure [OperationContract] string GetBranch(out string error); - + /// /// Gets the url of the current origin /// @@ -107,7 +107,7 @@ namespace TGServiceInterface /// The url of the current origin on success, null on failure [OperationContract] string GetRemote(out string error); - + /// /// Hard checks out the passed object name /// @@ -131,7 +131,7 @@ namespace TGServiceInterface /// null on success, error message on failure [OperationContract] string Reset(bool tracked); - + /// /// Merges the target pull request into the current branch if the remote is a github repository ///