Skip to content

Commit cebb0cc

Browse files
amirzaidiamirzaidi
committed
Update dependencies and change some commands
1 parent 33629cb commit cebb0cc

8 files changed

+84
-47
lines changed

‎Mirai/Audio/Formatting.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ internal static async Task Update(string TTSMessage)
2020
{
2121
var New = await Bot.SendTTS(TTSMessage, new EmbedBuilder()
2222
.WithTitle(Streamer.Queue.IsPlaying ?
23-
($"♫ {Streamer.Queue.Playing.Title}{(Streamer.Duration.TotalMilliseconds == 0 ? "" : $" [{Math.Floor(Streamer.Duration.TotalMinutes)}:{Streamer.Duration.Seconds}]")} ♫")
23+
($"♫ {Streamer.Queue.Playing.Title} ♫")
2424
: "Nothing is playing")
2525
.WithUrl(Streamer.Queue.IsPlaying && Streamer.Queue.Playing.Url.StartsWith("http") ? Streamer.Queue.Playing.Url : "https://github.com/amirzaidi/slimmirai")
2626
.WithThumbnailUrl(Streamer.Queue.Playing.ThumbNail)

‎Mirai/Audio/Streamer.cs

+8-9
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ internal static async Task Start(IAudioClient Client)
4646
try
4747
{
4848
await Queue.Next(Cancel.Token);
49-
5049
Skip = new CancellationTokenSource();
50+
51+
if (SS == 0)
52+
Formatting.Update($"Now playing {Queue.Playing.Title}");
5153

5254
await Client.SetSpeakingAsync(true);
5355
using (var Out = Client.CreateDirectPCMStream(AudioApplication.Music, 128 * 1024, 0))
@@ -80,11 +82,11 @@ internal static void ReloadSong()
8082

8183
private static async Task StreamAsync(AudioOutStream Out)
8284
{
83-
var SS = Streamer.SS.ToString(CultureInfo.InvariantCulture);
85+
var SSText = SS.ToString(CultureInfo.InvariantCulture);
8486
var FFMpeg = Process.Start(new ProcessStartInfo
8587
{
8688
FileName = "ffmpeg",
87-
Arguments = $"-ss {SS} -re -i pipe:0 -f s16le -ac 2 -af \"{Filter.Tag}\" -ar 48000 pipe:1",
89+
Arguments = $"-ss {SSText} -re -i pipe:0 -f s16le -ac 2 -af \"{Filter.Tag}\" -ar 48000 pipe:1",
8890
UseShellExecute = false,
8991
RedirectStandardInput = true,
9092
RedirectStandardOutput = true,
@@ -101,11 +103,8 @@ private static async Task StreamAsync(AudioOutStream Out)
101103
{
102104
TimeSpan.TryParse(FFLog.Substring(10).Split(new[] { ',' }, 2, StringSplitOptions.RemoveEmptyEntries)[0], out Duration);
103105

104-
if (Streamer.SS == 0)
105-
{
106-
Bot.Client.SetGameAsync(Queue.Playing.Title);
107-
Formatting.Update($"Playing {Queue.Playing.Title}");
108-
}
106+
if (SS == 0 && Duration.TotalMilliseconds > 0)
107+
Bot.Client.SetGameAsync($"a song ({Math.Floor(Duration.TotalMinutes)}:{Duration.Seconds})");
109108
}
110109
else if (FFLog.StartsWith("size="))
111110
{
@@ -142,7 +141,7 @@ private static async Task StreamAsync(AudioOutStream Out)
142141
await Send;
143142
}
144143

145-
Streamer.SS = 0; //After full process without skip
144+
SS = 0; //After full process without skip
146145
}
147146
catch (TaskCanceledException)
148147
{

‎Mirai/Command.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ internal static void Load(string Mention)
5454
e.Append(NumberChoices);
5555
});
5656

57-
AddVoiced("add", Audio.Commands.Add, 1, e =>
57+
AddVoiced("play", Audio.Commands.Add, 1, e =>
5858
{
5959
var Songs = new GrammarBuilder(new Choices(PopulateSongList().ToArray()));
6060
e.Append(new Choices(Songs, Songs + new Choices(Audio.Commands.SearchTypes.Select(x => $"from {x.ToString()}").ToArray())));

‎Mirai/Mirai.csproj

+51-19
Original file line numberDiff line numberDiff line change
@@ -45,56 +45,88 @@
4545
<Reference Include="Discord.Net.WebSocket, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
4646
<HintPath>..\packages\Discord.Net.WebSocket.1.0.2\lib\net45\Discord.Net.WebSocket.dll</HintPath>
4747
</Reference>
48-
<Reference Include="Google.Apis, Version=1.31.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
49-
<HintPath>..\packages\Google.Apis.1.31.0-beta01\lib\net45\Google.Apis.dll</HintPath>
48+
<Reference Include="Google.Apis, Version=1.34.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Google.Apis.1.34.0\lib\net45\Google.Apis.dll</HintPath>
5050
</Reference>
51-
<Reference Include="Google.Apis.Auth, Version=1.31.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
52-
<HintPath>..\packages\Google.Apis.Auth.1.31.0-beta01\lib\net45\Google.Apis.Auth.dll</HintPath>
51+
<Reference Include="Google.Apis.Auth, Version=1.34.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Google.Apis.Auth.1.34.0\lib\net45\Google.Apis.Auth.dll</HintPath>
5353
</Reference>
54-
<Reference Include="Google.Apis.Auth.PlatformServices, Version=1.31.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
55-
<HintPath>..\packages\Google.Apis.Auth.1.31.0-beta01\lib\net45\Google.Apis.Auth.PlatformServices.dll</HintPath>
54+
<Reference Include="Google.Apis.Auth.PlatformServices, Version=1.34.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
55+
<HintPath>..\packages\Google.Apis.Auth.1.34.0\lib\net45\Google.Apis.Auth.PlatformServices.dll</HintPath>
5656
</Reference>
57-
<Reference Include="Google.Apis.Core, Version=1.31.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
58-
<HintPath>..\packages\Google.Apis.Core.1.31.0-beta01\lib\net45\Google.Apis.Core.dll</HintPath>
57+
<Reference Include="Google.Apis.Core, Version=1.34.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
58+
<HintPath>..\packages\Google.Apis.Core.1.34.0\lib\net45\Google.Apis.Core.dll</HintPath>
5959
</Reference>
60-
<Reference Include="Google.Apis.PlatformServices, Version=1.31.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
61-
<HintPath>..\packages\Google.Apis.1.31.0-beta01\lib\net45\Google.Apis.PlatformServices.dll</HintPath>
60+
<Reference Include="Google.Apis.PlatformServices, Version=1.34.0.0, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
61+
<HintPath>..\packages\Google.Apis.1.34.0\lib\net45\Google.Apis.PlatformServices.dll</HintPath>
6262
</Reference>
63-
<Reference Include="Google.Apis.YouTube.v3, Version=1.30.0.1035, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
64-
<HintPath>..\packages\Google.Apis.YouTube.v3.1.30.0.1035\lib\net45\Google.Apis.YouTube.v3.dll</HintPath>
63+
<Reference Include="Google.Apis.YouTube.v3, Version=1.34.0.1226, Culture=neutral, PublicKeyToken=4b01fa6e34db77ab, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Google.Apis.YouTube.v3.1.34.0.1226\lib\net45\Google.Apis.YouTube.v3.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.Speech, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6767
<SpecificVersion>False</SpecificVersion>
6868
<HintPath>..\..\..\..\..\..\..\Program Files\Microsoft SDKs\Speech\v11.0\Assembly\Microsoft.Speech.dll</HintPath>
6969
</Reference>
7070
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
71-
<HintPath>..\packages\Newtonsoft.Json.11.0.1-beta1\lib\net45\Newtonsoft.Json.dll</HintPath>
71+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
7272
</Reference>
7373
<Reference Include="System" />
74-
<Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
75-
<HintPath>..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
74+
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
75+
<HintPath>..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
7676
</Reference>
7777
<Reference Include="System.ComponentModel.Composition" />
7878
<Reference Include="System.Configuration" />
79+
<Reference Include="System.Console">
80+
<HintPath>..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
81+
<Private>True</Private>
82+
</Reference>
7983
<Reference Include="System.Core" />
80-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
81-
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
84+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
85+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
8286
</Reference>
8387
<Reference Include="System.Drawing" />
8488
<Reference Include="System.Interactive.Async, Version=3.0.3000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
8589
<HintPath>..\packages\System.Interactive.Async.3.1.1\lib\net46\System.Interactive.Async.dll</HintPath>
8690
</Reference>
8791
<Reference Include="System.IO.Compression.FileSystem" />
92+
<Reference Include="System.Net.Http">
93+
<HintPath>..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll</HintPath>
94+
<Private>True</Private>
95+
</Reference>
96+
<Reference Include="System.Net.WebSockets.Client">
97+
<HintPath>..\packages\System.Net.WebSockets.Client.4.3.2\lib\net46\System.Net.WebSockets.Client.dll</HintPath>
98+
<Private>True</Private>
99+
</Reference>
88100
<Reference Include="System.Numerics" />
89101
<Reference Include="System.Runtime.Serialization" />
90-
<Reference Include="System.Text.Encodings.Web, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
91-
<HintPath>..\packages\System.Text.Encodings.Web.4.4.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
102+
<Reference Include="System.Security.Cryptography.Algorithms">
103+
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
104+
<Private>True</Private>
105+
</Reference>
106+
<Reference Include="System.Security.Cryptography.Encoding">
107+
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
108+
<Private>True</Private>
109+
</Reference>
110+
<Reference Include="System.Security.Cryptography.Primitives">
111+
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
112+
<Private>True</Private>
113+
</Reference>
114+
<Reference Include="System.Security.Cryptography.X509Certificates">
115+
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
116+
<Private>True</Private>
117+
</Reference>
118+
<Reference Include="System.Text.Encodings.Web, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
119+
<HintPath>..\packages\System.Text.Encodings.Web.4.5.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
92120
</Reference>
93121
<Reference Include="System.Xml.Linq" />
94122
<Reference Include="System.Data.DataSetExtensions" />
95123
<Reference Include="Microsoft.CSharp" />
96124
<Reference Include="System.Data" />
97125
<Reference Include="System.Xml" />
126+
<Reference Include="System.Xml.ReaderWriter">
127+
<HintPath>..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
128+
<Private>True</Private>
129+
</Reference>
98130
<Reference Include="Zlib.Portable, Version=1.11.0.0, Culture=neutral, processorArchitecture=MSIL">
99131
<HintPath>..\packages\Zlib.Portable.1.11.0\lib\portable-net4+sl5+wp8+win8+wpa81+MonoTouch+MonoAndroid\Zlib.Portable.dll</HintPath>
100132
</Reference>

‎Mirai/User.cs

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ struct User
2222
{ 233954595049701377, new User(0.325f) }, //Shivan
2323
{ 173371010278621184, new User(0.300f) }, //Rick
2424
{ 87982581550702592, new User(0.275f) }, //Rens
25+
{ 394822386295373846, new User(0.25f) }, //Ismet
2526
};
2627

2728
internal static int GetRank(ulong Id)

‎Mirai/packages.config

+16-11
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,30 @@
33
<package id="Discord.Net.Core" version="1.0.2" targetFramework="net461" />
44
<package id="Discord.Net.Rest" version="1.0.2" targetFramework="net461" />
55
<package id="Discord.Net.WebSocket" version="1.0.2" targetFramework="net461" />
6-
<package id="Google.Apis" version="1.31.0-beta01" targetFramework="net461" />
7-
<package id="Google.Apis.Auth" version="1.31.0-beta01" targetFramework="net461" />
8-
<package id="Google.Apis.Core" version="1.31.0-beta01" targetFramework="net461" />
9-
<package id="Google.Apis.YouTube.v3" version="1.30.0.1035" targetFramework="net461" />
6+
<package id="Google.Apis" version="1.34.0" targetFramework="net461" />
7+
<package id="Google.Apis.Auth" version="1.34.0" targetFramework="net461" />
8+
<package id="Google.Apis.Core" version="1.34.0" targetFramework="net461" />
9+
<package id="Google.Apis.YouTube.v3" version="1.34.0.1226" targetFramework="net461" />
1010
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
11-
<package id="Newtonsoft.Json" version="11.0.1-beta1" targetFramework="net461" />
12-
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
13-
<package id="System.Console" version="4.3.0" targetFramework="net461" />
14-
<package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net461" />
11+
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
12+
<package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
13+
<package id="System.Console" version="4.3.1" targetFramework="net461" />
14+
<package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net461" />
1515
<package id="System.Interactive.Async" version="3.1.1" targetFramework="net461" />
1616
<package id="System.IO.Compression" version="4.3.0" targetFramework="net461" />
1717
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="net461" />
1818
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net461" />
19+
<package id="System.Net.Http" version="4.3.3" targetFramework="net461" />
1920
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net461" />
2021
<package id="System.Net.WebSockets" version="4.3.0" targetFramework="net461" />
21-
<package id="System.Net.WebSockets.Client" version="4.3.1" targetFramework="net461" />
22+
<package id="System.Net.WebSockets.Client" version="4.3.2" targetFramework="net461" />
2223
<package id="System.Runtime" version="4.3.0" targetFramework="net461" />
2324
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
24-
<package id="System.Text.Encodings.Web" version="4.4.0" targetFramework="net461" />
25-
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
25+
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net461" />
26+
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
27+
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
28+
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net461" />
29+
<package id="System.Text.Encodings.Web" version="4.5.0" targetFramework="net461" />
30+
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net461" />
2631
<package id="Zlib.Portable" version="1.11.0" targetFramework="net461" />
2732
</packages>

‎Search/Search.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.30.0.1035" />
14-
<PackageReference Include="Newtonsoft.Json" Version="11.0.1-beta1" />
15-
<PackageReference Include="System.Text.Encodings.Web" Version="4.4.0" />
16-
<PackageReference Include="YoutubeExplode" Version="3.4.0-workaround404" />
13+
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.34.0.1226" />
14+
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
15+
<PackageReference Include="System.Text.Encodings.Web" Version="4.5.0" />
16+
<PackageReference Include="YoutubeExplode" Version="4.2.8" />
1717
</ItemGroup>
1818

1919
</Project>

‎Search/SongRequest.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ public static async Task<string> StreamUrl(Song Song)
2828

2929
var Client = new YoutubeClient();
3030

31-
var Vid = await Client.GetVideoAsync(Id);
31+
var Vid = await Client.GetVideoMediaStreamInfosAsync(Id);
3232
var Url = new Func<String>(delegate { return string.Empty; });
3333

3434
long Bitrate = 0;
35-
foreach (var V in Vid.AudioStreamInfos)
35+
foreach (var V in Vid.Audio)
3636
if (V.Bitrate > Bitrate)
3737
{
3838
Bitrate = V.Bitrate;

0 commit comments

Comments
 (0)