diff --git a/Controllers/CameraWrite/CameraWriteController.cs b/Controllers/CameraWrite/CameraWriteController.cs index b74e3f1..445657d 100644 --- a/Controllers/CameraWrite/CameraWriteController.cs +++ b/Controllers/CameraWrite/CameraWriteController.cs @@ -1,4 +1,4 @@ -using Newtonsoft.Json; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Diagnostics; @@ -17,6 +17,7 @@ class CameraWriteController { private static string BaseUrl => "http://127.0.0.1:" + (Program.spectateMeController.spectateMe ? SpectateMeController.SPECTATEME_PORT : "6721") + "/"; private static Dictionary playerCameraIndices = new Dictionary(); + private static System.Timers.Timer autoFollowTimer; public const float Deg2Rad = 1 / 57.29578f; public const float Rad2Deg = 57.29578f; @@ -42,7 +43,14 @@ public CameraWriteController() { UseCameraControlKeys(); playerCameraIndices.Clear(); + StartAutoFollowTimer(); }; + + Program.LeftGame += (_) => + { + StopAutoFollowTimer(); + }; + Program.PlayerJoined += (_, _, _) => { UseCameraControlKeys(); }; Program.PlayerLeft += (_, _, _) => { UseCameraControlKeys(); }; Program.PlayerSwitchedTeams += (_, _, _, _) => { UseCameraControlKeys(); }; @@ -55,6 +63,47 @@ public CameraWriteController() }; } + private static void StartAutoFollowTimer() + { + StopAutoFollowTimer(); + + // Only start timer if we're in specific player follow mode + if (SparkSettings.instance.spectatorCamera == 3 && + !string.IsNullOrEmpty(SparkSettings.instance.followPlayerName)) + { + autoFollowTimer = new System.Timers.Timer(2000); // 10 seconds + autoFollowTimer.Elapsed += (sender, e) => AutoFollowPlayer(); + autoFollowTimer.AutoReset = true; + autoFollowTimer.Start(); + LogRow(LogType.File, "Started auto-follow timer for player: " + SparkSettings.instance.followPlayerName); + } + } + + private static void StopAutoFollowTimer() + { + autoFollowTimer?.Stop(); + autoFollowTimer?.Dispose(); + autoFollowTimer = null; + } + + private static void AutoFollowPlayer() + { + if (Program.lastFrame == null) return; + + // Only auto-follow if we're still in the specific player follow mode + if (SparkSettings.instance.spectatorCamera == 3 && + !string.IsNullOrEmpty(SparkSettings.instance.followPlayerName)) + { + LogRow(LogType.File, "Auto-following player: " + SparkSettings.instance.followPlayerName); + SpectatorCamFindPlayer(SparkSettings.instance.followPlayerName, null, true); + } + else + { + // Stop timer if we're no longer in follow mode + StopAutoFollowTimer(); + } + } + public static void UseCameraControlKeys() { try @@ -68,20 +117,25 @@ public static void UseCameraControlKeys() { // auto case 0: + StopAutoFollowTimer(); break; // sideline case 1: + StopAutoFollowTimer(); SetCameraMode(CameraMode.side); break; // follow client case 2: + StopAutoFollowTimer(); if (Program.spectateMeController.spectateMe) SpectatorCamFindPlayer(); break; // follow specific player case 3: SpectatorCamFindPlayer(SparkSettings.instance.followPlayerName); + StartAutoFollowTimer(); // Start timer when manually switching to this mode break; case 4: + StopAutoFollowTimer(); FollowDischolder(null, SparkSettings.instance.discHolderFollowCamMode == 1, SparkSettings.instance.discHolderFollowRestrictTeam); break; } @@ -92,7 +146,7 @@ public static void UseCameraControlKeys() } } - public static void SpectatorCamFindPlayer(string playerName = null, CameraMode? mode = null) + public static void SpectatorCamFindPlayer(string playerName = null, CameraMode? mode = null, bool isAutoFollow = false) { if (Program.lastFrame == null) return; @@ -100,7 +154,10 @@ public static void SpectatorCamFindPlayer(string playerName = null, CameraMode? if (Program.lastFrame.GetPlayer(playerName) == null) { - LogRow(LogType.File, Program.lastFrame.sessionid, "Requested follow player not in the game."); + if (!isAutoFollow) // Only log if this wasn't an automatic attempt + { + LogRow(LogType.File, Program.lastFrame.sessionid, "Requested follow player not in the game."); + } return; } @@ -118,7 +175,10 @@ public static void SpectatorCamFindPlayer(string playerName = null, CameraMode? SetCameraMode(CameraMode.pov, playerCameraIndices[playerName]); await Task.Delay(50); (Player minPlayer, float dist) = await CheckNearestPlayer(); - LoggerEvents.Log(Program.lastFrame, $"Initial player camera distance: {dist:N3} m. Name: {minPlayer.name}"); + if (!isAutoFollow) + { + LoggerEvents.Log(Program.lastFrame, $"Initial player camera distance: {dist:N3} m. Name: {minPlayer.name}"); + } found = minPlayer.name == playerName; foundIndex = playerCameraIndices[playerName]; } @@ -136,7 +196,10 @@ public static void SpectatorCamFindPlayer(string playerName = null, CameraMode? await Task.Delay(50); (Player minPlayer, float dist) = await CheckNearestPlayer(); - LoggerEvents.Log(Program.lastFrame, $"Player {i} camera distance: {dist:N3} m. Name: {minPlayer.name}"); + if (!isAutoFollow) + { + LoggerEvents.Log(Program.lastFrame, $"Player {i} camera distance: {dist:N3} m. Name: {minPlayer.name}"); + } found = minPlayer.name == playerName; playerCameraIndices[minPlayer.name] = i; @@ -153,7 +216,10 @@ public static void SpectatorCamFindPlayer(string playerName = null, CameraMode? if (found) { - LogRow(LogType.File, Program.lastFrame.sessionid, "Correct player found."); + if (!isAutoFollow) + { + LogRow(LogType.File, Program.lastFrame.sessionid, "Correct player found."); + } if (mode != null) { SetCameraMode((CameraMode)mode, foundIndex); @@ -173,7 +239,7 @@ public static void SpectatorCamFindPlayer(string playerName = null, CameraMode? } } } - else + else if (!isAutoFollow) // Only log failure if this wasn't an automatic attempt { LogRow(LogType.File, Program.lastFrame.sessionid, "Failed to find player, switching to auto instead."); @@ -184,7 +250,10 @@ public static void SpectatorCamFindPlayer(string playerName = null, CameraMode? } catch (Exception ex) { - LogRow(LogType.Error, $"Error with finding player camera to follow.\n{ex}"); + if (!isAutoFollow) // Only log errors if this wasn't an automatic attempt + { + LogRow(LogType.Error, $"Error with finding player camera to follow.\n{ex}"); + } } } @@ -412,4 +481,4 @@ public static float Exponential(float value, float expo) } } } -} \ No newline at end of file +} diff --git a/Controllers/TTSController.cs b/Controllers/TTSController.cs index 31d860f..4ed2719 100644 --- a/Controllers/TTSController.cs +++ b/Controllers/TTSController.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Diagnostics; @@ -15,9 +15,6 @@ namespace Spark { - /// - /// 📖➡🔊 An abstraction layer for whatever TTS engine is being used - /// public class TTSController { private readonly string[,,] voiceTypes = @@ -26,29 +23,25 @@ public class TTSController { { "en-US-Standard-D", "en-US-Standard-C" }, { "ja-JP-Standard-D", "ja-JP-Standard-B" } } }; - private readonly string[] languages = { "en-US", "ja-JP" }; // 🌎 - private bool playing = true; private readonly Thread ttsThread; private readonly Queue rateLimiterQueue = new Queue(); private const float rateLimitPerSecond = 15; private bool ttsDisabled = false; private string[] blacklistedNames = Array.Empty(); - - /// - /// Queue of filenames to read - /// private readonly ConcurrentQueue ttsQueue = new ConcurrentQueue(); public static string CacheFolder => Path.Combine(Path.GetTempPath(), "SparkTTSCache"); private readonly Stopwatch lastRulesChangedTimer = Stopwatch.StartNew(); + + private float currentRate = 1.0f; + private string currentRateString = "1.0"; public TTSController() { - // TTS won't work without Discord auth - if (DiscordOAuth.firebaseCred == null) return; - + LoadTtsSpeed(); + ttsThread = new Thread(TTSThread); ttsThread.IsBackground = true; ttsThread.Start(); @@ -62,8 +55,6 @@ public TTSController() } }); - #region Set up the event listeners to actually use TTS - Program.PlayerJoined += (frame, team, player) => { if (!SparkSettings.instance.playerJoinTTS) return; @@ -134,17 +125,14 @@ public TTSController() }; Program.Joust += (frame, team, player, isNeutral, joustTime, maxSpeed, maxTubeExitSpeed) => { - // only joust time if (SparkSettings.instance.joustTimeTTS && !SparkSettings.instance.joustSpeedTTS) { SpeakAsync($"{team.color} {joustTime:N1}"); } - // only joust speed else if (!SparkSettings.instance.joustTimeTTS && SparkSettings.instance.joustSpeedTTS) { SpeakAsync($"{team.color} {maxSpeed:N0} {Resources.tts_meters_per_second}"); } - // both else if (SparkSettings.instance.joustTimeTTS && SparkSettings.instance.joustSpeedTTS) { SpeakAsync($"{team.color} {joustTime:N1} {maxSpeed:N0} {Resources.tts_meters_per_second}"); @@ -152,7 +140,6 @@ public TTSController() }; Program.Goal += (frame, goalEvent) => { - // combine if both true if (SparkSettings.instance.goalDistanceTTS && SparkSettings.instance.goalSpeedTTS) { SpeakAsync($"{frame.last_score.distance_thrown:N1} {Resources.tts_meters}. {frame.last_score.disc_speed:N1} {Resources.tts_meters_per_second}"); @@ -174,39 +161,66 @@ public TTSController() } lastRulesChangedTimer.Restart(); }; - - #endregion } - ~TTSController() // finalizer + ~TTSController() { ttsThread?.Abort(); } - // TODO convert to task with cancellation token + private void LoadTtsSpeed() + { + try + { + int savedValue = 2; + + if (SparkSettings.instance.TTSSpeed >= 1 && SparkSettings.instance.TTSSpeed <= 4) + { + savedValue = SparkSettings.instance.TTSSpeed; + } + else if (SparkSettings.instance.ttsSpeedIndex >= 1 && SparkSettings.instance.ttsSpeedIndex <= 4) + { + savedValue = SparkSettings.instance.ttsSpeedIndex; + } + + int index = savedValue - 1; + + if (index < 0) index = 1; + if (index > 3) index = 1; + + SetRateInternal(index); + } + catch + { + SetRateInternal(1); + } + } + private void TTSThread() { MediaPlayer mediaPlayer = new MediaPlayer(); mediaPlayer.MediaEnded += (sender, e) => { playing = false; - Debug.WriteLine("stopped playing"); }; + while (Program.running) { if (ttsQueue.TryDequeue(out string result)) { - mediaPlayer.Stop(); - mediaPlayer.Open(new Uri(result)); - - playing = true; - mediaPlayer.Play(); - - // wait until it's done playing - Thread.Sleep(100); - - Task.Run(TrimCacheFolder); - // Task.Run(() => File.Delete(result)); + try + { + mediaPlayer.Stop(); + mediaPlayer.Open(new Uri(result)); + playing = true; + mediaPlayer.Play(); + Thread.Sleep(100); + Task.Run(TrimCacheFolder); + } + catch + { + // Ignore playback errors + } } else { @@ -215,11 +229,52 @@ private void TTSThread() } } - public float Rate { get; private set; } + public float Rate => currentRate; - public void SetRate(int selectedIndex) + public void SetRate(int speedIndex) { - Rate = 1 + ((selectedIndex - 1 /*index of Normal*/) * .4f /*Slope of the speed change*/); + if (speedIndex < 0) speedIndex = 1; + if (speedIndex > 3) speedIndex = 1; + + int value = speedIndex + 1; + + SparkSettings.instance.TTSSpeed = value; + SparkSettings.instance.ttsSpeedIndex = value; + + try + { + SparkSettings.instance.Save(); + } + catch + { + // Ignore save errors + } + + SetRateInternal(speedIndex); + } + + private void SetRateInternal(int speedIndex) + { + switch (speedIndex) + { + case 0: + currentRate = 0.6f; + break; + case 1: + currentRate = 1.0f; + break; + case 2: + currentRate = 1.4f; + break; + case 3: + currentRate = 1.8f; + break; + default: + currentRate = 1.0f; + break; + } + + currentRateString = currentRate.ToString("F1"); } public void SetOutputToDefaultAudioDevice() @@ -233,21 +288,18 @@ public void SpeakAsync(string text) private void Speak(string text) { - // rate limiting - // the length of the queue counts how many recent requests there are rateLimiterQueue.Enqueue(DateTime.UtcNow); - // remove old items from the queue - while ((DateTime.UtcNow - rateLimiterQueue.Peek()).TotalSeconds > 1) + while (rateLimiterQueue.Count > 0 && + (DateTime.UtcNow - rateLimiterQueue.Peek()).TotalSeconds > 1) { rateLimiterQueue.Dequeue(); } if (rateLimiterQueue.Count > rateLimitPerSecond) { - //Speak("Rate Limit hit. TTS disabled. Please report this to NtsFranz."); ttsDisabled = true; - Logger.LogRow(Logger.LogType.Error, "Rate Limit hit. " + text); + return; } if (ttsDisabled) return; @@ -257,42 +309,59 @@ private void Speak(string text) Directory.CreateDirectory(CacheFolder); } - string filePath = Path.Combine(CacheFolder, $"{Rate}_{SparkSettings.instance.languageIndex}_{SparkSettings.instance.useWavenetVoices}_{SparkSettings.instance.ttsVoice}_{text.Replace(" ", "_")}.mp3"); + string cleanText = text; + foreach (char c in Path.GetInvalidFileNameChars()) + { + cleanText = cleanText.Replace(c.ToString(), ""); + } + cleanText = cleanText.Replace(" ", "_"); + + if (cleanText.Length > 100) + { + cleanText = cleanText.Substring(0, 100); + } + + string filePath = Path.Combine(CacheFolder, $"{currentRateString}_{SparkSettings.instance.languageIndex}_{SparkSettings.instance.useWavenetVoices}_{SparkSettings.instance.ttsVoice}_{cleanText}.mp3"); - // play from cache if (File.Exists(filePath)) { - // play the file ttsQueue.Enqueue(filePath); return; } - _ = Task.Run(async () => + Task.Run(async () => { - string json = JsonConvert.SerializeObject(new Dictionary + try { - {"text", text}, - {"language_code", voiceTypes[SparkSettings.instance.useWavenetVoices ? 0 : 1, SparkSettings.instance.languageIndex, SparkSettings.instance.ttsVoice]}, - {"voice_name", voiceTypes[SparkSettings.instance.useWavenetVoices ? 0 : 1, SparkSettings.instance.languageIndex, SparkSettings.instance.ttsVoice]}, - {"speaking_rate", Rate}, - }); - HttpRequestMessage request = new HttpRequestMessage - { - Method = HttpMethod.Post, - RequestUri = new Uri($"{Program.APIURL}/tts"), - Content = new StringContent(json, Encoding.UTF8, MediaTypeNames.Application.Json), - }; - HttpResponseMessage response = await FetchUtils.client.SendAsync(request); - byte[] bytes = await response.Content.ReadAsByteArrayAsync(); - - // Write the audio content of the response to an MP3 file. - if (bytes.Length > 0) + string json = JsonConvert.SerializeObject(new Dictionary + { + {"text", text}, + {"language_code", voiceTypes[SparkSettings.instance.useWavenetVoices ? 0 : 1, SparkSettings.instance.languageIndex, SparkSettings.instance.ttsVoice]}, + {"voice_name", voiceTypes[SparkSettings.instance.useWavenetVoices ? 0 : 1, SparkSettings.instance.languageIndex, SparkSettings.instance.ttsVoice]}, + {"speaking_rate", currentRate}, + }); + + HttpRequestMessage request = new HttpRequestMessage + { + Method = HttpMethod.Post, + RequestUri = new Uri($"{Program.APIURL}/tts"), + Content = new StringContent(json, Encoding.UTF8, MediaTypeNames.Application.Json), + }; + + HttpResponseMessage response = await FetchUtils.client.SendAsync(request); + byte[] bytes = await response.Content.ReadAsByteArrayAsync(); + + if (bytes.Length > 0) + { + await File.WriteAllBytesAsync(filePath, bytes); + } + + ttsQueue.Enqueue(filePath); + } + catch { - await File.WriteAllBytesAsync(filePath, bytes); + // Ignore TTS generation errors } - - // play the file - ttsQueue.Enqueue(filePath); }); } @@ -303,16 +372,19 @@ public static void ClearCacheFolder() if (Directory.Exists(CacheFolder)) { DirectoryInfo di = new DirectoryInfo(CacheFolder); - foreach (FileInfo file in di.GetFiles()) { - file.Delete(); + try + { + file.Delete(); + } + catch { } } } } - catch (Exception e) + catch { - Logger.LogRow(Logger.LogType.Error, "Failed clearing TTS cache\n" + e); + // Ignore cache clearing errors } } @@ -323,25 +395,33 @@ public static void TrimCacheFolder() if (Directory.Exists(CacheFolder)) { DirectoryInfo di = new DirectoryInfo(CacheFolder); - List files = di.GetFiles().ToList(); + files.Sort((f1, f2) => f1.LastAccessTime.CompareTo(f2.LastAccessTime)); - long size = files.Sum(file => file.Length); - - // delete files over the cache size limit - while (size > SparkSettings.instance.ttsCacheSizeBytes) + + long totalSize = files.Sum(file => file.Length); + long maxSize = SparkSettings.instance.ttsCacheSizeBytes; + + while (totalSize > maxSize && files.Count > 0) { - FileInfo removed = files[0]; - files.RemoveAt(0); - size -= removed.Length; - removed.Delete(); + FileInfo oldestFile = files[0]; + try + { + totalSize -= oldestFile.Length; + oldestFile.Delete(); + files.RemoveAt(0); + } + catch + { + files.RemoveAt(0); + } } } } - catch (Exception e) + catch { - Logger.LogRow(Logger.LogType.Error, "Failed deleting files from cache\n" + e); + // Ignore cache trimming errors } } } -} \ No newline at end of file +} diff --git a/Data Containers/TabletStats.cs b/Data Containers/TabletStats.cs index 388149b..a2e411f 100644 --- a/Data Containers/TabletStats.cs +++ b/Data Containers/TabletStats.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -48,74 +48,149 @@ public TabletStats(string serverprofile) discord_id = DiscordOAuth.DiscordUserID; - player_id = long.Parse(((string)data["xplatformid"])?.Split("-").Last() ?? "0"); - player_name = (string)data["displayname"]; - if (data["social"] != null) + var xplatformidToken = data["xplatformid"]; + if (xplatformidToken != null) { - ghosted_count = (int)data["social"]["ghostcount"]; - muted_count = (int)data["social"]["mutecount"]; + var xplatformid = (string)xplatformidToken; + if (xplatformidToken != null && xplatformidToken.Type == JTokenType.String)if (!string.IsNullOrEmpty(xplatformid)) + { + var parts = xplatformid.Split("-"); + if (parts.Length > 0 && long.TryParse(parts.Last(), out long parsedId)) + { + player_id = parsedId; + } + } } - - update_time = (int)data["updatetime"]; - if (data.Contains("creationtime")) + + player_name = data["displayname"]?.Value(); + + if (data["social"] != null) { - creation_time = (int)data["creationtime"]; + var social = data["social"]; + ghosted_count = social["ghostcount"]?.Value() ?? 0; + muted_count = social["mutecount"]?.Value() ?? 0; } - else if (data.Contains("createtime")) + + update_time = data["updatetime"]?.Value() ?? 0; + + var creationTimeToken = data["creationtime"] ?? data["createtime"]; + if (creationTimeToken != null) { - creation_time = (int)data["createtime"]; + creation_time = creationTimeToken.Value(); } - if (data["purchasedcombat"] != null) - purchased_combat = (int)data["purchasedcombat"]; + purchased_combat = data["purchasedcombat"]?.Value() ?? 0; + if (data["stats"]?["arena"] == null) return; - level = (int)data["stats"]["arena"]["Level"]?["val"]; + + var arena = data["stats"]["arena"]; + var levelToken = arena["Level"]; + if (levelToken != null) + { + level = levelToken["val"]?.Value() ?? 0; + } + if (level > 1) { - highest_stuns = (int)(data["stats"]["arena"]["HighestStuns"]?["val"] ?? 0); - goal_score_percentage = (float)(data["stats"]["arena"]["GoalScorePercentage"]?["val"] ?? 0); - two_point_goals = (int)(data["stats"]["arena"]["TwoPointGoals"]?["val"] ?? 0); - highest_saves = (int)(data["stats"]["arena"]["HighestSaves"]?["val"] ?? 0); - avg_points_per_game = (float)(data["stats"]["arena"]["AveragePointsPerGame"]?["val"] ?? 0) / (int)(data["stats"]["arena"]["AveragePointsPerGame"]?["cnt"] ?? 0); - stuns = (int)(data["stats"]["arena"]["Stuns"]?["val"] ?? 0); - stun_percentage = (float)(data["stats"]["arena"]["StunPercentage"]?["val"] ?? 0); - arena_wins = (int)(data["stats"]["arena"]["ArenaWins"]?["val"] ?? 0); - arena_win_percentage = (float)(data["stats"]["arena"]["ArenaWinPercentage"]?["val"] ?? 0); - shots_on_goal_against = (int)(data["stats"]["arena"]["ShotsOnGoalAgainst"]?["val"] ?? 0); - shots_on_goal = (int)(data["stats"]["arena"]["ShotsOnGoal"]?["val"] ?? 0); - hat_tricks = (int)(data["stats"]["arena"]["HatTricks"]?["val"] ?? 0); - highest_points = (int)(data["stats"]["arena"]["HighestPoints"]?["val"] ?? 0); - possession_time = (float)(data["stats"]["arena"]["PossessionTime"]?["val"] ?? 0); - blocks = (int)(data["stats"]["arena"]["Blocks"]?["val"] ?? 0); - bounce_goals = (int)(data["stats"]["arena"]["BounceGoals"]?["val"] ?? 0); - stuns_per_game = (float)(data["stats"]["arena"]["StunsPerGame"]?["val"] ?? 0) / (int)(data["stats"]["arena"]["StunsPerGame"]?["cnt"] ?? 0); - highest_arena_mvp_streak = (int)(data["stats"]["arena"]["HighestArenaMVPStreak"]?["val"] ?? 0); - arena_ties = (int)(data["stats"]["arena"]["ArenaTies"]?["val"] ?? 0); - saves_per_game = (float)(data["stats"]["arena"]["SavesPerGame"]?["val"] ?? 0) / (int)(data["stats"]["arena"]["SavesPerGame"]?["cnt"] ?? 0); - catches = (int)(data["stats"]["arena"]["Catches"]?["val"] ?? 0); - goal_save_percentage = (float)(data["stats"]["arena"]["GoalSavePercentage"]?["val"] ?? 0); - goals_per_game = (float)(data["stats"]["arena"]["GoalsPerGame"]?["val"] ?? 0) / (int)(data["stats"]["arena"]["GoalsPerGame"]?["cnt"] ?? 0); - current_arena_mvp_streak = (int)(data["stats"]["arena"]["CurrentArenaMVPStreak"]?["val"] ?? 0); - jousts_won = (int)(data["stats"]["arena"]["JoustsWon"]?["val"] ?? 0); - passes = (int)(data["stats"]["arena"]["Passes"]?["val"] ?? 0); - three_point_goals = (int)(data["stats"]["arena"]["ThreePointGoals"]?["val"] ?? 0); - assists_per_game = (float)(data["stats"]["arena"]["AssistsPerGame"]?["val"] ?? 0) / (int)(data["stats"]["arena"]["AssistsPerGame"]?["cnt"] ?? 0); - current_arena_win_streak = (int)(data["stats"]["arena"]["CurrentArenaWinStreak"]?["val"] ?? 0); - assists = (int)(data["stats"]["arena"]["Assists"]?["val"] ?? 0); - clears = (int)(data["stats"]["arena"]["Clears"]?["val"] ?? 0); - average_top_speed_per_game = (float)(data["stats"]["arena"]["AverageTopSpeedPerGame"]?["val"] ?? 0) / (int)(data["stats"]["arena"]["AverageTopSpeedPerGame"]?["cnt"] ?? 0); - average_possession_time_per_game = (float)(data["stats"]["arena"]["AveragePossessionTimePerGame"]?["val"] ?? 0) / (int)(data["stats"]["arena"]["AveragePossessionTimePerGame"]?["cnt"] ?? 0); - arena_losses = (int)(data["stats"]["arena"]["ArenaLosses"]?["val"] ?? 0); - top_speeds_total = (float)(data["stats"]["arena"]["TopSpeedsTotal"]?["val"] ?? 0); - arena_mvps = (int)(data["stats"]["arena"]["ArenaMVPs"]?["val"] ?? 0); - arena_mvp_percentage = (float)(data["stats"]["arena"]["ArenaMVPPercentage"]?["val"] ?? 0); - punches_recieved = (int)(data["stats"]["arena"]["PunchesReceived"]?["val"] ?? 0); - block_percentage = (float)(data["stats"]["arena"]["BlockPercentage"]?["val"] ?? 0); - points = (int)(data["stats"]["arena"]["Points"]?["val"] ?? 0); - saves = (int)(data["stats"]["arena"]["Saves"]?["val"] ?? 0); - interceptions = (int)(data["stats"]["arena"]["Interceptions"]?["val"] ?? 0); - goals = (int)(data["stats"]["arena"]["Goals"]?["val"] ?? 0); - steals = (int)(data["stats"]["arena"]["Steals"]?["val"] ?? 0); + highest_stuns = arena["HighestStuns"]?["val"]?.Value() ?? 0; + goal_score_percentage = arena["GoalScorePercentage"]?["val"]?.Value() ?? 0; + two_point_goals = arena["TwoPointGoals"]?["val"]?.Value() ?? 0; + highest_saves = arena["HighestSaves"]?["val"]?.Value() ?? 0; + + var avgPointsToken = arena["AveragePointsPerGame"]; + if (avgPointsToken != null) + { + float val = avgPointsToken["val"]?.Value() ?? 0; + int cnt = avgPointsToken["cnt"]?.Value() ?? 0; + avg_points_per_game = cnt > 0 ? val / cnt : 0; + } + + stuns = arena["Stuns"]?["val"]?.Value() ?? 0; + stun_percentage = arena["StunPercentage"]?["val"]?.Value() ?? 0; + arena_wins = arena["ArenaWins"]?["val"]?.Value() ?? 0; + arena_win_percentage = arena["ArenaWinPercentage"]?["val"]?.Value() ?? 0; + shots_on_goal_against = arena["ShotsOnGoalAgainst"]?["val"]?.Value() ?? 0; + shots_on_goal = arena["ShotsOnGoal"]?["val"]?.Value() ?? 0; + hat_tricks = arena["HatTricks"]?["val"]?.Value() ?? 0; + highest_points = arena["HighestPoints"]?["val"]?.Value() ?? 0; + possession_time = arena["PossessionTime"]?["val"]?.Value() ?? 0; + blocks = arena["Blocks"]?["val"]?.Value() ?? 0; + bounce_goals = arena["BounceGoals"]?["val"]?.Value() ?? 0; + + var stunsPerGameToken = arena["StunsPerGame"]; + if (stunsPerGameToken != null) + { + float val = stunsPerGameToken["val"]?.Value() ?? 0; + int cnt = stunsPerGameToken["cnt"]?.Value() ?? 0; + stuns_per_game = cnt > 0 ? val / cnt : 0; + } + + highest_arena_mvp_streak = arena["HighestArenaMVPStreak"]?["val"]?.Value() ?? 0; + arena_ties = arena["ArenaTies"]?["val"]?.Value() ?? 0; + + var savesPerGameToken = arena["SavesPerGame"]; + if (savesPerGameToken != null) + { + float val = savesPerGameToken["val"]?.Value() ?? 0; + int cnt = savesPerGameToken["cnt"]?.Value() ?? 0; + saves_per_game = cnt > 0 ? val / cnt : 0; + } + + catches = arena["Catches"]?["val"]?.Value() ?? 0; + goal_save_percentage = arena["GoalSavePercentage"]?["val"]?.Value() ?? 0; + + var goalsPerGameToken = arena["GoalsPerGame"]; + if (goalsPerGameToken != null) + { + float val = goalsPerGameToken["val"]?.Value() ?? 0; + int cnt = goalsPerGameToken["cnt"]?.Value() ?? 0; + goals_per_game = cnt > 0 ? val / cnt : 0; + } + + current_arena_mvp_streak = arena["CurrentArenaMVPStreak"]?["val"]?.Value() ?? 0; + jousts_won = arena["JoustsWon"]?["val"]?.Value() ?? 0; + passes = arena["Passes"]?["val"]?.Value() ?? 0; + three_point_goals = arena["ThreePointGoals"]?["val"]?.Value() ?? 0; + + var assistsPerGameToken = arena["AssistsPerGame"]; + if (assistsPerGameToken != null) + { + float val = assistsPerGameToken["val"]?.Value() ?? 0; + int cnt = assistsPerGameToken["cnt"]?.Value() ?? 0; + assists_per_game = cnt > 0 ? val / cnt : 0; + } + + current_arena_win_streak = arena["CurrentArenaWinStreak"]?["val"]?.Value() ?? 0; + assists = arena["Assists"]?["val"]?.Value() ?? 0; + clears = arena["Clears"]?["val"]?.Value() ?? 0; + + var avgTopSpeedToken = arena["AverageTopSpeedPerGame"]; + if (avgTopSpeedToken != null) + { + float val = avgTopSpeedToken["val"]?.Value() ?? 0; + int cnt = avgTopSpeedToken["cnt"]?.Value() ?? 0; + average_top_speed_per_game = cnt > 0 ? val / cnt : 0; + } + + var avgPossessionToken = arena["AveragePossessionTimePerGame"]; + if (avgPossessionToken != null) + { + float val = avgPossessionToken["val"]?.Value() ?? 0; + int cnt = avgPossessionToken["cnt"]?.Value() ?? 0; + average_possession_time_per_game = cnt > 0 ? val / cnt : 0; + } + + arena_losses = arena["ArenaLosses"]?["val"]?.Value() ?? 0; + top_speeds_total = arena["TopSpeedsTotal"]?["val"]?.Value() ?? 0; + arena_mvps = arena["ArenaMVPs"]?["val"]?.Value() ?? 0; + arena_mvp_percentage = arena["ArenaMVPPercentage"]?["val"]?.Value() ?? 0; + punches_recieved = arena["PunchesReceived"]?["val"]?.Value() ?? 0; + block_percentage = arena["BlockPercentage"]?["val"]?.Value() ?? 0; + points = arena["Points"]?["val"]?.Value() ?? 0; + saves = arena["Saves"]?["val"]?.Value() ?? 0; + interceptions = arena["Interceptions"]?["val"]?.Value() ?? 0; + goals = arena["Goals"]?["val"]?.Value() ?? 0; + steals = arena["Steals"]?["val"]?.Value() ?? 0; } } catch (Exception e) @@ -182,4 +257,4 @@ public TabletStats(string serverprofile) public int goals; public int steals; } -} \ No newline at end of file +} diff --git a/DiscordOAuth.cs b/DiscordOAuth.cs index 2fb057d..39bb867 100644 --- a/DiscordOAuth.cs +++ b/DiscordOAuth.cs @@ -177,7 +177,7 @@ public static async void OAuthLoginRefresh(string refresh_token) try { - HttpResponseMessage response = await client.PostAsync("https://discord.com/api/v6/oauth2/token", new FormUrlEncodedContent(postDataDict)); + HttpResponseMessage response = await client.PostAsync("https://discord.com/api/v10/oauth2/token", new FormUrlEncodedContent(postDataDict)); if (!response.IsSuccessStatusCode) { @@ -193,7 +193,15 @@ public static async void OAuthLoginRefresh(string refresh_token) } string responseString = await response.Content.ReadAsStringAsync(); - Dictionary data = JsonConvert.DeserializeObject>(responseString); + JObject jsonResponse = JObject.Parse(responseString); + Dictionary data = new Dictionary + { + { "access_token", jsonResponse["access_token"]?.ToString() }, + { "refresh_token", jsonResponse["refresh_token"]?.ToString() }, + { "token_type", jsonResponse["token_type"]?.ToString() }, + { "expires_in", jsonResponse["expires_in"]?.ToString() }, + { "scope", jsonResponse["scope"]?.ToString() } + }; ProcessResponse(data); } } @@ -224,9 +232,17 @@ public static async void OAuthLoginResponse(string code) try { - HttpResponseMessage response = await client.PostAsync("https://discord.com/api/v6/oauth2/token", new FormUrlEncodedContent(postDataDict)); + HttpResponseMessage response = await client.PostAsync("https://discord.com/api/v10/oauth2/token", new FormUrlEncodedContent(postDataDict)); string responseString = await response.Content.ReadAsStringAsync(); - Dictionary data = JsonConvert.DeserializeObject>(responseString); + JObject jsonResponse = JObject.Parse(responseString); + Dictionary data = new Dictionary + { + { "access_token", jsonResponse["access_token"]?.ToString() }, + { "refresh_token", jsonResponse["refresh_token"]?.ToString() }, + { "token_type", jsonResponse["token_type"]?.ToString() }, + { "expires_in", jsonResponse["expires_in"]?.ToString() }, + { "scope", jsonResponse["scope"]?.ToString() } + }; ProcessResponse(data); } catch (HttpRequestException ex) @@ -272,17 +288,25 @@ private static async void FetchUserDetails() { try { - HttpResponseMessage userResponse = await client.GetAsync("https://discord.com/api/v6/users/@me"); + HttpResponseMessage userResponse = await client.GetAsync("https://discord.com/api/v10/users/@me"); string responseString = await userResponse.Content.ReadAsStringAsync(); - Dictionary data = JsonConvert.DeserializeObject>(responseString); + JObject jsonResponse = JObject.Parse(responseString); - if (data == null || !data.ContainsKey("username")) + if (jsonResponse == null || jsonResponse["username"] == null) { Logger.LogRow(Logger.LogType.Error, "Invalid user data received from OAuth server."); return; } - discordUserData = data; + discordUserData = new Dictionary + { + { "id", jsonResponse["id"]?.ToString() }, + { "username", jsonResponse["username"]?.ToString() }, + { "discriminator", jsonResponse["discriminator"]?.ToString() ?? "0" }, + { "avatar", jsonResponse["avatar"]?.ToString() }, + { "global_name", jsonResponse["global_name"]?.ToString() } + }; + FetchAccessCodes(); } catch (Exception ex) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Program.cs b/Program.cs index 7c5ab9c..2fbefb4 100644 --- a/Program.cs +++ b/Program.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections; using System.Collections.Concurrent; using System.Collections.Generic; @@ -3763,9 +3763,9 @@ public static string CurrentSparkLink(string sessionid) { link = SparkSettings.instance.atlasLinkStyle switch { - 0 => $"", - 1 => $"", - 2 => $"", + 0 => $"https://echo.taxi/spark://c/{sessionid}", + 1 => $"https://echo.taxi/spark://j/{sessionid}", + 2 => $"https://echo.taxi/spark://s/{sessionid}", _ => link }; } @@ -3773,9 +3773,9 @@ public static string CurrentSparkLink(string sessionid) { link = SparkSettings.instance.atlasLinkStyle switch { - 0 => $"spark://c/{sessionid}", - 1 => $"spark://j/{sessionid}", - 2 => $"spark://s/{sessionid}", + 0 => $"https://echo.taxi/spark://c/{sessionid}", + 1 => $"https://echo.taxi/spark://j/{sessionid}", + 2 => $"https://echo.taxi/spark://s/{sessionid}", _ => link }; } @@ -3886,4 +3886,4 @@ public static string ToLocalizedString(this Team.TeamColor color) } } -} \ No newline at end of file +} diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index cf04a95..b0f6343 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -4087,11 +4087,10 @@ public static string tts_meters_per_second { /// /// Looks up a localized string similar to TTS only works when logged in with Discord! /// - ///(top left of main window). /// - public static string TTS_only_works_when_logged_in_with_Discord_ { + public static string TTS_works_whenever_i_want_it_too_ { get { - return ResourceManager.GetString("TTS only works when logged in with Discord!", resourceCulture); + return ResourceManager.GetString("TTS works whenever i want it too", resourceCulture); } } diff --git a/README.md b/README.md index d967d76..1ee53fe 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,14 @@ # Spark -Download and features list: -https://ignitevr.gg/spark +Modified fork of Spark with extra features and bug fixes, new features include +- Discord Login Fix +- Server Browser Tab For Spectators +- TTS No Longer Requires Discord Login +- Auto Follow User Has Been Reworked +- Changed Spark Link To Echo Taxi Links +- Removed Rumble +- Added PlayerStats And Leaderboard +- Ability To Update In Spark +- Different Colour Themes (see below) Installation instructions: https://echopedia.gg/wiki/Spark @@ -11,4 +19,10 @@ https://echopedia.gg/wiki/Spark Spark is a Windows desktop program that can record, process, and upload EchoVR data from either a local EchoVR client or an Oculus Quest on the same network. ## License -Source available under the [Commons Clause](https://commonsclause.com/) +Source available under [GPLv3](https://www.gnu.org/licenses/gpl-3.0.en.html) +Screenshot_135 +Screenshot_142 +Screenshot_141 +Screenshot_143 +Screenshot_144 +Screenshot (154) diff --git a/SparkSettings.cs b/SparkSettings.cs index 1d791b0..f5e17c0 100644 --- a/SparkSettings.cs +++ b/SparkSettings.cs @@ -1,4 +1,4 @@ -//using ButterReplays; +//using ButterReplays; using Newtonsoft.Json; using System; @@ -38,6 +38,7 @@ class SparkSettings /// public bool enableFullLogging { get; set; } = false; + public int ttsSpeedIndex { get; set; } = 1; public bool onlyRecordPrivateMatches { get; set; } = false; public bool batchWrites { get; set; } = true; public bool useCompression { get; set; } = true; @@ -372,4 +373,4 @@ public static void Load() } } } -} \ No newline at end of file +} diff --git a/Windows/LiveWindow/CreateServerControls.xaml b/Windows/LiveWindow/CreateServerControls.xaml index d2ec204..d7df5a0 100644 --- a/Windows/LiveWindow/CreateServerControls.xaml +++ b/Windows/LiveWindow/CreateServerControls.xaml @@ -1,4 +1,4 @@ - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + @@ -315,7 +312,7 @@ - + - \ No newline at end of file + diff --git a/Windows/Settings/UnifiedSettingsWindow.xaml.cs b/Windows/Settings/UnifiedSettingsWindow.xaml.cs index 6e6f2f2..961a6b7 100644 --- a/Windows/Settings/UnifiedSettingsWindow.xaml.cs +++ b/Windows/Settings/UnifiedSettingsWindow.xaml.cs @@ -1,4 +1,4 @@ -using Microsoft.Win32; +using Microsoft.Win32; using System; using System.Collections.Generic; using System.ComponentModel; @@ -909,75 +909,6 @@ private void RemoveReshade(object sender, RoutedEventArgs e) } } - private void InstallRumble(object sender, RoutedEventArgs e) - { - if (string.IsNullOrEmpty(SparkSettings.instance.echoVRPath)) return; - if (!File.Exists(SparkSettings.instance.echoVRPath)) return; - - RumbleProgress.Visibility = Visibility.Visible; - RumbleProgress.Value = 0; - - // delete the old temp file - if (File.Exists(Path.Combine(Path.GetTempPath(), "dbgcore.dll"))) - { - File.Delete(Path.Combine(Path.GetTempPath(), "dbgcore.dll")); - } - - // download reshade - try - { - WebClient webClient = new WebClient(); - webClient.DownloadFileCompleted += RumbleDownloadCompleted; - webClient.DownloadProgressChanged += RumbleDownloadProgressChanged; - webClient.DownloadFileAsync(new Uri("https://github.com/NtsFranz/Spark/raw/main/resources/dbgcore.dll"), Path.Combine(Path.GetTempPath(), "dbgcore.dll")); - } - catch (Exception) - { - new MessageBox("Something broke while trying to download update", Properties.Resources.Error).Show(); - } - } - - private void RumbleDownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e) - { - RumbleProgress.Visibility = Visibility.Visible; - RumbleProgress.Value = e.ProgressPercentage; - } - - private void RumbleDownloadCompleted(object sender, AsyncCompletedEventArgs e) - { - try - { - // install rumble from the zip - string dir = Path.GetDirectoryName(SparkSettings.instance.echoVRPath); - if (dir != null) - { - File.Copy(Path.Combine(Path.GetTempPath(), "dbgcore.dll"), Path.Combine(dir, "dbgcore.dll"), true); - } - } - catch (Exception) - { - new MessageBox("Something broke while trying to install Rumble. Report this to NtsFranz", Properties.Resources.Error).Show(); - } - - RumbleProgress.Visibility = Visibility.Collapsed; - } - - private void RemoveRumble(object sender, RoutedEventArgs e) - { - if (string.IsNullOrEmpty(SparkSettings.instance.echoVRPath)) return; - if (!File.Exists(SparkSettings.instance.echoVRPath)) return; - string dir = Path.GetDirectoryName(SparkSettings.instance.echoVRPath); - if (dir == null) return; - - try - { - File.Delete(Path.Combine(dir, "dbgcore.dll")); - } - catch (UnauthorizedAccessException) - { - new MessageBox("Can't uninstall Rumble. Try closing EchoVR and trying again.", Properties.Resources.Error).Show(); - } - } private void SaveQuestIPClicked(object sender, RoutedEventArgs e) { @@ -1028,4 +959,4 @@ private void Initialize() Mode = BindingMode.OneWay; } } -} \ No newline at end of file +}