notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/masto-client] Fix errors in WebSocket notification handler

Browse source
This commit is contained in:
Laura Hausmann 2024-03-11 03:55:53 +01:00
parent fe5e02e791
commit 64fc07ff53
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Iceshrimp.Backend/Controllers/Mastodon/Streaming/Channels/UserChannel.cs
View file

@ -1,7 +1,9 @@
using System.Text.Json;
using Iceshrimp.Backend.Controllers.Mastodon.Renderers;
using Iceshrimp.Backend.Controllers.Mastodon.Schemas.Entities;
using Iceshrimp.Backend.Core.Database;
using Iceshrimp.Backend.Core.Database.Tables;
using Iceshrimp.Backend.Core.Middleware;
using Microsoft.EntityFrameworkCore;
namespace Iceshrimp.Backend.Controllers.Mastodon.Streaming.Channels;
@ -123,7 +125,18 @@ public class UserChannel(WebSocketConnection connection, bool notificationsOnly)
if (!IsApplicable(notification)) return;
var provider = connection.ScopeFactory.CreateScope().ServiceProvider;
var renderer = provider.GetRequiredService<NotificationRenderer>();
var rendered = await renderer.RenderAsync(notification, connection.Token.User);
NotificationEntity rendered;
try
{
rendered = await renderer.RenderAsync(notification, connection.Token.User);
}
catch (GracefulException)
{
// Unsupported notification type
return;
}
var message = new StreamingUpdateMessage
{
Stream = [Name], Event = "notification", Payload = JsonSerializer.Serialize(rendered)