minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-10 17:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4' into v5

Browse Source
This commit is contained in:
Kwoth
2023-04-06 02:46:11 +02:00
parent 308ba36b2e 140cc43c98
commit 1f1b01995e
5 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Nadeko.Bot.Modules.Gambling/Gambling/Bank/BankCommands.cs
View File

@@ -92,14 +92,10 @@ public partial class Gambling
{
if (await _bank.AwardAsync(userId, amount))
{
await ReplyErrorLocalizedAsync(strs.take_fail(N(amount),
_client.GetUser(userId)?.ToString()
?? userId.ToString(),
CurrencySign));
await ctx.OkAsync();
return;
}
await ctx.OkAsync();
}
[Cmd]

2
src/NadekoBot/data/strings/commands/commands.en-US.yml
View File

@@ -1559,7 +1559,7 @@ timezones:
args:
- ""
timezone:
desc: "Sets this guilds timezone. This affects bot's time output in this server (logs, etc..)"
desc: "Sets this guilds timezone. This affects bot's time output in this server (logs, etc..) **Setting timezone requires Administrator server permission.**"
args:
- ""
- "GMT Standard Time"

17
src/ayu/Ayu.Discord.Voice/VoiceGateway.cs
View File

@@ -237,20 +237,25 @@ namespace Ayu.Discord.Voice
_udpEp = new(IPAddress.Parse(ready.Ip), ready.Port);
var ssrcBytes = BitConverter.GetBytes(Ssrc);
var ipDiscoveryData = new byte[70];
Buffer.BlockCopy(ssrcBytes, 0, ipDiscoveryData, 0, ssrcBytes.Length);
Array.Reverse(ssrcBytes);
var ipDiscoveryData = new byte[74];
Buffer.BlockCopy(ssrcBytes, 0, ipDiscoveryData, 4, ssrcBytes.Length);
ipDiscoveryData[0] = 0x00;
ipDiscoveryData[1] = 0x01;
ipDiscoveryData[2] = 0x00;
ipDiscoveryData[3] = 0x46;
await _udpClient.SendAsync(ipDiscoveryData, ipDiscoveryData.Length, _udpEp);
while (true)
{
var buffer = _udpClient.Receive(ref _udpEp);
if (buffer.Length == 70)
if (buffer.Length == 74)
{
//Log.Information("Received IP discovery data.");
var myIp = Encoding.UTF8.GetString(buffer, 4, buffer.Length - 8);
var myIp = Encoding.UTF8.GetString(buffer, 8, buffer.Length - 10);
MyIp = myIp.TrimEnd('\0');
MyPort = BitConverter.ToUInt16(buffer, buffer.Length - 2);
MyPort = (ushort)((buffer[^2] << 8) | buffer[^1]);
//Log.Information("{MyIp}:{MyPort}", MyIp, MyPort);
@@ -367,4 +372,4 @@ namespace Ayu.Discord.Voice
await complete.Task;
}
}
}
}