greyn/vassago
greyn/vassago
2
1
Fork 0
forked from adam/discord-bot-shtik
Code Issues 17 Pull Requests Packages Projects Releases 1 Wiki Activity

sendfile works

Browse Source 
see #25
This commit is contained in:
adam 2025-06-04 16:28:53 -04:00
parent 9ad7520c61
commit c35a512dbd
5 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Behaver.cs
View File

@ -224,4 +224,15 @@ public class Behaver
return await iprotocol.SendFile(channel, path, accompanyingText); return await iprotocol.SendFile(channel, path, accompanyingText);
} }
public async Task<int> SendFile(Guid channelId, string base64dData, string filename, string accompanyingText)
{
var channel = Rememberer.ChannelDetail(channelId);
if (channel == null)
return 404;
var iprotocol = fetchInterface(channel);
if (iprotocol == null)
return 404;
return await iprotocol.SendFile(channel, base64dData, filename, accompanyingText);
}
} }

7
ProtocolInterfaces/DiscordInterface/DiscordInterface.cs
View File

@ -434,7 +434,7 @@ public class DiscordInterface : ProtocolInterface
return 503; return 503;
} }
} }
public override async Task<int> SendFile(Channel channel, string path, string accompanyingText) public override async Task<int> SendFile(Channel channel, string base64dData, string filename, string accompanyingText)
{ {
var dcCh = await client.GetChannelAsync(ulong.Parse(channel.ExternalId)); var dcCh = await client.GetChannelAsync(ulong.Parse(channel.ExternalId));
if (dcCh == null) if (dcCh == null)
@ -444,7 +444,10 @@ public class DiscordInterface : ProtocolInterface
if (dcCh is IMessageChannel msgChannel) if (dcCh is IMessageChannel msgChannel)
{ {
await msgChannel.SendFileAsync(path, TruncateText(accompanyingText, channel.MaxTextChars)); using (var ms = new MemoryStream(Convert.FromBase64String(base64dData)))
{
await msgChannel.SendFileAsync(ms, filename, TruncateText(accompanyingText, channel.MaxTextChars));
}
return 200; return 200;
} }
else else

11
ProtocolInterfaces/ProtocolInterface.cs
View File

@ -7,7 +7,16 @@ public abstract class ProtocolInterface
public static string Protocol { get; } public static string Protocol { get; }
public abstract Channel SelfChannel { get; } public abstract Channel SelfChannel { get; }
public abstract Task<int> SendMessage(Channel channel, string text); public abstract Task<int> SendMessage(Channel channel, string text);
public abstract Task<int> SendFile(Channel channel, string path, string accompanyingText); public virtual async Task<int> SendFile(Channel channel, string path, string accompanyingText)
{
if (!File.Exists(path))
{
return 404;
}
var fstring = Convert.ToBase64String(File.ReadAllBytes(path));
return await SendFile(channel, fstring, Path.GetFileName(path), accompanyingText);
}
public abstract Task<int> SendFile(Channel channel, string base64dData, string filename, string accompanyingText);
public abstract Task<int> React(Message message, string reaction); public abstract Task<int> React(Message message, string reaction);
public abstract Task<int> Reply(Message message, string text); public abstract Task<int> Reply(Message message, string text);
} }

2
ProtocolInterfaces/TwitchInterface/TwitchInterface.cs
View File

@ -295,7 +295,7 @@ public class TwitchInterface : ProtocolInterface
Task.Run(() => { client.SendMessage(channel.ExternalId, text); }); Task.Run(() => { client.SendMessage(channel.ExternalId, text); });
return 200; return 200;
} }
public override async Task<int> SendFile(Channel channel, string path, string accompanyingText) public override async Task<int> SendFile(Channel channel, string base64dData, string filename, string accompanyingText)
{ {
return 405; return 405;
} }

9
WebInterface/Controllers/api/InternalAPIProtocolController.cs
View File

@ -45,15 +45,18 @@ public class InternalAPIProtocolController : ControllerBase
public class extraSpecialObjectReadGlorifiedTupleFor_SendFile public class extraSpecialObjectReadGlorifiedTupleFor_SendFile
{ {
public Guid channelId; public string path; public string accompanyingText; public Guid channelId;
public string accompanyingText;
public string base64dData;
public string filename;
} }
[HttpPost] [HttpPost]
[Route("SendFile")] [Route("SendFile")]
[Produces("application/json")] [Produces("application/json")]
public IActionResult SendFile([FromBody] extraSpecialObjectReadGlorifiedTupleFor_SendFile param) public IActionResult SendFile([FromBody] extraSpecialObjectReadGlorifiedTupleFor_SendFile param)
{ {
Console.WriteLine($"SendFile- {param.channelId}, {param.path}, {param.accompanyingText}"); Console.WriteLine($"SendFile- {param.channelId}, {param.filename} (base64'd, {param.base64dData?.Length} chars), {param.accompanyingText}");
return StatusCode(Behaver.Instance.SendFile(param.channelId, param.path, param.accompanyingText).Result); return StatusCode(Behaver.Instance.SendFile(param.channelId, param.base64dData, param.filename, param.accompanyingText).Result);
} }
public class extraSpecialObjectReadGlorifiedTupleFor_ReactToMessage public class extraSpecialObjectReadGlorifiedTupleFor_ReactToMessage