Merge pull request #160 from Saibamen/override_ut4masterserver_port

Override ut4masterserver port for Development
timiimit · Feb 3, 2023 · b0c4db2 · b0c4db2
2 parents e3d0380 + cd8d37d
commit b0c4db2
Show file tree

Hide file tree

Showing 10 changed files with 148 additions and 145 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -12,6 +12,11 @@ tab_width = 4
 indent_size = 4
 indent_style = tab
 
+[UT4MasterServer/**.json]
+tab_width = 4
+indent_size = 4
+indent_style = tab
+
 [*.{md,yml}]
 indent_style = space
 indent_size = 2
diff --git a/UT4MasterServer/CloudstorageSystemfiles/UTMCPPlaylists.json b/UT4MasterServer/CloudstorageSystemfiles/UTMCPPlaylists.json
@@ -1,6 +1,5 @@
 {
-	"NewItems":
-	[
+	"NewItems": [
 		{
 			"PlaylistId": 2,
 			"bRanked": false,

diff --git a/UT4MasterServer/CloudstorageSystemfiles/UnrealTournamentOnlineSettings.json b/UT4MasterServer/CloudstorageSystemfiles/UnrealTournamentOnlineSettings.json
@@ -1,11 +1,9 @@
-{	
-	"ActiveRankedPlaylists": [ ],
-
-	"RankedEloRange":50,
-	"RankedMinEloRangeBeforeHosting":250,
-	"RankedMinEloSearchStep":50,
-
-	"QMEloRange":125,
-	"QMMinEloRangeBeforeHosting":500,
-	"QMMinEloSearchStep":100
+{
+	"ActiveRankedPlaylists": [],
+	"RankedEloRange": 50,
+	"RankedMinEloRangeBeforeHosting": 250,
+	"RankedMinEloSearchStep": 50,
+	"QMEloRange": 125,
+	"QMMinEloRangeBeforeHosting": 500,
+	"QMMinEloSearchStep": 100
 }
diff --git a/UT4MasterServer/CloudstorageSystemfiles/UnrealTournmentMCPAnnouncement.json b/UT4MasterServer/CloudstorageSystemfiles/UnrealTournmentMCPAnnouncement.json
@@ -1,8 +1,7 @@
 {
-	"Announcements":
-	[
+	"Announcements": [
 		{
-			"Title": "Welcome to new master server! [23.01.2023]  ",
+			"Title": "Welcome to new master server! [23.01.2023]",
 			"StartDate": "2023.01.01-00.00.0",
 			"EndDate": "2023.02.01-00.00.0",
 			"AnnouncementURL": "https://ut4.timiimit.com/news/2023-01-23.html",

diff --git a/UT4MasterServer/CloudstorageSystemfiles/UnrealTournmentMCPGameRulesets.json b/UT4MasterServer/CloudstorageSystemfiles/UnrealTournmentMCPGameRulesets.json
@@ -1,74 +1,74 @@
 {
 	"rules": [
 		{
- 			"UniqueTag": "QuickPlay_DUEL",
-			"Categories": [ ],
+			"UniqueTag": "QuickPlay_DUEL",
+			"Categories": [],
 			"Title": "Duel",
 			"Tooltip": "Competitive Duel Match",
 			"Description": "10 min + Impact Hammer",
-			"MapPrefixes": [ ],
+			"MapPrefixes": [],
 			"MaxMapsInList": 16,
 			"EpicMaps": "/Game/RestrictedAssets/Maps/WIP/DM-Cannon,/Game/RestrictedAssets/Maps/WIP/DM-Deadfall,/Game/RestrictedAssets/Maps/WIP/DM-Focus,/Game/RestrictedAssets/Maps/WIP/DM-NickTest1,/Game/RestrictedAssets/Maps/WIP/DM-Solo,/Game/RestrictedAssets/Maps/WIP/DM-Decktest,/Game/RestrictedAssets/Maps/WIP/DM-ASDF",
 			"DefaultMap": "/Game/RestrictedAssets/Maps/WIP/DM-Cannon",
-			"CustomMapList": [ ],
+			"CustomMapList": [],
 			"MaxPlayers": 2,
 			"MaxTeamCount": 2,
 			"MaxTeamSize": 1,
 			"MaxPartySize": 1,
 			"DisplayTexture": "Texture2D'/Game/RestrictedAssets/UI/GameModeBadges/GB_Duel.GB_Duel'",
 			"GameMode": "/Script/UnrealTournament.UTDuelGameMode",
 			"GameOptions": "?MaxPlayers=2?TimeLimit=10?Mutator=AddImpactHammer",
-			"RequiredPackages": [ ],
+			"RequiredPackages": [],
 			"bTeamGame": true,
 			"bCompetitiveMatch": true,
 			"OptionFlags": 0,
 			"bHideFromUI": true,
 			"EpicForceUIVisibility": -1
 		},
 		{
- 			"UniqueTag": "QuickPlay_iDM",
-			"Categories": [ ],
+			"UniqueTag": "QuickPlay_iDM",
+			"Categories": [],
 			"Title": "iDeathmatch",
 			"Tooltip": "Instagib Deathmatch",
 			"Description": "Instagib Deathmatch",
-			"MapPrefixes": [ ],
+			"MapPrefixes": [],
 			"MaxMapsInList": 16,
 			"EpicMaps": "/Game/RestrictedAssets/Maps/WIP/DM-Deadfall,/Game/RestrictedAssets/Maps/DM-BioTower,/Game/RestrictedAssets/Maps/WIP/DM-Spacer,/Game/RestrictedAssets/Maps/WIP/DM-Cannon,/Game/RestrictedAssets/Maps/WIP/DM-Focus,/Game/RestrictedAssets/Maps/WIP/DM-NickTest1,/Game/RestrictedAssets/Maps/WIP/DM-Solo,/Game/RestrictedAssets/Maps/WIP/DM-Decktest,/Game/RestrictedAssets/Maps/WIP/DM-ASDF",
 			"DefaultMap": "/Game/RestrictedAssets/Maps/WIP/DM-Deadfall",
-			"CustomMapList": [ ],
+			"CustomMapList": [],
 			"MaxPlayers": 16,
 			"MaxTeamCount": -1,
 			"MaxTeamSize": -1,
 			"MaxPartySize": 5,
 			"DisplayTexture": "Texture2D'/Game/RestrictedAssets/UI/GameModeBadges/GB_DM.GB_DM'",
 			"GameMode": "/Script/UnrealTournament.UTDMGameMode",
 			"GameOptions": "?MaxPlayers=16?TimeLimit=10",
-			"RequiredPackages": [ ],
+			"RequiredPackages": [],
 			"bTeamGame": false,
 			"bCompetitiveMatch": false,
 			"OptionFlags": 0,
 			"bHideFromUI": true,
 			"EpicForceUIVisibility": -1
 		},
 		{
- 			"UniqueTag": "QuickPlay_CTF",
-			"Categories": [ ],
+			"UniqueTag": "QuickPlay_CTF",
+			"Categories": [],
 			"Title": "Capture the Flag",
 			"Tooltip": "Capture the Flag",
 			"Description": "Capture the Flag",
-			"MapPrefixes": [ ],
+			"MapPrefixes": [],
 			"MaxMapsInList": 16,
 			"EpicMaps": "/Game/RestrictedAssets/Maps/CTF-TitanPass,/Game/EpicInternal/Pistola/CTF-Pistola,/Game/EpicInternal/Polaris/CTF-Polaris,/Game/RestrictedAssets/Maps/WIP/CTF-Plaza",
 			"DefaultMap": "/Game/RestrictedAssets/Maps/CTF-TitanPass",
-			"CustomMapList": [ ],
+			"CustomMapList": [],
 			"MaxPlayers": 10,
 			"MaxTeamCount": 2,
 			"MaxTeamSize": 5,
 			"MaxPartySize": 5,
 			"DisplayTexture": "Texture2D'/Game/RestrictedAssets/UI/GameModeBadges/GB_CTF.GB_CTF'",
 			"GameMode": "/Script/UnrealTournament.UTCTFGameMode",
 			"GameOptions": "?MaxPlayers=10?TimeLimit=10?Mutator=AddImpactHammer",
-			"RequiredPackages": [ ],
+			"RequiredPackages": [],
 			"bTeamGame": true,
 			"bCompetitiveMatch": false,
 			"OptionFlags": 0,

diff --git a/UT4MasterServer/CloudstorageSystemfiles/UnrealTournmentMCPStorage.json b/UT4MasterServer/CloudstorageSystemfiles/UnrealTournmentMCPStorage.json
@@ -9,106 +9,105 @@
 		"REWARD_DailyStars"
 	],
 	"Challenges": [
-
-	{
-		"challengeName": "SpookyCTF",
-		"challenge": {
-			"title": "CTF in Spooky Facing Worlds",
-			"map": "/Game/EpicInternal/Stu/CTF-Face_Halloween",
-			"GameURL": "?Game=CTF",
-			"description": "Capture the Flag in a spooky version of the classic Facing Worlds map, with a few twists.",
-			"playerTeamSize": 4,
-			"enemyTeamSize": 5,
-			"enemyTeamName": [
-				"EasyNecrisTeam",
-				"MediumMixedTeam",
-				"HardMixedTeamB"
-			],
-			"slateUIImageName": "UT.ChallengeBadges.SpookyA",
-			"RewardTag": "REWARD_HalloweenStars",
-			"bExpiredChallenge":1,
-			"bDailyChallenge":0
-		}
-	},
 		{
-		"challengeName": "HalloweenShowdown",
-		"challenge": {
-			"title": "Duel in Chill",
-			"map": "/Game/RestrictedAssets/Maps/DM-Chill",
-			"GameURL": "?Game=DUEL",
-			"description": "Duel in the Chill Deathmatch arena.",
-			"playerTeamSize": 0,
-			"enemyTeamSize": 1,
-			"enemyTeamName": [
-				"EasyNecrisTeam",
-				"MediumMixedTeam",
-				"HardNecrisTeam"
-			],
-			"slateUIImageName": "UT.ChallengeBadges.SpookyB",
-			"RewardTag": "REWARD_HalloweenStars",
-			"bExpiredChallenge":1,
-			"bDailyChallenge":0
-		}
-	},
+			"challengeName": "SpookyCTF",
+			"challenge": {
+				"title": "CTF in Spooky Facing Worlds",
+				"map": "/Game/EpicInternal/Stu/CTF-Face_Halloween",
+				"GameURL": "?Game=CTF",
+				"description": "Capture the Flag in a spooky version of the classic Facing Worlds map, with a few twists.",
+				"playerTeamSize": 4,
+				"enemyTeamSize": 5,
+				"enemyTeamName": [
+					"EasyNecrisTeam",
+					"MediumMixedTeam",
+					"HardMixedTeamB"
+				],
+				"slateUIImageName": "UT.ChallengeBadges.SpookyA",
+				"RewardTag": "REWARD_HalloweenStars",
+				"bExpiredChallenge": 1,
+				"bDailyChallenge": 0
+			}
+		},
 		{
-		"challengeName": "HalloweenInstagibCTF",
-		"challenge": {
-			"title": "Instagib CTF in Pistola Battleground",
-			"map": "/Game/EpicInternal/Pistola/CTF-Pistola",
-			"GameURL": "?Game=CTF?Mutator=Instagib",
-			"description": "Instagib CTF in Pistola Balleground.",
-			"playerTeamSize": 4,
-			"enemyTeamSize": 5,
-			"enemyTeamName": [
-				"EasyNecrisTeam",
-				"MediumNecrisTeam",
-				"HardMixedTeamA"
-			],
-			"slateUIImageName": "UT.ChallengeBadges.SpookyC",
-			"RewardTag": "REWARD_HalloweenStars",
-			"bExpiredChallenge":1,
-			"bDailyChallenge":0
-		}
+			"challengeName": "HalloweenShowdown",
+			"challenge": {
+				"title": "Duel in Chill",
+				"map": "/Game/RestrictedAssets/Maps/DM-Chill",
+				"GameURL": "?Game=DUEL",
+				"description": "Duel in the Chill Deathmatch arena.",
+				"playerTeamSize": 0,
+				"enemyTeamSize": 1,
+				"enemyTeamName": [
+					"EasyNecrisTeam",
+					"MediumMixedTeam",
+					"HardNecrisTeam"
+				],
+				"slateUIImageName": "UT.ChallengeBadges.SpookyB",
+				"RewardTag": "REWARD_HalloweenStars",
+				"bExpiredChallenge": 1,
+				"bDailyChallenge": 0
+			}
 		},
 		{
-		"challengeName": "Halloween2v2TDM",
-		"challenge": {
-			"title": "2v2 TDM in ASDF",
-			"map": "/Game/RestrictedAssets/Maps/WIP/DM-ASDF",
-			"GameURL": "?Game=TDM",
-			"description": "2v2 Team Deathmatch in the ASDF Deathmatch arena.",
-			"playerTeamSize": 1,
-			"enemyTeamSize": 2,
-			"enemyTeamName": [
-				"EasyNecrisTeam",
-				"MediumMixedTeam",
-				"HardMixedTeamA"
-			],
-			"slateUIImageName": "UT.ChallengeBadges.SpookyD",
-			"RewardTag": "REWARD_HalloweenStars",
-			"bExpiredChallenge":1,
-			"bDailyChallenge":0
-		}
+			"challengeName": "HalloweenInstagibCTF",
+			"challenge": {
+				"title": "Instagib CTF in Pistola Battleground",
+				"map": "/Game/EpicInternal/Pistola/CTF-Pistola",
+				"GameURL": "?Game=CTF?Mutator=Instagib",
+				"description": "Instagib CTF in Pistola Balleground.",
+				"playerTeamSize": 4,
+				"enemyTeamSize": 5,
+				"enemyTeamName": [
+					"EasyNecrisTeam",
+					"MediumNecrisTeam",
+					"HardMixedTeamA"
+				],
+				"slateUIImageName": "UT.ChallengeBadges.SpookyC",
+				"RewardTag": "REWARD_HalloweenStars",
+				"bExpiredChallenge": 1,
+				"bDailyChallenge": 0
+			}
+		},
+		{
+			"challengeName": "Halloween2v2TDM",
+			"challenge": {
+				"title": "2v2 TDM in ASDF",
+				"map": "/Game/RestrictedAssets/Maps/WIP/DM-ASDF",
+				"GameURL": "?Game=TDM",
+				"description": "2v2 Team Deathmatch in the ASDF Deathmatch arena.",
+				"playerTeamSize": 1,
+				"enemyTeamSize": 2,
+				"enemyTeamName": [
+					"EasyNecrisTeam",
+					"MediumMixedTeam",
+					"HardMixedTeamA"
+				],
+				"slateUIImageName": "UT.ChallengeBadges.SpookyD",
+				"RewardTag": "REWARD_HalloweenStars",
+				"bExpiredChallenge": 1,
+				"bDailyChallenge": 0
+			}
 		},
-	{
-		"challengeName": "LGIDeck",
-		"challenge": {
-			"title": "Low Gravity Instagib in Deck 16",
-			"map": "/Game/RestrictedAssets/Maps/WIP/DM-DeckTest",
-			"GameURL": "?Game=DM?Mutator=Instagib,LowGrav",
-			"description": "Low Gravity Instagib in the Deck 16 Deathmatch arena.",
-			"playerTeamSize": 0,
-			"enemyTeamSize": 5,
-			"enemyTeamName": [
-				"EasyFFATeam",
-				"MediumFFATeam",
-				"HardFFATeamB"
-			],
-			"slateUIImageName": "UT.ChallengeBadges.SpookyE",
-			"RewardTag": "REWARD_HalloweenStars",
-			"bExpiredChallenge":1,
-			"bDailyChallenge":0
+		{
+			"challengeName": "LGIDeck",
+			"challenge": {
+				"title": "Low Gravity Instagib in Deck 16",
+				"map": "/Game/RestrictedAssets/Maps/WIP/DM-DeckTest",
+				"GameURL": "?Game=DM?Mutator=Instagib,LowGrav",
+				"description": "Low Gravity Instagib in the Deck 16 Deathmatch arena.",
+				"playerTeamSize": 0,
+				"enemyTeamSize": 5,
+				"enemyTeamName": [
+					"EasyFFATeam",
+					"MediumFFATeam",
+					"HardFFATeamB"
+				],
+				"slateUIImageName": "UT.ChallengeBadges.SpookyE",
+				"RewardTag": "REWARD_HalloweenStars",
+				"bExpiredChallenge": 1,
+				"bDailyChallenge": 0
+			}
 		}
-	}
 	]
-}
+}
diff --git a/UT4MasterServer/Program.cs b/UT4MasterServer/Program.cs
@@ -143,8 +143,8 @@ public static void Main(string[] args)
 			});
 		});
 
-		var allowOriginsPolicy = "_ut4msOriginsPolicy";
-		var devAllowOriginsPolicy = "_ut4msDevOriginsPolicy";
+		const string allowOriginsPolicy = "_ut4msOriginsPolicy";
+		const string devAllowOriginsPolicy = "_ut4msDevOriginsPolicy";
 
 		builder.Services.AddCors(options =>
 		{

diff --git a/UT4MasterServer/Services/ApplicationStartupService.cs b/UT4MasterServer/Services/ApplicationStartupService.cs
@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Options;
-using UT4MasterServer.Authentication;
 using UT4MasterServer.Models;
 
 namespace UT4MasterServer.Services
@@ -13,12 +12,12 @@ public sealed class ApplicationStartupService : IHostedService
 
 		public ApplicationStartupService(
 			ILogger<ApplicationStartupService> logger, ILogger<StatisticsService> statsLogger,
-			IOptions<ApplicationSettings> settings)
+			IOptions<ApplicationSettings> settings, ILogger<CloudStorageService> cloudStorageLogger)
 		{
 			this.logger = logger;
 			var db = new DatabaseContext(settings);
 			statisticsService = new StatisticsService(statsLogger, db);
-			cloudStorageService = new CloudStorageService(db);
+			cloudStorageService = new CloudStorageService(db, cloudStorageLogger);
 			clientService = new ClientService(db);
 		}