Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(Discord RPC) Migrate to discord-rpc-csharp #404

Merged
merged 4 commits into from
Feb 16, 2024
Merged

(Discord RPC) Migrate to discord-rpc-csharp #404

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2020a1d
(Discord RPC) Migrate to discord-rpc-csharp
shatyuka Feb 14, 2024
8b4a181
(Discord RPC) Fix multi-thread issue caused by `CheckRunningGameInsta…
shatyuka Feb 16, 2024
79ae950
Update base
bagusnl Feb 16, 2024
72e3374
Merge branch 'main' into discord-rpc
Cryotechnic Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@
[submodule "InnoSetupHelper/InnoSetupLogParser"]
path = InnoSetupHelper/InnoSetupLogParser
url = https://github.com/CollapseLauncher/InnoSetupLogParser
[submodule "Hi3Helper.SharpDiscordRPC"]
path = Hi3Helper.SharpDiscordRPC
url = https://github.com/CollapseLauncher/Hi3Helper.SharpDiscordRPC
8 changes: 8 additions & 0 deletions CollapseLauncher.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SevenZipExtractor", "Hi3Hel
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InnoSetupHelper", "InnoSetupHelper\InnoSetupHelper.csproj", "{21691306-8D30-4993-98A2-A5AE0712D81A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscordRPC", "Hi3Helper.SharpDiscordRPC\DiscordRPC\DiscordRPC.csproj", "{2004AA88-FFC3-4186-B11A-3E4C577A3D25}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Expand Down Expand Up @@ -72,6 +74,12 @@ Global
{21691306-8D30-4993-98A2-A5AE0712D81A}.Publish|x64.Build.0 = Release|x64
{21691306-8D30-4993-98A2-A5AE0712D81A}.Release|x64.ActiveCfg = Release|x64
{21691306-8D30-4993-98A2-A5AE0712D81A}.Release|x64.Build.0 = Release|x64
{2004AA88-FFC3-4186-B11A-3E4C577A3D25}.Debug|x64.ActiveCfg = Debug|Any CPU
{2004AA88-FFC3-4186-B11A-3E4C577A3D25}.Debug|x64.Build.0 = Debug|Any CPU
{2004AA88-FFC3-4186-B11A-3E4C577A3D25}.Publish|x64.ActiveCfg = Debug|Any CPU
{2004AA88-FFC3-4186-B11A-3E4C577A3D25}.Publish|x64.Build.0 = Debug|Any CPU
{2004AA88-FFC3-4186-B11A-3E4C577A3D25}.Release|x64.ActiveCfg = Release|Any CPU
{2004AA88-FFC3-4186-B11A-3E4C577A3D25}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
9 changes: 6 additions & 3 deletions CollapseLauncher/XAMLs/MainApp/Pages/CachesPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ public CachesPage()

this.InitializeComponent();
BackgroundImgChanger.ToggleBackground(true);
#if !DISABLEDISCORD
AppDiscordPresence.SetActivity(ActivityType.Cache);
#endif
}

private void StartCachesCheckSplitButton(SplitButton sender, SplitButtonClickEventArgs args)
Expand Down Expand Up @@ -210,6 +207,12 @@ private void InitializeLoaded(object sender, RoutedEventArgs e)
OverlayTitle.Text = Lang._CachesPage.OverlayGameRunningTitle;
OverlaySubtitle.Text = Lang._CachesPage.OverlayGameRunningSubtitle;
}
else
{
#if !DISABLEDISCORD
AppDiscordPresence.SetActivity(ActivityType.Cache);
#endif
}
}

private void Page_Unloaded(object sender, RoutedEventArgs e)
Expand Down
8 changes: 4 additions & 4 deletions CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/GenshinGameSettingsPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,6 @@ private void InitializeSettings(object sender, RoutedEventArgs e)
OverlayTitle.Text = Lang._StarRailGameSettingsPage.OverlayGameRunningTitle;
OverlaySubtitle.Text = Lang._StarRailGameSettingsPage.OverlayGameRunningSubtitle;
#endif
return;
}
else if (GameInstallationState == GameInstallStateEnum.NotInstalled
|| GameInstallationState == GameInstallStateEnum.NeedsUpdate
Expand All @@ -189,12 +188,13 @@ private void InitializeSettings(object sender, RoutedEventArgs e)
PageContent.Visibility = Visibility.Collapsed;
OverlayTitle.Text = Lang._StarRailGameSettingsPage.OverlayNotInstalledTitle;
OverlaySubtitle.Text = Lang._StarRailGameSettingsPage.OverlayNotInstalledSubtitle;

return;
}
else
{
#if !DISABLEDISCORD
AppDiscordPresence.SetActivity(ActivityType.GameSettings);
AppDiscordPresence.SetActivity(ActivityType.GameSettings);
#endif
}
}
catch (Exception ex)
{
Expand Down
8 changes: 4 additions & 4 deletions CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/HonkaiGameSettingsPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ private void InitializeSettings(object sender, RoutedEventArgs e)
OverlayTitle.Text = Lang._GameSettingsPage.OverlayGameRunningTitle;
OverlaySubtitle.Text = Lang._GameSettingsPage.OverlayGameRunningSubtitle;
#endif
return;
}
else if (GameInstallationState == GameInstallStateEnum.NotInstalled
|| GameInstallationState == GameInstallStateEnum.NeedsUpdate
Expand All @@ -154,12 +153,13 @@ private void InitializeSettings(object sender, RoutedEventArgs e)
PageContent.Visibility = Visibility.Collapsed;
OverlayTitle.Text = Lang._GameSettingsPage.OverlayNotInstalledTitle;
OverlaySubtitle.Text = Lang._GameSettingsPage.OverlayNotInstalledSubtitle;

return;
}
else
{
#if !DISABLEDISCORD
AppDiscordPresence.SetActivity(ActivityType.GameSettings);
AppDiscordPresence.SetActivity(ActivityType.GameSettings);
#endif
}
}
catch (Exception ex)
{
Expand Down
8 changes: 4 additions & 4 deletions CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/StarRailGameSettingsPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@ private void InitializeSettings(object sender, RoutedEventArgs e)
OverlayTitle.Text = Lang._StarRailGameSettingsPage.OverlayGameRunningTitle;
OverlaySubtitle.Text = Lang._StarRailGameSettingsPage.OverlayGameRunningSubtitle;
#endif
return;
}
else if (GameInstallationState == GameInstallStateEnum.NotInstalled
|| GameInstallationState == GameInstallStateEnum.NeedsUpdate
Expand All @@ -167,12 +166,13 @@ private void InitializeSettings(object sender, RoutedEventArgs e)
PageContent.Visibility = Visibility.Collapsed;
OverlayTitle.Text = Lang._StarRailGameSettingsPage.OverlayNotInstalledTitle;
OverlaySubtitle.Text = Lang._StarRailGameSettingsPage.OverlayNotInstalledSubtitle;

return;
}
else
{
#if !DISABLEDISCORD
AppDiscordPresence.SetActivity(ActivityType.GameSettings);
AppDiscordPresence.SetActivity(ActivityType.GameSettings);
#endif
}
}
catch (Exception ex)
{
Expand Down
6 changes: 3 additions & 3 deletions CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ private async void CheckRunningGameInstance(CancellationToken Token)
PlaytimeRunningStack.Visibility = Visibility.Visible;

#if !DISABLEDISCORD
AppDiscordPresence.SetActivity(ActivityType.Play, 0);
AppDiscordPresence.SetActivity(ActivityType.Play);
#endif

await Task.Delay(RefreshRate, Token);
Expand All @@ -871,9 +871,9 @@ private async void CheckRunningGameInstance(CancellationToken Token)
PlaytimeRunningStack.Visibility = Visibility.Collapsed;

#if !DISABLEDISCORD
AppDiscordPresence.SetActivity(ActivityType.Idle, 0);
AppDiscordPresence.SetActivity(ActivityType.Idle);
#endif

await Task.Delay(RefreshRate, Token);
}
}
Expand Down
9 changes: 6 additions & 3 deletions CollapseLauncher/XAMLs/MainApp/Pages/RepairPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ public RepairPage()
CurrentGameProperty = GetCurrentGameProperty();
BackgroundImgChanger.ToggleBackground(true);
this.InitializeComponent();
#if !DISABLEDISCORD
AppDiscordPresence.SetActivity(ActivityType.Repair);
#endif
}

private void StartGameCheckSplitButton(SplitButton sender, SplitButtonClickEventArgs args)
Expand Down Expand Up @@ -216,6 +213,12 @@ private void InitializeLoaded(object sender, RoutedEventArgs e)
OverlayTitle.Text = Lang._GameRepairPage.OverlayGameRunningTitle;
OverlaySubtitle.Text = Lang._GameRepairPage.OverlayGameRunningSubtitle;
}
else
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

{
#if !DISABLEDISCORD
AppDiscordPresence.SetActivity(ActivityType.Repair);
#endif
}
}
}
}
27 changes: 11 additions & 16 deletions CollapseLauncher/XAMLs/MainApp/Pages/SettingsPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ public SettingsPage()

string SwitchToVer = IsPreview ? "Stable" : "Preview";
ChangeReleaseBtnText.Text = string.Format(Lang._SettingsPage.AppChangeReleaseChannel, SwitchToVer);
#if !DISABLEDISCORD
AppDiscordPresence.SetActivity(ActivityType.AppSettings);
#else
#if DISABLEDISCORD
ToggleDiscordRPC.Visibility = Visibility.Collapsed;
#endif

Expand All @@ -73,6 +71,10 @@ public SettingsPage()
private void Page_Loaded(object sender, RoutedEventArgs e)
{
BackgroundImgChanger.ToggleBackground(true);

#if !DISABLEDISCORD
AppDiscordPresence.SetActivity(ActivityType.AppSettings);
#endif
}
#endregion

Expand Down Expand Up @@ -448,12 +450,12 @@ private bool IsDiscordRPCEnabled
if (IsEnabled)
{
ToggleDiscordGameStatus.Visibility = Visibility.Visible;
//ToggleDiscordIdleStatus.Visibility = Visibility.Visible;
ToggleDiscordIdleStatus.Visibility = Visibility.Visible;
}
else
{
ToggleDiscordGameStatus.Visibility = Visibility.Collapsed;
//ToggleDiscordIdleStatus.Visibility = Visibility.Collapsed;
ToggleDiscordIdleStatus.Visibility = Visibility.Collapsed;
}
return IsEnabled;
}
Expand All @@ -463,13 +465,13 @@ private bool IsDiscordRPCEnabled
{
AppDiscordPresence.SetupPresence();
ToggleDiscordGameStatus.Visibility = Visibility.Visible;
//ToggleDiscordIdleStatus.Visibility = Visibility.Visible;
ToggleDiscordIdleStatus.Visibility = Visibility.Visible;
}
else
{
AppDiscordPresence.DisablePresence();
ToggleDiscordGameStatus.Visibility = Visibility.Collapsed;
//ToggleDiscordIdleStatus.Visibility = Visibility.Collapsed;
ToggleDiscordIdleStatus.Visibility = Visibility.Collapsed;
}
SetAndSaveConfigValue("EnableDiscordRPC", value);
ToggleDiscordGameStatus.IsEnabled = value;
Expand All @@ -486,17 +488,10 @@ private bool IsDiscordGameStatusEnabled
}
}

// TODO: Fix this feature
// Temporarily force disable this
//private bool IsDiscordIdleStatusEnabled
//{
// get => AppDiscordPresence.IdleEnabled;
// set => AppDiscordPresence.IdleEnabled = value;
//}
private bool IsDiscordIdleStatusEnabled
{
get => true;
set => AppDiscordPresence.IdleEnabled = true;
get => AppDiscordPresence.IdleEnabled;
set => AppDiscordPresence.IdleEnabled = value;
}
#else
private bool IsDiscordRPCEnabled
Expand Down
7 changes: 7 additions & 0 deletions CollapseLauncher/packages.lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,9 +1290,16 @@
"System.Drawing.Common": "[8.0.1, )"
}
},
"discordrpc": {
"type": "Project",
"dependencies": {
"System.Text.Json": "[8.0.1, )"
}
},
"hi3helper.core": {
"type": "Project",
"dependencies": {
"DiscordRPC": "[1.0.0, )",
"Hi3Helper.EncTool": "[1.0.0, )",
"Hi3Helper.Http": "[1.0.0, )"
}
Expand Down
Loading
Loading