Changed namespace of Discord related classes

Added temporary rich presence disabling code for R8 just in case
AuriRex · Oct 20, 2023 · 1a28bcb · 1a28bcb
1 parent 27edf68
commit 1a28bcb
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 9 deletions.
diff --git a/TheArchive.Core/Core/DiscordApi/ActivityManager.cs b/TheArchive.Core/Core/DiscordApi/ActivityManager.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Discord
+namespace TheArchive.Core.Discord
 {
     public partial class ActivityManager
     {

diff --git a/TheArchive.Core/Core/DiscordApi/Constants.cs b/TheArchive.Core/Core/DiscordApi/Constants.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Discord
+namespace TheArchive.Core.Discord
 {
     static class Constants
     {

diff --git a/TheArchive.Core/Core/DiscordApi/Core.cs b/TheArchive.Core/Core/DiscordApi/Core.cs
@@ -4,7 +4,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace Discord
+namespace TheArchive.Core.Discord
 {
     public enum Result
     {

diff --git a/TheArchive.Core/Core/DiscordApi/ImageManager.cs b/TheArchive.Core/Core/DiscordApi/ImageManager.cs
@@ -4,7 +4,7 @@
 using UnityEngine;
 #endif
 
-namespace Discord
+namespace TheArchive.Core.Discord
 {
 	public partial struct ImageHandle
     {

diff --git a/TheArchive.Core/Core/DiscordApi/LobbyManager.cs b/TheArchive.Core/Core/DiscordApi/LobbyManager.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Discord
+namespace TheArchive.Core.Discord
 {
     public partial class LobbyManager
     {

diff --git a/TheArchive.Core/Core/DiscordApi/StorageManager.cs b/TheArchive.Core/Core/DiscordApi/StorageManager.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Discord
+namespace TheArchive.Core.Discord
 {
     public partial class StorageManager
     {

diff --git a/TheArchive.Core/Core/DiscordApi/StoreManager.cs b/TheArchive.Core/Core/DiscordApi/StoreManager.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Discord
+namespace TheArchive.Core.Discord
 {
     public partial class StoreManager
     {

diff --git a/TheArchive.Core/Core/Managers/DiscordManager.cs b/TheArchive.Core/Core/Managers/DiscordManager.cs
@@ -1,8 +1,8 @@
-using Discord;
-using System;
+using System;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using TheArchive.Core.Discord;
 using TheArchive.Core.Models;
 using TheArchive.Core.Settings;
 using TheArchive.Interfaces;

diff --git a/TheArchive.Core/Core/Settings/RichPresenceSettings.cs b/TheArchive.Core/Core/Settings/RichPresenceSettings.cs
@@ -6,6 +6,9 @@ namespace TheArchive.Core.Settings
 {
     public class RichPresenceSettings
     {
+        [FSHide]
+        public bool DoRundown8DisableCheck { get; set; } = true;
+
         [FSHide]
         public bool DEBUG_UseDefaultSettings { get; set; } = false;
 

diff --git a/TheArchive.IL2CPP/Features/Presence/DiscordRichPresence.cs b/TheArchive.IL2CPP/Features/Presence/DiscordRichPresence.cs
@@ -1,5 +1,7 @@
 using CellMenu;
+using GameData;
 using System;
+using TheArchive.Core;
 using TheArchive.Core.Attributes;
 using TheArchive.Core.FeaturesAPI;
 using TheArchive.Core.Managers;
@@ -34,6 +36,15 @@ public override void Init()
 
         public override void OnEnable()
         {
+            if (DiscordRPCSettings.DoRundown8DisableCheck && Is.R6OrLater && LikelyIsOnR8())
+            {
+                FeatureLogger.Notice("Disabling Rich Presence for Rundown 8 for now!");
+                DiscordRPCSettings.DoRundown8DisableCheck = false;
+                MarkSettingsAsDirty(DiscordRPCSettings);
+                FeatureManager.Instance.DisableFeature(this);
+                return;
+            }
+
             try
             {
                 DiscordManager.OnActivityJoin += DiscordManager_OnActivityJoin;
@@ -45,6 +56,17 @@ public override void OnEnable()
             }
         }
 
+        private bool LikelyIsOnR8()
+        {
+#if IL2CPP
+            var setupDB = GameSetupDataBlock.GetBlock(1);
+
+            return BuildDB.BuildNumber > 33871 && setupDB.RundownIdsToLoad.Count > 7;
+#else
+            return false;
+#endif
+        }
+
         public override void OnGameDataInitialized()
         {
             OnEnable();