From 55e152f4aaae797519e3438419be9b56d7acbea0 Mon Sep 17 00:00:00 2001
From: runebaas <runebaas@gmail.com>
Date: Wed, 2 May 2018 23:32:40 +0200
Subject: [PATCH] Update Readme and add token parameter

---
 Geekbot.net/Geekbot.net.csproj   |  2 +-
 Geekbot.net/Lib/GeekbotLogger.cs |  6 +++---
 Geekbot.net/Lib/RunParameters.cs |  3 +++
 Geekbot.net/Program.cs           |  3 +--
 readme.md                        | 10 +---------
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/Geekbot.net/Geekbot.net.csproj b/Geekbot.net/Geekbot.net.csproj
index cf7e5f9..ba9faed 100755
--- a/Geekbot.net/Geekbot.net.csproj
+++ b/Geekbot.net/Geekbot.net.csproj
@@ -3,7 +3,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <ApplicationIcon>derp.ico</ApplicationIcon>
-    <Version>1.1.0</Version>
+    <Version>3.6.0</Version>
     <Company>Pizza and Coffee Studios</Company>
     <Authors>Pizza and Coffee Studios</Authors>
     <Description>A Discord bot</Description>
diff --git a/Geekbot.net/Lib/GeekbotLogger.cs b/Geekbot.net/Lib/GeekbotLogger.cs
index aae0978..7093a7c 100644
--- a/Geekbot.net/Lib/GeekbotLogger.cs
+++ b/Geekbot.net/Lib/GeekbotLogger.cs
@@ -5,13 +5,13 @@ namespace Geekbot.net.Lib
 {
     public class GeekbotLogger : IGeekbotLogger
     {
-        private readonly bool _sumologicActive;
+        private readonly bool _logAsJson;
         private readonly NLog.Logger _logger;
         private readonly JsonSerializerSettings _serializerSettings;
 
         public GeekbotLogger(RunParameters runParameters, bool sumologicActive)
         {
-            _sumologicActive = sumologicActive;
+            _logAsJson = sumologicActive || runParameters.LogJson;
             _logger = LoggerFactory.CreateNLog(runParameters, sumologicActive);
             _serializerSettings = new JsonSerializerSettings
             {
@@ -43,7 +43,7 @@ namespace Geekbot.net.Lib
 
         private string CreateLogString(string type, string source, string message, Exception stackTrace = null, object extra = null)
         {
-            if (_sumologicActive)
+            if (_logAsJson)
             {
                 var logObject = new GeekbotLoggerObject
                 {
diff --git a/Geekbot.net/Lib/RunParameters.cs b/Geekbot.net/Lib/RunParameters.cs
index 0549ac5..35c1a2a 100644
--- a/Geekbot.net/Lib/RunParameters.cs
+++ b/Geekbot.net/Lib/RunParameters.cs
@@ -19,5 +19,8 @@ namespace Geekbot.net.Lib
 
         [Option('e', "expose-errors", Default = false, HelpText = "Shows internal errors in the chat")]
         public bool ExposeErrors { get; set; }
+        
+        [Option("token", Default = null, HelpText = "Set a new bot token")]
+        public string Token { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Geekbot.net/Program.cs b/Geekbot.net/Program.cs
index 39e5e8b..3c0e5eb 100755
--- a/Geekbot.net/Program.cs
+++ b/Geekbot.net/Program.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Text;
@@ -84,7 +83,7 @@ namespace Geekbot.net
                 Environment.Exit(102);
             }
             
-            _token = _redis.StringGet("discordToken");
+            _token = runParameters.Token ??_redis.StringGet("discordToken");
             if (_token.IsNullOrEmpty)
             {
                 Console.Write("Your bot Token: ");
diff --git a/readme.md b/readme.md
index be5ba0a..7d8544f 100644
--- a/readme.md
+++ b/readme.md
@@ -11,7 +11,6 @@ You can invite Geekbot to your server with [this link](https://discordapp.com/oa
 * DotNet Core 2
 * Redis
 * Discord.net
-* ffmpeg
 
 ## Running
 
@@ -24,14 +23,7 @@ Run these commands
 
 On your first run geekbot will ask for your bot token, everything else is taken care of.
 
-### Launch Parameters
-
-| Parameter | Description |
-| --- | --- |
-| `--verbose` | Show more log information |
-| `--disable-api` | Disables the webapi on startup |
-| `--reset` | Resets certain parts of the bot |
-| `--migrate` | Migrates the database from V3.1 to the new format from V3.2<br> (make sure to backup before running this) | 
+For a list of launch options use `dotnet run -h` 
 
 ## Contributing