Skip to content

Commit 91a1b83

Browse files
authored
old tiktok api enabled by default, option to enable use sessionID
1 parent 8341659 commit 91a1b83

File tree

7 files changed

+70
-12
lines changed

7 files changed

+70
-12
lines changed

OSCVRCWiz/Resources/StartUp/Updater.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace OSCVRCWiz.Resources.StartUp
88
public class Updater
99
{
1010

11-
public static string currentVersion = "1.7.4.1";
11+
public static string currentVersion = "1.7.4.3";
1212
public static string updateXMLName = "https://github.com/VRCWizard/TTS-Voice-Wizard/releases/latest/download/AutoUpdater-x64.xml";
1313

1414
public static async void getGithubInfo()

OSCVRCWiz/Services/Speech/TextToSpeech/TTSEngines/TikTokTTS.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,20 @@ public static async Task TikTokTextAsSpeech(TTSMessageQueue.TTSMessage TTSMessag
2626
ApiUrl = VoiceWizardWindow.MainFormGlobal.textBoxTikTokURL.Text.ToString();
2727
// stopwatch.Start();
2828
// result = await CallTikTokAPIAsync(TTSMessageQueued.text, TTSMessageQueued.Voice);
29-
var sessionID = VoiceWizardWindow.MainFormGlobal.textBoxTikTokSessionID.Text.ToString();
30-
if (string.IsNullOrWhiteSpace(sessionID))
29+
30+
if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonTikTokUseSession.Checked)
31+
{
32+
var sessionID = VoiceWizardWindow.MainFormGlobal.textBoxTikTokSessionID.Text.ToString();
33+
if (string.IsNullOrWhiteSpace(sessionID))
34+
{
35+
OutputText.outputLog("TikTok TTS now requires you input your own sessionID from TikTok to use the voices. Navigate to 'Speech Provider > Local > TikTok TTS' for further instructions on how to aquire your session ID from TikTok.", Color.DarkOrange);
36+
}
37+
result = await CallTikTokAPIAsyncSessionID(TTSMessageQueued.text, TTSMessageQueued.Voice, sessionID);
38+
}
39+
else
3140
{
32-
OutputText.outputLog("TikTok TTS now requires you input your own sessionID from TikTok to use the voices. Navigate to 'Speech Provider > Local > TikTok TTS' for further instructions on how to aquire your session ID from TikTok.", Color.DarkOrange);
41+
result = await CallTikTokAPIAsync(TTSMessageQueued.text, TTSMessageQueued.Voice);
3342
}
34-
result = await CallTikTokAPIAsyncSessionID(TTSMessageQueued.text, TTSMessageQueued.Voice, sessionID);
3543

3644
}
3745
catch (Exception ex)

OSCVRCWiz/Settings/LoadSettings.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,8 @@ public static void LoadingSettings()
482482

483483
VoiceWizardWindow.MainFormGlobal.textBoxTikTokURL.Text = Settings1.Default.TikTokAPIURL;
484484

485+
VoiceWizardWindow.MainFormGlobal.rjToggleButtonTikTokUseSession.Checked = Settings1.Default.TikTokUseSession;
486+
485487

486488

487489

OSCVRCWiz/Settings/SaveSettings.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,8 @@ public static void SavingSettings()
381381

382382
Settings1.Default.TikTokAPIURL = VoiceWizardWindow.MainFormGlobal.textBoxTikTokURL.Text;
383383

384+
Settings1.Default.TikTokUseSession = VoiceWizardWindow.MainFormGlobal.rjToggleButtonTikTokUseSession.Checked;
385+
384386

385387

386388
Settings1.Default.Save();

OSCVRCWiz/Settings/Settings1.Designer.cs

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

OSCVRCWiz/Settings/Settings1.settings

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -776,5 +776,8 @@
776776
<Setting Name="TikTokAPIURL" Type="System.String" Scope="User">
777777
<Value Profile="(Default)">https://api16-normal-useast5.us.tiktokv.com/media/api/text/speech/invoke/</Value>
778778
</Setting>
779+
<Setting Name="TikTokUseSession" Type="System.Boolean" Scope="User">
780+
<Value Profile="(Default)">False</Value>
781+
</Setting>
779782
</Settings>
780783
</SettingsFile>

OSCVRCWiz/VoiceWizardWindow.Designer.cs

Lines changed: 38 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)