Skip to content

Commit

Permalink
remove extra lines
Browse files Browse the repository at this point in the history
  • Loading branch information
GravityWolfNotAmused committed Jan 15, 2024
1 parent d441cd3 commit fe67c53
Show file tree
Hide file tree
Showing 75 changed files with 75 additions and 74 deletions.
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,4 @@ dotnet_style_operator_placement_when_wrapping = beginning_of_line
tab_width = 4
indent_size = 4
end_of_line = crlf
insert_final_newline = false
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ public static void ClearTestEnvironmentVariables()
System.Environment.SetEnvironmentVariable("BOT_APPLICATION_VARIABLES", null);
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Attributes/AttributeHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ public static string GetNameFromAttribute(object obj)
return label;

Check failure on line 9 in DiscordPlayerCountBot/Attributes/AttributeHelper.cs

View workflow job for this annotation

GitHub Actions / dotnet_format

DiscordPlayerCountBot/Attributes/AttributeHelper.cs#L9

ENDOFLINE: Fix end of line marker. Replace 1 characters with '\r\n'.
}

Check failure on line 10 in DiscordPlayerCountBot/Attributes/AttributeHelper.cs

View workflow job for this annotation

GitHub Actions / dotnet_format

DiscordPlayerCountBot/Attributes/AttributeHelper.cs#L10

ENDOFLINE: Fix end of line marker. Replace 1 characters with '\r\n'.
}

Check failure on line 11 in DiscordPlayerCountBot/Attributes/AttributeHelper.cs

View workflow job for this annotation

GitHub Actions / dotnet_format

DiscordPlayerCountBot/Attributes/AttributeHelper.cs#L11

