Skip to content

Commit fbaddba

Browse files
LacywayLacyway
authored
Merge pull request #15 from project-fika/dev-1.0.2
Dev > main
2 parents 0b0013c + f0e499d commit fbaddba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+180
-169
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,9 @@ MigrationBackup/
362362
# Fody - auto-generated XML schema
363363
FodyWeavers.xsd
364364

365+
# Rider
366+
/.idea/*
367+
365368
# Fika
366369
/FikaServer/Properties/launchSettings.json
367370
/FikaWebApp/fikaWebApp.db
@@ -374,4 +377,4 @@ FodyWeavers.xsd
374377
/FikaWebApp/Properties/serviceDependencies.json
375378
/FikaWebApp/appsettings.json
376379
/FikaWebApp/appsettings.Development.json
377-
/.idea/*
380+
/FikaWebApp/database

‎FikaServer/Callbacks/HeadlessCallbacks.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
using FikaServer.Controllers;
2-
using FikaServer.Models.Fika.Routes.Raid;
32
using SPTarkov.DI.Annotations;
43
using SPTarkov.Server.Core.Models.Common;
54
using SPTarkov.Server.Core.Models.Eft.Common;
6-
using SPTarkov.Server.Core.Models.Utils;
75
using SPTarkov.Server.Core.Utils;
86

97
namespace FikaServer.Callbacks;

‎FikaServer/Controllers/FikaDialogueController.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
using SPTarkov.Server.Core.Models.Eft.Profile;
1212
using SPTarkov.Server.Core.Models.Eft.Ws;
1313
using SPTarkov.Server.Core.Models.Enums;
14-
using SPTarkov.Server.Core.Models.Spt.Config;
1514
using SPTarkov.Server.Core.Models.Utils;
1615
using SPTarkov.Server.Core.Servers;
1716
using SPTarkov.Server.Core.Servers.Ws;

‎FikaServer/Controllers/RaidController.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
using SPTarkov.Server.Core.Models.Common;
1717
using SPTarkov.Server.Core.Models.Eft.InRaid;
1818
using SPTarkov.Server.Core.Models.Utils;
19-
using static System.Runtime.InteropServices.JavaScript.JSType;
2019

2120
namespace FikaServer.Controllers;
2221

@@ -42,7 +41,7 @@ public async Task<FikaRaidCreateResponse> HandleRaidCreate(FikaRaidCreateRequest
4241
hostUsername = headlessHelper.GetHeadlessNickname(request.ServerId);
4342
}
4443

45-
var requesterName = headlessHelper.GetRequesterUsername(request.ServerId) ?? "";
44+
var requesterName = headlessHelper.GetRequesterUsername(request.ServerId) ?? hostUsername;
4645

4746
await notificationWebSocket.BroadcastAsync(new StartRaidNotification
4847
{
@@ -53,7 +52,7 @@ await notificationWebSocket.BroadcastAsync(new StartRaidNotification
5352
RaidTime = request.Time
5453
});
5554

56-
await webhookService.SendWebhookMessage($"{requesterName ?? hostUsername} has started a raid on {request.Settings.Location.ToFikaLocation()}.");
55+
await webhookService.SendWebhookMessage($"{requesterName} has started a raid on {request.Settings.Location.ToLower().ToFikaLocation()}.");
5756

5857
return new FikaRaidCreateResponse
5958
{

‎FikaServer/ExtensionMethods.cs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -78,38 +78,38 @@ public static EFikaLocation ToFikaLocation(this string location)
7878
"sandbox" or "sandbox_high" => EFikaLocation.GroundZero,
7979
"shoreline" => EFikaLocation.Shoreline,
8080
"tarkovstreets" => EFikaLocation.Streets,
81-
"woods" => EFikaLocation.Streets,
81+
"woods" => EFikaLocation.Woods,
8282
_ => EFikaLocation.None,
8383
};
8484
}
8585

8686
public static EFikaLocation ToFikaLocation(this FikaPlayerPresence presence)
8787
{
88-
if (presence.Activity is EFikaPlayerPresences.IN_HIDEOUT)
88+
if (presence.RaidInformation != null)
8989
{
90-
return EFikaLocation.Hideout;
90+
return presence.RaidInformation.Location switch
91+
{
92+
"bigmap" => EFikaLocation.Customs,
93+
"factory4_day" or "factory4_night" => EFikaLocation.Factory,
94+
"interchange" => EFikaLocation.Interchange,
95+
"laboratory" => EFikaLocation.Laboratory,
96+
"labyrinth" => EFikaLocation.Labyrinth,
97+
"lighthouse" => EFikaLocation.Lighthouse,
98+
"rezervbase" => EFikaLocation.Reserve,
99+
"sandbox" or "sandbox_high" => EFikaLocation.GroundZero,
100+
"shoreline" => EFikaLocation.Shoreline,
101+
"tarkovstreets" => EFikaLocation.Streets,
102+
"woods" => EFikaLocation.Woods,
103+
_ => EFikaLocation.None,
104+
};
91105
}
92106

93-
if (presence.Activity is not EFikaPlayerPresences.IN_RAID)
107+
if (presence.Activity is EFikaPlayerPresences.IN_HIDEOUT)
94108
{
95-
return EFikaLocation.None;
109+
return EFikaLocation.Hideout;
96110
}
97111

98-
return presence.RaidInformation?.Location switch
99-
{
100-
"bigmap" => EFikaLocation.Customs,
101-
"factory4_day" or "factory4_night" => EFikaLocation.Factory,
102-
"interchange" => EFikaLocation.Interchange,
103-
"laboratory" => EFikaLocation.Laboratory,
104-
"labyrinth" => EFikaLocation.Labyrinth,
105-
"lighthouse" => EFikaLocation.Lighthouse,
106-
"rezervbase" => EFikaLocation.Reserve,
107-
"sandbox" or "sandbox_high" => EFikaLocation.GroundZero,
108-
"shoreline" => EFikaLocation.Shoreline,
109-
"tarkovstreets" => EFikaLocation.Streets,
110-
"woods" => EFikaLocation.Streets,
111-
_ => EFikaLocation.None,
112-
};
112+
return EFikaLocation.None;
113113
}
114114

115115
/// <summary>

‎FikaServer/Models/Fika/Config/FikaConfigHeadless.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Text.Json.Serialization;
2-
using static System.Net.WebRequestMethods;
32

43
namespace FikaServer.Models.Fika.Config;
54

‎FikaServer/Models/Fika/FikaMatch.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using SPTarkov.Server.Core.Models.Common;
33
using SPTarkov.Server.Core.Models.Eft.Common;
44
using SPTarkov.Server.Core.Models.Eft.Match;
5-
using System.Diagnostics.CodeAnalysis;
65
using System.Text.Json.Serialization;
76

87
namespace FikaServer.Models.Fika;

‎FikaServer/Models/Servers/NatPunchServerPeer.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ public class NatPunchServerPeer
66
{
77
public IPEndPoint InternalAddr { get; }
88
public IPEndPoint ExternalAddr { get; }
9+
public DateTime CreationTime { get; }
910

1011
public NatPunchServerPeer(IPEndPoint internalAddr, IPEndPoint externalAddr)
1112
{
1213
InternalAddr = internalAddr;
1314
ExternalAddr = externalAddr;
15+
CreationTime = DateTime.UtcNow;
1416
}
1517
}

‎FikaServer/Networking/LiteNetLib/BaseChannel.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using System.Collections.Generic;
2-
using System.Threading;
3-
4-
namespace FikaServer.Networking.LiteNetLib;
1+
namespace Fika.Core.Networking.LiteNetLib;
52

63
internal abstract class BaseChannel
74
{

‎FikaServer/Networking/LiteNetLib/ConnectionRequest.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#nullable disable
2-
using Fika.Core.Networking.LiteNetLib;
32
using FikaServer.Networking.LiteNetLib.Utils;
43
using System.Net;
54

6-
namespace FikaServer.Networking.LiteNetLib;
5+
namespace Fika.Core.Networking.LiteNetLib;
76

87
internal enum ConnectionRequestResult
98
{

0 commit comments

Comments
 (0)