fix some formatting
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Ben Harris 2020-05-14 23:50:06 -04:00
parent 21f1e95fb8
commit d3600ce568
Signed by: ben
GPG Key ID: 4E0AF802FFF7960C
3 changed files with 12 additions and 25 deletions

View File

@ -51,10 +51,10 @@ namespace IRCStates
var value = string.Empty; var value = string.Empty;
if (split.Length > 1) if (split.Length > 1)
{ {
value = split[1]; value = split[1];
Raw[key] = value; Raw[key] = value;
} }
switch (split[0]) switch (split[0])
{ {
case "NETWORK": case "NETWORK":

View File

@ -11,16 +11,16 @@ namespace IRCStates
if (splitVal == null) return; if (splitVal == null) return;
var split = splitVal.Split(',', 4); var split = splitVal.Split(',', 4);
ListModes = new List<string>(); ListModes = new List<string>();
ListModes.AddRange(split[0].Select(c => c.ToString(CultureInfo.InvariantCulture))); ListModes.AddRange(split[0].Select(c => c.ToString(CultureInfo.InvariantCulture)));
SettingBModes = new List<string>(); SettingBModes = new List<string>();
SettingBModes.AddRange(split[1].Select(c => c.ToString(CultureInfo.InvariantCulture))); SettingBModes.AddRange(split[1].Select(c => c.ToString(CultureInfo.InvariantCulture)));
SettingCModes = new List<string>(); SettingCModes = new List<string>();
SettingCModes.AddRange(split[2].Select(c => c.ToString(CultureInfo.InvariantCulture))); SettingCModes.AddRange(split[2].Select(c => c.ToString(CultureInfo.InvariantCulture)));
SettingDModes = new List<string>(); SettingDModes = new List<string>();
SettingDModes.AddRange(split[3].Select(c => c.ToString(CultureInfo.InvariantCulture))); SettingDModes.AddRange(split[3].Select(c => c.ToString(CultureInfo.InvariantCulture)));
} }

View File

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.Design;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using IRCTokens; using IRCTokens;
@ -12,7 +11,7 @@ namespace IRCStates
public const string WhoType = "525"; // randomly generated public const string WhoType = "525"; // randomly generated
private readonly StatefulDecoder _decoder; private readonly StatefulDecoder _decoder;
private Dictionary<string, string> TempCaps; private readonly Dictionary<string, string> TempCaps;
public Server(string name) public Server(string name)
{ {
@ -168,10 +167,7 @@ namespace IRCStates
var channelUser = channel.Users[nicknameLower]; var channelUser = channel.Users[nicknameLower];
if (add) if (add)
{ {
if (!channelUser.Modes.Contains(c)) if (!channelUser.Modes.Contains(c)) channelUser.Modes.Add(c);
{
channelUser.Modes.Add(c);
}
} }
else if (channelUser.Modes.Contains(c)) else if (channelUser.Modes.Contains(c))
{ {
@ -555,19 +551,16 @@ namespace IRCStates
target = target.Substring(1); target = target.Substring(1);
} }
else else
{
break; break;
}
} }
emit.Target = line.Params[0]; emit.Target = line.Params[0];
if (IsChannel(target) && HasChannel(target)) if (IsChannel(target) && HasChannel(target))
{ emit.Channel = Channels[CaseFold(target)];
emit.Channel = Channels[CaseFold(target)]; else if (IsMe(target)) emit.SelfTarget = true;
}
else if (IsMe(target))
{
emit.SelfTarget = true;
}
return emit; return emit;
} }
@ -578,9 +571,7 @@ namespace IRCStates
.TrimStart('+') .TrimStart('+')
.Select(m => m.ToString(CultureInfo.InvariantCulture)) .Select(m => m.ToString(CultureInfo.InvariantCulture))
.Where(m => !Modes.Contains(m))) .Where(m => !Modes.Contains(m)))
{
Modes.Add(c); Modes.Add(c);
}
return new Emit(); return new Emit();
} }
@ -614,7 +605,6 @@ namespace IRCStates
var tokens = new List<string>(); var tokens = new List<string>();
foreach (var c in modeString) foreach (var c in modeString)
{
if (new[] {'+', '-'}.Contains(c)) if (new[] {'+', '-'}.Contains(c))
{ {
modifier = c; modifier = c;
@ -624,7 +614,6 @@ namespace IRCStates
modes.Add((modifier == '+', c.ToString(CultureInfo.InvariantCulture))); modes.Add((modifier == '+', c.ToString(CultureInfo.InvariantCulture)));
tokens.Add($"{modifier}{c}"); tokens.Add($"{modifier}{c}");
} }
}
emit.Tokens = tokens; emit.Tokens = tokens;
@ -632,11 +621,9 @@ namespace IRCStates
{ {
emit.SelfTarget = true; emit.SelfTarget = true;
foreach (var (add, c) in modes) foreach (var (add, c) in modes)
{
if (add && !Modes.Contains(c)) if (add && !Modes.Contains(c))
Modes.Add(c); Modes.Add(c);
else if (Modes.Contains(c)) Modes.Remove(c); else if (Modes.Contains(c)) Modes.Remove(c);
}
} }
else if (HasChannel(target)) else if (HasChannel(target))
{ {