use beatsaver key

Author: Futuremappermydud

BSChallenger.Server/Discord/Commands/Global/LinkUser.cs

@@ -25,13 +25,9 @@ public AddMap(Database database)
         public async Task Create([Autocomplete(typeof(RankingIdentifierAutoComplete))] string rankingId, [Autocomplete(typeof(LevelNumberAutoComplete))] int level)
         {
 			var ranking = _database.EagerLoadRankings().AsEnumerable().FirstOrDefault(x => x.Identifier == rankingId);
-			_logger.Debug(JsonConvert.SerializeObject(ranking));
 			var members =  ranking?.RankTeamMembers.AsEnumerable();
-			_logger.Debug("members: " + members.Count().ToString());
-			var user = members.FirstOrDefault(x =>
-			x.User.DiscordId
-			==
-			Context.User.Id.ToString());
+			var user = members.FirstOrDefault(x => x.User.DiscordId == Context.User.Id.ToString());
+
 			if (user == null || (int)user.Role < 1)
 			{
 				await RespondAsync("Insufficient Permissions!", ephemeral: true);
@@ -42,8 +38,8 @@ public async Task Create([Autocomplete(typeof(RankingIdentifierAutoComplete))] s
                             .WithTitle("Add level to ranking")
                             .AddTextInput("Ranking ID", "ranking", required: true, value: rankingId)
                             .AddTextInput("Level Number", "level", required: true, value: level.ToString())
-                            .AddTextInput("Hash", "hash", required: true, minLength: 15)
-                            .AddTextInput("Characteristic", "char", required: true, minLength: 5)
+                            .AddTextInput("BeatSaver Key", "id", required: true, placeholder: "25f", minLength: 15)
+                            .AddTextInput("Characteristic", "char", required: true, placeholder: "Standard, One Saber, 360, 90, Lawless", minLength: 5)
                             .AddTextInput("Difficulty", "difficulty", required: true, placeholder: "Easy, Normal, Hard, Expert, Expert+", minLength: 4);
             await RespondWithModalAsync(builder.Build());
         }

BSChallenger.Server/Discord/Commands/Rank Team/AddMap.cs

@@ -117,7 +117,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
 				{
 					string rankingId = GetModalItem(components, "ranking");
 					int lvl = int.Parse(GetModalItem(components, "level"));
-					string hash = GetModalItem(components, "hash");
+					string id = GetModalItem(components, "id");
 					string chari = GetModalItem(components, "char");
 					string diff = GetModalItem(components, "difficulty");
 
@@ -130,7 +130,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
 							level = new Level(lvl, 1, "", "");
 							ranking.Levels.Add(level);
 						}
-						var map = new Map(hash, chari, diff);
+						var map = new Map(id, chari, diff);
 						level.AvailableForPass.Add(map);
 					}
 					else
@@ -160,6 +160,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
 							}
 							var stream = await playlist.Content.ReadAsStreamAsync();
 							await _parser.Parse(level, stream);
+							await _db.SaveChangesAsync();
 						}
 						else
 						{

BSChallenger.Server/Discord/DiscordBot.cs

@@ -89,7 +89,7 @@ private List<ScorePair> ScanLevel(Level level)
 			List<ScorePair> ScoresToCheck = new();
 			foreach (var score in CurrentScanningScores)
 			{
-				var map = level.AvailableForPass.FirstOrDefault(y => string.Equals(score.Leaderboard.Song.Hash, y.Hash, StringComparison.OrdinalIgnoreCase) && string.Equals(score.Leaderboard.Difficulty.DifficultyName, y.Difficulty, StringComparison.OrdinalIgnoreCase) && string.Equals(score.Leaderboard.Difficulty.ModeName.Replace("-PinkPlay_Controllable", ""), y.Characteristic, StringComparison.OrdinalIgnoreCase));
+				var map = level.AvailableForPass.FirstOrDefault(y => string.Equals(score.Leaderboard.Song.Id, y.BeatSaverId, StringComparison.OrdinalIgnoreCase) && string.Equals(score.Leaderboard.Difficulty.DifficultyName, y.Difficulty, StringComparison.OrdinalIgnoreCase) && string.Equals(score.Leaderboard.Difficulty.ModeName.Replace("-PinkPlay_Controllable", ""), y.Characteristic, StringComparison.OrdinalIgnoreCase));
 				if (map != null)
 				{
 					ScoresToCheck.Add(new ScorePair(map, score));