Adjust Codestyle

9 files changed, 68 insertions, 136 deletions

diff --git a/DSACore/Controllers/CommandsController.cs b/DSACore/Controllers/CommandsController.cs
index b6e0be2..2edbbaf 100644
--- a/DSACore/Controllers/CommandsController.cs
+++ b/DSACore/Controllers/CommandsController.cs
@@ -1,20 +1,16 @@
 using System;
-using DSACore.Models.Network;
 using DSALib.Commands;
 using DSALib.Models.Network;
 using Microsoft.AspNetCore.Mvc;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 
-namespace DSACore.Controllers
-{
+namespace DSACore.Controllers {
     [Route("dsa/[controller]")]
-    public class CommandsController : Controller
-    {
+    public class CommandsController : Controller {
         // GET: api/<controller>
         [HttpGet]
-        public string Get()
-        {
+        public string Get() {
             return "Usage: post the command to execute";
         }
 
@@ -27,14 +23,11 @@ namespace DSACore.Controllers
 
         // POST api/<controller>/Felis
         [HttpPost]
-        public string Post([FromBody] Command cmd)
-        {
-            try
-            {
+        public string Post([FromBody] Command cmd) {
+            try {
                 return CommandHandler.ExecuteCommand(cmd).message;
             }
-            catch (Exception e)
-            {
+            catch (Exception e) {
                 return $"Ein Fehler ist aufgetreten: \n {e.Message}";
             }
         }
diff --git a/DSACore/Controllers/LobbyController.cs b/DSACore/Controllers/LobbyController.cs
index 7890b4f..41ce436 100644
--- a/DSACore/Controllers/LobbyController.cs
+++ b/DSACore/Controllers/LobbyController.cs
@@ -1,30 +1,23 @@
 using System;
-using DSACore.Models.Network;
 using DSALib.Commands;
 using DSALib.Models.Network;
 using Microsoft.AspNetCore.Mvc;
 
-namespace DSACore.Controllers
-{
-    public class ScribbleController : Controller
-    {
+namespace DSACore.Controllers {
+    public class ScribbleController : Controller {
         [Route("[controller]")]
         // GET: api/<controller>
         [HttpGet]
-        public string Get()
-        {
+        public string Get() {
             return "Usage: get /tokens/{Token}";
         }
 
         [HttpPost]
-        public string Post([FromBody] Command cmd)
-        {
-            try
-            {
+        public string Post([FromBody] Command cmd) {
+            try {
                 return CommandHandler.ExecuteCommand(cmd).message;
             }
-            catch (Exception e)
-            {
+            catch (Exception e) {
                 return $"Ein Fehler ist aufgetreten: \n {e.Message}";
             }
         }
diff --git a/DSACore/Controllers/TokensController.cs b/DSACore/Controllers/TokensController.cs
index a85cabe..f1ddb37 100644
--- a/DSACore/Controllers/TokensController.cs
+++ b/DSACore/Controllers/TokensController.cs
@@ -1,21 +1,18 @@
 using DSACore.Hubs;
 using Microsoft.AspNetCore.Mvc;
 
-namespace DSACore.Controllers
-{
+namespace DSACore.Controllers {
     [Route("lobby/[controller]")]
     [ApiController]
-    public class TokensController : Controller
-    {
+    public class TokensController : Controller {
         // GET
         [HttpGet("{token}")]
-        public ActionResult<string> Get(string token)
-        {
+        public ActionResult<string> Get(string token) {
             if (!int.TryParse(token, out var intToken))
                 return BadRequest("The token has to be a 32 bit unsigned integer");
 
             if (intToken == 42) return Ok("Scribble");
-            
+
             if (!Users.Tokens.Exists(x => x.GetHashCode() == intToken)) return NotFound();
 
             var group = Users.Tokens.Find(x => x.GetHashCode() == intToken);
diff --git a/DSACore/Hubs/Login.cs b/DSACore/Hubs/Login.cs
index f08c24a..80ee29c 100644
--- a/DSACore/Hubs/Login.cs
+++ b/DSACore/Hubs/Login.cs
@@ -10,18 +10,15 @@ using DSALib.DSA_Game.Characters;
 using DSALib.FireBase;
 using DSALib.Models.Network;
 using Microsoft.AspNetCore.SignalR;
-using Group = DSACore.Models.Network.Group;
 
-namespace DSACore.Hubs
-{
-    public class Users : Hub
-    {
+namespace DSACore.Hubs {
+    public class Users : Hub {
         //private static Dictionary<string, User> UserGroup = new Dictionary<string, User>();
 
         private const string ReceiveMethod = "ReceiveMessage"; //receiveMethod;
 
         static Users() {
-            DsaGroups = Database.GetGroups().Result.Select(x=>new Group(x.Item1, x.Item2)).ToList();
+            DsaGroups = Database.GetGroups().Result.Select(x => new Group(x.Item1, x.Item2)).ToList();
             DsaGroups.Add(new Group("login", ""));
             DsaGroups.Add(new Group("online", ""));
             //AddGroups();
@@ -31,20 +28,16 @@ namespace DSACore.Hubs
         public static List<Token> Tokens { get; } = new List<Token>();
 
 
-        public async Task SendMessage(string user, string message)
-        {
-            try
-            {
+        public async Task SendMessage(string user, string message) {
+            try {
                 var group = getGroup(Context.ConnectionId).Name;
             }
-            catch (InvalidOperationException)
-            {
-                await Clients.Caller.SendCoreAsync(ReceiveMethod, 
-                    new object[] { "Nutzer ist in keiner Gruppe. Erst joinen!" });
+            catch (InvalidOperationException) {
+                await Clients.Caller.SendCoreAsync(ReceiveMethod,
+                    new object[] {"Nutzer ist in keiner Gruppe. Erst joinen!"});
             }
 
-            if (message[0] == '/')
-            {
+            if (message[0] == '/') {
                 var args = message.Split(' ', StringSplitOptions.RemoveEmptyEntries).ToList();
 
                 var Timon = args.Any(x => x == "hallo");
@@ -52,16 +45,14 @@ namespace DSACore.Hubs
                 var ident = args.First().Replace("/", "");
                 if (args.Count > 0) args.RemoveAt(0);
 
-                var ret = CommandHandler.ExecuteCommand(new Command
-                {
+                var ret = CommandHandler.ExecuteCommand(new Command {
                     CharId = 0,
                     CmdIdentifier = ident,
                     CmdTexts = args,
                     Name = user
                 });
 
-                switch (ret.ResponseType)
-                {
+                switch (ret.ResponseType) {
                     case ResponseType.Caller:
                     case ResponseType.Error:
                         await Clients.Caller.SendAsync(ReceiveMethod, ret.message);
@@ -71,34 +62,28 @@ namespace DSACore.Hubs
                         break;
                 }
             }
-            else
-            {
+            else {
                 await SendToGroup(message);
             }
         }
 
-        private Task SendToGroup(string message)
-        {
-            try
-            {
+        private Task SendToGroup(string message) {
+            try {
                 var group = getGroup(Context.ConnectionId).Name;
                 return Clients.Group(group).SendCoreAsync(ReceiveMethod,
                     new object[] {getUser(Context.ConnectionId).Name, message});
             }
-            catch (InvalidOperationException)
-            {
+            catch (InvalidOperationException) {
                 return Clients.Caller.SendCoreAsync(ReceiveMethod,
                     new object[] {"Nutzer ist in keiner Gruppe. Erst joinen!"});
             }
         }
 
-        private Group getGroup(string id)
-        {
+        private Group getGroup(string id) {
             return DsaGroups.First(x => x.Users.Exists(y => y.ConnectionId.Equals(id)));
         }
 
-        private User getUser(string id)
-        {
+        private User getUser(string id) {
             return DsaGroups.First(x => x.Users.Exists(y => y.ConnectionId.Equals(id))).Users
                 .First(z => z.ConnectionId.Equals(id));
         }
@@ -113,8 +98,7 @@ namespace DSACore.Hubs
             //throw new NotImplementedException("add database call to get groups");
         }
 
-        public async Task AddGroup(string group, string password)
-        {
+        public async Task AddGroup(string group, string password) {
             DsaGroups.Add(new Group(group, password));
             var Dgroup = new DSALib.Models.Database.Groups.Group {Name = group, Id = DsaGroups.Count - 1};
             //Database.AddGroup(Dgroup);
@@ -122,22 +106,18 @@ namespace DSACore.Hubs
             //throw new NotImplementedException("add database call to add groups");
         }
 
-        public async Task UploadChar(string xml)
-        {
+        public async Task UploadChar(string xml) {
             var group = getGroup(Context.ConnectionId);
 
             await Database.AddChar(new Character(new MemoryStream(Encoding.UTF8.GetBytes(xml))), group.Name);
             //throw new NotImplementedException("add database call to add groups");
         }
 
-        public async Task Login(string group, string user, string hash)
-        {
+        public async Task Login(string group, string user, string hash) {
             //string password = System.Text.Encoding.UTF8.GetString(hash);
-            if (hash == DsaGroups.First(x => x.Name == group).Password)
-            {
+            if (hash == DsaGroups.First(x => x.Name == group).Password) {
                 var gGroup = DsaGroups.First(x => x.Name.Equals(group));
-                if (!gGroup.Users.Exists(x => x.Name.Equals(user)))
-                {
+                if (!gGroup.Users.Exists(x => x.Name.Equals(user))) {
                     await Groups.RemoveFromGroupAsync(Context.ConnectionId, "login");
                     await Groups.AddToGroupAsync(Context.ConnectionId, group);
                     gGroup.Users.Add(new User {ConnectionId = Context.ConnectionId, Name = user});
@@ -149,42 +129,35 @@ namespace DSACore.Hubs
                     await Clients.Caller.SendAsync("Token", Tokens.Last().GetHashCode());
                     purgeTokens();
                 }
-                else
-                {
+                else {
                     await Clients.Caller.SendAsync("LoginResponse", 1);
                 }
             }
-            else
-            {
+            else {
                 await Clients.Caller.SendAsync("LoginResponse", 2);
                 //await Clients.Caller.SendAsync(receiveMethod, "Falsches Passwort!");
             }
         }
 
-        private void purgeTokens()
-        {
+        private void purgeTokens() {
             Tokens.RemoveAll(x => !x.IsValid());
         }
 
-        public override Task OnDisconnectedAsync(Exception exception)
-        {
+        public override Task OnDisconnectedAsync(Exception exception) {
             Disconnect().Wait();
             return base.OnDisconnectedAsync(exception);
         }
 
-        public override Task OnConnectedAsync()
-        {
+        public override Task OnConnectedAsync() {
             Groups.AddToGroupAsync(Context.ConnectionId, "login").Wait();
             Groups.AddToGroupAsync(Context.ConnectionId, "online").Wait();
             return base.OnConnectedAsync();
         }
 
-        public async Task Disconnect()
-        {
+        public async Task Disconnect() {
             await Groups.RemoveFromGroupAsync(Context.ConnectionId, "online");
             if (DsaGroups.Exists(x => x.Users.Exists(y => y.ConnectionId == Context.ConnectionId)))
-                try
-                {
+                try {
                     var group = getGroup(Context.ConnectionId);
 
 
@@ -195,8 +168,7 @@ namespace DSACore.Hubs
                     group.Users.Remove(user);
                     await Groups.RemoveFromGroupAsync(Context.ConnectionId, group.Name);
                 }
-                catch (Exception e)
-                {
+                catch (Exception e) {
                     Console.WriteLine(e);
                     //throw;
                 }
diff --git a/DSACore/Models/Network/Group.cs b/DSACore/Models/Network/Group.cs
index efe12ee..aee9d02 100644
--- a/DSACore/Models/Network/Group.cs
+++ b/DSACore/Models/Network/Group.cs
@@ -1,18 +1,14 @@
 using System;
 using System.Collections.Generic;
 
-namespace DSACore.Models.Network
-{
-    public class Group
-    {
-        public Group(string name, string password)
-        {
+namespace DSACore.Models.Network {
+    public class Group {
+        public Group(string name, string password) {
             Name = name;
             Password = password;
         }
 
-        public Group(string name, int userOnline)
-        {
+        public Group(string name, int userOnline) {
             Name = name ?? throw new ArgumentNullException(nameof(name));
         }
 
@@ -22,16 +18,13 @@ namespace DSACore.Models.Network
 
         public int UserCount => Users.Count;
 
-        public SendGroup SendGroup()
-        {
+        public SendGroup SendGroup() {
             return new SendGroup(Name, UserCount);
         }
     }
 
-    public class SendGroup
-    {
-        public SendGroup(string name, int userCount)
-        {
+    public class SendGroup {
+        public SendGroup(string name, int userCount) {
             Name = name ?? throw new ArgumentNullException(nameof(name));
             UserCount = userCount;
         }
diff --git a/DSACore/Models/Network/Token.cs b/DSACore/Models/Network/Token.cs
index 451cafc..67b1853 100644
--- a/DSACore/Models/Network/Token.cs
+++ b/DSACore/Models/Network/Token.cs
@@ -1,20 +1,16 @@
 using System;
 
-namespace DSACore.Models.Network
-{
-    public class Token
-    {
+namespace DSACore.Models.Network {
+    public class Token {
         private readonly DateTime creation = DateTime.Now;
 
-        public Token(string group)
-        {
+        public Token(string group) {
             Group = group;
         }
 
         public string Group { get; set; }
 
-        public bool IsValid()
-        {
+        public bool IsValid() {
             return DateTime.Now - creation < TimeSpan.FromMinutes(1);
         }
     }
diff --git a/DSACore/Models/Network/User.cs b/DSACore/Models/Network/User.cs
index 8b8008c..95a12b2 100644
--- a/DSACore/Models/Network/User.cs
+++ b/DSACore/Models/Network/User.cs
@@ -1,7 +1,5 @@
-namespace DSACore.Models.Network
-{
-    public class User
-    {
+namespace DSACore.Models.Network {
+    public class User {
         public string Name { get; set; }
         public string ConnectionId { get; set; }
         public int Char { get; set; }
diff --git a/DSACore/Program.cs b/DSACore/Program.cs
index 8af0a74..2889734 100644
--- a/DSACore/Program.cs
+++ b/DSACore/Program.cs
@@ -3,19 +3,15 @@ using DSALib.FireBase;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 
-namespace DSACore
-{
-    public class Program
-    {
-        public static void Main(string[] args)
-        {
+namespace DSACore {
+    public class Program {
+        public static void Main(string[] args) {
             Database.GetGroup(0).Wait();
             Dsa.Startup();
             CreateWebHostBuilder(args).Build().Run();
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args)
-        {
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args) {
             return WebHost.CreateDefaultBuilder(args)
                 .UseStartup<Startup>()
                 .UseUrls("http://0.0.0.0:5000");
diff --git a/DSACore/Startup.cs b/DSACore/Startup.cs
index ef22802..e325f79 100644
--- a/DSACore/Startup.cs
+++ b/DSACore/Startup.cs
@@ -5,29 +5,23 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace DSACore
-{
-    public class Startup
-    {
-        public Startup(IConfiguration configuration)
-        {
+namespace DSACore {
+    public class Startup {
+        public Startup(IConfiguration configuration) {
             Configuration = configuration;
         }
 
         public IConfiguration Configuration { get; }
 
         // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            
+        public void ConfigureServices(IServiceCollection services) {
             services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
 
             services.AddSignalR();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
-        {
+        public void Configure(IApplicationBuilder app, IHostingEnvironment env) {
             if (env.IsDevelopment())
                 app.UseDeveloperExceptionPage();
             else