fix issue with detecting bans on accounts with new ips when implicit linking is disabled

Application/API/Master/ApiInstance.cs

@@ -22,7 +22,7 @@ namespace IW4MAdmin.Application.API.Master
         public int Uptime { get; set; }
 
         /// <summary>
-        /// Specifices the version of the instance
+        /// Specifies the version of the instance
         /// </summary>
         [JsonProperty("version")]
         [JsonConverter(typeof(BuildNumberJsonConverter))]
@@ -33,5 +33,11 @@ namespace IW4MAdmin.Application.API.Master
         /// </summary>
         [JsonProperty("servers")]
         public List<ApiServer> Servers { get; set; }
+        
+        /// <summary>
+        /// Url IW4MAdmin is listening on
+        /// </summary>
+        [JsonProperty("webfront_url")]
+        public string WebfrontUrl { get; set; }
     }
 }

Application/Misc/MasterCommunication.cs

@@ -179,7 +179,8 @@ namespace IW4MAdmin.Application.Misc
                                 Id = s.EndPoint,
                                 Port = (short)s.Port,
                                 IPAddress = s.IP
-                            }).ToList()
+                            }).ToList(),
+                WebfrontUrl = _appConfig.WebfrontUrl
             };
 
             Response<ResultMessage> response = null;

SharedLibraryCore/Services/PenaltyService.cs

@@ -162,15 +162,29 @@ namespace SharedLibraryCore.Services
                 .Where(p => p.LinkId == linkId)
                 .Where(filter);
 
-            var iqIpPenalties = _appConfig.EnableImplicitAccountLinking
+            IQueryable<EFPenalty> iqIpPenalties;
-                ? context.Aliases
+            
+            if (_appConfig.EnableImplicitAccountLinking)
+            {
+               iqIpPenalties = context.Aliases
                     .Where(a => a.IPAddress != null && a.IPAddress == ip)
                     .SelectMany(a => a.Link.ReceivedPenalties)
-                    .Where(filter)
-                : context.Penalties.Where(penalty =>
-                        penalty.Offender.CurrentAlias.IPAddress != null &&
-                        penalty.Offender.CurrentAlias.IPAddress == ip)
                     .Where(filter);
+            }
+            else
+            {
+                var aliasIps = await context.Aliases.Where(alias => alias.LinkId == linkId && alias.IPAddress != null)
+                    .Select(alias => alias.IPAddress)
+                    .ToListAsync();
+                if (ip != null)
+                {
+                    aliasIps.Add(ip);
+                }
+
+                iqIpPenalties = context.Penalties
+                    .Where(penalty => aliasIps.Contains(penalty.Offender.CurrentAlias.IPAddress))
+                    .Where(filter);
+            }
 
             var activePenalties = (await iqLinkPenalties.ToListAsync())
                 .Union(await iqIpPenalties.ToListAsync())

WebfrontCore/Views/Shared/_Layout.cshtml

@@ -202,6 +202,6 @@
             });
     </script>
     @await RenderSectionAsync("scripts", required: false)
-    @Html.Raw(ViewBag.ScriptInjection);
+    @Html.Raw(ViewBag.ScriptInjection)
 </body>
 </html>

WebfrontCore/WebfrontCore.csproj

@@ -78,10 +78,6 @@
     </Content>
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Remove="Views\Plugins\**" />
-  </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Remove="Views\Plugins\**" />
   </ItemGroup>
@@ -96,7 +92,7 @@
     <Exec Command="if $(ConfigurationName) == Debug ( &#xD;&#xA;powershell -Command wget https://raw.githubusercontent.com/iconic/open-iconic/master/font/css/open-iconic-bootstrap.scss -o $(ProjectDir)wwwroot\lib\open-iconic\font\css\open-iconic-bootstrap.scss&#xD;&#xA;echo d | xcopy /f /y $(ProjectDir)wwwroot\lib\open-iconic\font\fonts $(ProjectDir)wwwroot\font\&#xD;&#xA;)" />
   </Target>
 
-  <Target Name="MyPreCompileTarget" BeforeTargets="Build">
+  <Target Name="MyPreCompileTarget" BeforeTargets="Build" Condition="'$(Configuration)'!='Debug'">
    <Exec Command="dotnet bundle" />
   </Target>
 </Project>