Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/ZeroBot.Abstraction/Bot/IBotContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,7 @@ ValueTask UpdateGroupReactionAsync(long accountId, long groupId, long messageId,
void SetEventRepository(IBotEventRepository repository);

ValueTask<string> GetTempResourceUrlAsync(long accountId, string id, CancellationToken cancellationToken = default);

ValueTask UploadFileToGroupAsync(long accountId, long groupId, string fileName, MilkyUri fileUri,
CancellationToken cancellationToken = default);
}
3 changes: 3 additions & 0 deletions src/ZeroBot.Abstraction/Bot/IBotService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@ ValueTask<GetGroupInfoOutput> GetGroupInformationAsync(long groupId,
ValueTask<string> GetTempResourceUrlAsync(string id, CancellationToken cancellationToken = default);

ValueTask AcceptFriendRequestAsync(string uid, CancellationToken cancellationToken = default);

ValueTask UploadFileToGroupAsync(long accountId, long groupId, string fileName, MilkyUri fileUri,
CancellationToken cancellationToken = default);
}
8 changes: 8 additions & 0 deletions src/ZeroBot.Core/Services/BotContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,14 @@ public ValueTask<string> GetTempResourceUrlAsync(long accountId, string id,
: botService.GetTempResourceUrlAsync(id, cancellationToken);
}

public ValueTask UploadFileToGroupAsync(long accountId, long groupId, string fileName, MilkyUri fileUri,
CancellationToken cancellationToken = default)
{
return !_services.TryGetValue(accountId, out var botService)
? default
: botService.UploadFileToGroupAsync(accountId, groupId, fileName, fileUri, cancellationToken);
}

public async ValueTask UpdateGroupReactionAsync(long accountId, long groupId, long messageId, string reactionId, bool add,
CancellationToken cancellationToken = default)
{
Expand Down
6 changes: 6 additions & 0 deletions src/plugins/ZeroBot.Milky/Bot/MilkyBot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ public async ValueTask AcceptFriendRequestAsync(string uid, CancellationToken ca
await milky.Friend.AcceptFriendRequestAsync(param, cancellationToken);
}

public async ValueTask UploadFileToGroupAsync(long accountId, long groupId, string fileName, MilkyUri fileUri,
CancellationToken cancellationToken = default)
{
await milky.File.UploadGroupFileAsync(new UploadGroupFileInput(groupId, "/", fileUri, fileName), cancellationToken);
}

public async ValueTask<GetLoginInfoOutput> GetCurrentAccountAsync(CancellationToken cancellationToken = default)
{
return await botInfos.GetAccountInfoAsync(cancellationToken);
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/ZeroBot.Painter/PaintCommandHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ private async ValueTask<bool> TryConsumeQuotaAsync(long peerId, long senderId, i
value.DailyQuotas[key] = quota = new DailyQuota(today, 0);
}

if (quota.Count >= limit) return false;
if (limit > -1 && quota.Count >= limit) return false;

value.DailyQuotas[key] = quota with { Count = quota.Count + 1 };
await config.SaveAsync(value, token);
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/ZeroBot.Painter/PainterManageCommandHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ protected override async ValueTask<bool> PredicateAsync(Event<IncomingMessage> m
protected override async ValueTask HandleAsync(Event<IncomingMessage> message,
CancellationToken cancellationToken = default)
{
var command = message.ToTextCommands().FirstOrDefault();
var command = message.ToTextCommands(argumentSplitters: "::").FirstOrDefault();
var arguments = command?.Arguments ?? [];
var peerId = message.Data.PeerId;

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/ZeroBot.Painter/PainterQuota.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ public static DateOnly Today(DateTimeOffset now) =>
/// <summary>
/// 启用指令 number 合法性:1 &lt;= number &lt;= max。
/// </summary>
public static bool IsValidDailyLimit(int number, int max) => number >= 1 && number <= max;
public static bool IsValidDailyLimit(int number, int max) => number == -1 || (number >= 1 && number <= max);
}
9 changes: 5 additions & 4 deletions src/plugins/ZeroBot.Workflow/WorkflowCommandHandler.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Milky.Net.Client;
using Milky.Net.Model;
using ZeroBot.Abstraction.Bot;
using ZeroBot.Abstraction.Service;
Expand All @@ -20,7 +19,6 @@ public class WorkflowCommandHandler(
IPermission permission,
IOptions<WorkflowOptions> options,
WorkflowApi api,
MilkyClient milky,
ILogger<WorkflowCommandHandler> logger) : CommandQueuedHandler(dispatcher)
{
private const string CommandPrefix = "/workflow";
Expand Down Expand Up @@ -146,8 +144,11 @@ private async ValueTask SendResultAsync(Event<IncomingMessage> @event, string si
}

var fileName = GuessFileName(data);
await milky.File.UploadGroupFileAsync(
new UploadGroupFileInput(@event.Data.PeerId, "/", new MilkyUri($"base64://{base64}"), fileName),
await bot.UploadFileToGroupAsync(
@event.SelfId,
@event.Data.PeerId,
fileName,
new MilkyUri($"base64://{base64}"),
cancellationToken);
}

Expand Down
1 change: 0 additions & 1 deletion src/plugins/ZeroBot.Workflow/ZeroBot.Workflow.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<ProjectReference Include="..\..\ZeroBot.Abstraction\ZeroBot.Abstraction.csproj" />
<ProjectReference Include="..\..\ZeroBot.Utility\ZeroBot.Utility.csproj" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
<PackageReference Include="ZeroAsh.Milky.Net.Client" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion test/ZeroBot.Core.Test/PainterQuotaTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void Key_ShouldCombinePeerAndSender()
[InlineData(1, true)]
[InlineData(5, true)]
[InlineData(6, false)]
[InlineData(-1, false)]
[InlineData(-1, true)]
public void IsValidDailyLimit_ShouldRespectBoundaries(int number, bool expected)
{
Assert.Equal(expected, PainterQuota.IsValidDailyLimit(number, 5));
Expand Down
6 changes: 6 additions & 0 deletions test/ZeroBot.Core.Test/TestBotService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,10 @@ public ValueTask AcceptFriendRequestAsync(string uid, CancellationToken cancella
{
throw new NotImplementedException();
}

public ValueTask UploadFileToGroupAsync(long accountId, long groupId, string fileName, MilkyUri fileUri,
CancellationToken cancellationToken = default)
{
throw new NotImplementedException();
}
}
Loading