Removed Teknik, Updated to Legacy API, Basic Fix For Unfound Dependen…

…cy Issues
bsmg · Jan 4, 2025 · db77363 · db77363
1 parent 75daf23
commit db77363
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 82 deletions.
diff --git a/ModAssistant/Classes/Utils.cs b/ModAssistant/Classes/Utils.cs
@@ -26,11 +26,10 @@ public class Utils
         public class Constants
         {
             public const string BeatSaberAPPID = "620980";
-            public const string BeatModsAPIUrl = "https://beatmods.com/api/v1/";
-            public const string TeknikAPIUrl = "https://api.teknik.io/v1/";
             public const string BeatModsURL = "https://beatmods.com";
-            public const string BeatModsVersions = "https://versions.beatmods.com/versions.json";
-            public const string BeatModsAlias = "https://alias.beatmods.com/aliases.json";
+            public const string BeatModsAPIUrl = BeatModsURL + "/api/beatmods/";
+            public const string BeatModsVersions = BeatModsURL + "/api/beatmods/versions";
+            public const string BeatModsAlias = BeatModsURL + "/api/beatmods/aliases";
             public const string WeebCDNAPIURL = "https://waifu.pics/api/sfw/";
             public const string BeatModsModsOptions = "mod?status=approved";
             public const string MD5Spacer = "                                 ";
@@ -44,20 +43,6 @@ public class Constants
             };
         }
 
-        public class TeknikPasteResponse
-        {
-            public Result result;
-            public class Result
-            {
-                public string id;
-                public string url;
-                public string title;
-                public string syntax;
-                public DateTime? expiration;
-                public string password;
-            }
-        }
-
         public class WeebCDNRandomResponse
         {
             public string url;

diff --git a/ModAssistant/Pages/Mods.xaml.cs b/ModAssistant/Pages/Mods.xaml.cs
@@ -562,6 +562,12 @@ private void ResolveDependencies(Mod dependent)
             {
                 foreach (Mod.Dependency dependency in dependent.dependencies)
                 {
+                    if(dependency.Mod == null)
+                    {
+                        dependent.ListItem.IsEnabled = false;
+                        continue;
+                    }
+
                     if (dependency.Mod.ListItem.IsEnabled)
                     {
                         dependency.Mod.ListItem.PreviousState = dependency.Mod.ListItem.IsSelected;

diff --git a/ModAssistant/Pages/Options.xaml b/ModAssistant/Pages/Options.xaml
@@ -345,12 +345,6 @@
             Margin="0"
             HorizontalAlignment="Left"
             Orientation="Horizontal">
-                <Button
-                Height="30"
-                Margin="5"
-                Padding="5"
-                Click="OpenLogsDirButton_Click"
-                Content="{DynamicResource Options:OpenLogsButton}" />
                 <Button
                 x:Name="OpenAppData"
                 Height="30"

diff --git a/ModAssistant/Pages/Options.xaml.cs b/ModAssistant/Pages/Options.xaml.cs
@@ -196,62 +196,6 @@ private void ReinstallInstalled_Unchecked(object sender, RoutedEventArgs e)
             Properties.Settings.Default.Save();
         }
 
-        private async void OpenLogsDirButton_Click(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                MainWindow.Instance.MainText = $"{Application.Current.FindResource("Options:UploadingLog")}...";
-                await Task.Run(async () => await UploadLog());
-
-                Process.Start(LogURL);
-                Utils.SetClipboard(LogURL);
-                MainWindow.Instance.MainText = (string)Application.Current.FindResource("Options:LogUrlCopied");
-            }
-            catch (Exception exception)
-            {
-                MainWindow.Instance.MainText = $"{Application.Current.FindResource("Options:LogUploadFailed")}.";
-
-                string title = (string)Application.Current.FindResource("Options:LogUploadFailed:Title");
-                string body = (string)Application.Current.FindResource("Options:LogUploadFailed:Body");
-                MessageBox.Show($"{body}\n ================= \n" + exception, title);
-                Utils.OpenFolder(Path.Combine(InstallDirectory, "Logs"));
-            }
-        }
-
-        private async Task UploadLog()
-        {
-            const string DateFormat = "yyyy-mm-dd HH:mm:ss";
-            DateTime now = DateTime.Now;
-            string logPath = Path.GetDirectoryName(ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.PerUserRoamingAndLocal).FilePath);
-            string Log = Path.Combine(logPath, "log.log");
-            string GameLog = File.ReadAllText(Path.Combine(InstallDirectory, "Logs", "_latest.log"));
-            string Separator = File.Exists(Log) ? $"\n\n=============================================\n============= Mod Assistant Log =============\n=============================================\n\n" : string.Empty;
-            string ModAssistantLog = File.Exists(Log) ? File.ReadAllText(Log) : string.Empty;
-
-            var nvc = new List<KeyValuePair<string, string>>()
-            {
-                new KeyValuePair<string, string>("title", $"_latest.log ({now.ToString(DateFormat)})"),
-                new KeyValuePair<string, string>("expireUnit", "hour"),
-                new KeyValuePair<string, string>("expireLength", "5"),
-                new KeyValuePair<string, string>("code", $"{GameLog}{Separator}{ModAssistantLog}"),
-            };
-
-            string[] items = new string[nvc.Count];
-
-            for (int i = 0; i < nvc.Count; i++)
-            {
-                KeyValuePair<string, string> item = nvc[i];
-                items[i] = WebUtility.UrlEncode(item.Key) + "=" + WebUtility.UrlEncode(item.Value);
-            }
-
-            StringContent content = new StringContent(string.Join("&", items), null, "application/x-www-form-urlencoded");
-            HttpResponseMessage resp = await Http.HttpClient.PostAsync(Utils.Constants.TeknikAPIUrl + "Paste", content);
-            string body = await resp.Content.ReadAsStringAsync();
-
-            Utils.TeknikPasteResponse TeknikResponse = Http.JsonSerializer.Deserialize<Utils.TeknikPasteResponse>(body);
-            LogURL = TeknikResponse.result.url;
-        }
-
         private void OpenAppDataButton_Click(object sender, RoutedEventArgs e)
         {
             string location = Path.Combine(

diff --git a/ModAssistant/Properties/AssemblyInfo.cs b/ModAssistant/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.34.0")]
-[assembly: AssemblyFileVersion("1.1.34.0")]
+[assembly: AssemblyVersion("1.1.35.0")]
+[assembly: AssemblyFileVersion("1.1.35.0")]