ENDOFLINE: Fix end of line marker. Replace 1 characters with '\r\n'.
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Bot/BotConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ public void CreateDefaults()
ApplicationTokens.Add("BattleMetricsKey", "Here");
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Bot/BotInformation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ public Tuple<string, ushort> GetAddressAndPort()
}
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Configuration/Base/IConfigurable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ public interface IConfigurable
public HostEnvironment GetRequiredEnvironment();
Task<Tuple<Dictionary<string, Bot>, int>> Configure(bool shouldStart = true);
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Configuration/DockerConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,4 @@ public HostEnvironment GetRequiredEnvironment()
return HostEnvironment.DOCKER;
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Configuration/EnvironmentHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ public static Tuple<bool, List<string>> ValidateVariables()
return new(hasAllRequiredVariables, listOfMissingVariableNames);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ public HostEnvironment GetRequiredEnvironment()
return HostEnvironment.STANDARD;
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Data/CFX/CFXPlayerInformation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ public class CFXPlayerInformation
[JsonProperty("ping")]
public int Ping { get; set; }
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Data/CFX/CFXServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ public class CFXVars
}


}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Data/Minecraft/MinecraftDebugInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ public class MinecraftDebugInfo
}


}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Data/Minecraft/MinecraftErrorInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ public class MinecraftErrorInfo
}


}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Data/Minecraft/MinecraftInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ public class MinecraftInfo
}


}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Data/Minecraft/MinecraftMotd.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ public class MinecraftMotd
}


}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ public class MinecraftPlayerInfo
}


}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Data/Minecraft/MinecraftServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ public MinecraftViewModel GetViewModel()
}


}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Data/Scum/ScumProviderResponse.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ public class ScumProviderResponse
return Data.Where(data => data.QueryPort == port || data.Port == port).FirstOrDefault();
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Data/Scum/ScumServerData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ public class ScumServerData
public string? Time { get; set; }
public bool Password { get; set; }
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Data/Steam/SteamApiResponseData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ public int GetQueueCount()
return 0;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ public SteamServerListResponse()
return response.GetAddressDataByPort(port);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ public SteamServerListSubClass()
return null;
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Enums/DataProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ public enum DataProvider
RCONCLIENT,
STEAMQUERY
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Enums/EnumHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ public static int GetActivityType(int value)
}

}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Enums/HostEnviroment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ public enum HostEnvironment
STANDARD,
DOCKER
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Enums/RconServiceType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ public enum RconServiceType
Minecraft,
Ark
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Exceptions/ConfigurationException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ public ConfigurationException(string? message) : base(message)

}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Exceptions/ParsingException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ public ParsingException(string? message) : base(message)

}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ public RconAuthenticationException(string? message) : base(message)
{
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Extensions/DiscordClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ public static async Task SetChannelName(this IDiscordClient socket, ulong? chann
}
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Extensions/StringExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ public static bool TryGetSunMoonPhase(this string timeString, int? sunriseHour,
return !string.IsNullOrEmpty(output);
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Http/AddressHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ public static async Task<string> ResolveAddress(string address)
return resolvedAddress + ":" + port;
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Http/HttpExecuter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ public void Dispose()
return JsonHelper.DeserializeObject<TResponse>(jsonString);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ public override string CreateQueryParameterString()
return filterString;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ public interface IQueryParameterBuilder
{
public string CreateQueryParameterString();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ public virtual string CreateQueryParameterString()
return queryString;
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ public class ScumGetServerInformationQueryParams : QueryParameterBuilder
[Name("port")]
public int? Port { get; set; } = null;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ public class SteamGetServerListQueryParams : QueryParameterBuilder
[Name("filter")]
public string Filter { get; set; }
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Json/JsonHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ public static class JsonHelper
});
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Logging/LoggableClass.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ public string BuildLogMessage(string? id, string label, string msg)
return message + $" - {msg}";
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ public interface IServerInformationProvider
Task<BaseViewModel?> GetServerInformation(BotInformation information, Dictionary<string, string> applicationVariables);
DataProvider GetRequiredProviderType();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ protected void HandleException(Exception e, string? id = null)

public abstract DataProvider GetRequiredProviderType();
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Providers/CFXProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ public override DataProvider GetRequiredProviderType()
}
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Providers/MinecraftProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ public override DataProvider GetRequiredProviderType()
}
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Providers/RconProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ public override DataProvider GetRequiredProviderType()
}
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Providers/ScumProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ public override DataProvider GetRequiredProviderType()
}
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Providers/SteamProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,4 @@ public override DataProvider GetRequiredProviderType()
}
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Providers/SteamQueryProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ public override DataProvider GetRequiredProviderType()
}
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Services/BattleMetricsService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ public class BattleMetricsService : IBattleMetricsService
return response?.data;
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Services/CFXService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ public class CFXService : ICFXService
return await httpClient.GET<object, CFXServer>($"http://{address}/Info.json");
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Services/IBattleMetricsService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ public interface IBattleMetricsService
{
public Task<BattleMetricsServerData?> GetPlayerInformationAsync(string address, string token);
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Services/ICFXService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ public interface ICFXService
public Task<CFXServer?> GetServerInformationAsync(string address);
public Task<List<CFXPlayerInformation>?> GetPlayerInformationAsync(string address);
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Services/IMinecraftService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ public interface IMinecraftService
{
public Task<MinecraftServer?> GetMinecraftServerInformationAsync(string address, int port);
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Services/IScumService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ public interface IScumService
{
public Task<ScumProviderResponse?> GetPlayerInformationAsync(string address, int port);
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Services/ISteamService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ public interface ISteamService
{
public Task<SteamApiResponseData?> GetSteamApiResponse(string address, int port, string token);
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Services/MinecraftService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ public class MinecraftService : IMinecraftService
return await httpClient.GET<object, MinecraftServer>($"https://api.mcsrvstat.us/2/{address}:{port}");
}
}
}
}
2 changes: 1 addition & 1 deletion DiscordPlayerCountBot/Services/Rcon/IRconService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ public interface IRconService
{
public Task<BaseViewModel> GetRconResponse(string address, int port, string authorizationToken, RconServiceType serviceType);
}
}
}
Loading

0 comments on commit fe67c53

Please sign in to comment.