glenux-archive/cloutier--bird.makeup
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

better logging

Browse source
This commit is contained in:
Nicolas Constant 2021-03-08 19:27:08 -05:00
parent 467135e41f
commit 84b0da5093
No known key found for this signature in database
GPG key ID: 1E9F677FB01A5688
1 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/BirdsiteLive.Domain/ActivityPubService.cs
View file

@ -9,6 +9,7 @@ using BirdsiteLive.ActivityPub;
using BirdsiteLive.ActivityPub.Converters; using BirdsiteLive.ActivityPub.Converters;
using BirdsiteLive.ActivityPub.Models; using BirdsiteLive.ActivityPub.Models;
using BirdsiteLive.Common.Settings; using BirdsiteLive.Common.Settings;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json; using Newtonsoft.Json;
using Org.BouncyCastle.Bcpg; using Org.BouncyCastle.Bcpg;
@ -27,13 +28,15 @@ namespace BirdsiteLive.Domain
private readonly InstanceSettings _instanceSettings; private readonly InstanceSettings _instanceSettings;
private readonly IHttpClientFactory _httpClientFactory; private readonly IHttpClientFactory _httpClientFactory;
private readonly ICryptoService _cryptoService; private readonly ICryptoService _cryptoService;
private readonly ILogger<ActivityPubService> _logger;
#region Ctor #region Ctor
public ActivityPubService(ICryptoService cryptoService, InstanceSettings instanceSettings, IHttpClientFactory httpClientFactory) public ActivityPubService(ICryptoService cryptoService, InstanceSettings instanceSettings, IHttpClientFactory httpClientFactory, ILogger<ActivityPubService> logger)
{ {
_cryptoService = cryptoService; _cryptoService = cryptoService;
_instanceSettings = instanceSettings; _instanceSettings = instanceSettings;
_httpClientFactory = httpClientFactory; _httpClientFactory = httpClientFactory;
_logger = logger;
} }
#endregion #endregion
@ -48,26 +51,34 @@ namespace BirdsiteLive.Domain
public async Task PostNewNoteActivity(Note note, string username, string noteId, string targetHost, string targetInbox) public async Task PostNewNoteActivity(Note note, string username, string noteId, string targetHost, string targetInbox)
{ {
var actor = UrlFactory.GetActorUrl(_instanceSettings.Domain, username); try
var noteUri = UrlFactory.GetNoteUrl(_instanceSettings.Domain, username, noteId);
var now = DateTime.UtcNow;
var nowString = now.ToString("s") + "Z";
var noteActivity = new ActivityCreateNote()
{ {
context = "https://www.w3.org/ns/activitystreams", var actor = UrlFactory.GetActorUrl(_instanceSettings.Domain, username);
id = $"{noteUri}/activity", var noteUri = UrlFactory.GetNoteUrl(_instanceSettings.Domain, username, noteId);
type = "Create",
actor = actor,
published = nowString,
to = note.to, var now = DateTime.UtcNow;
cc = note.cc, var nowString = now.ToString("s") + "Z";
apObject = note
};
await PostDataAsync(noteActivity, targetHost, actor, targetInbox); var noteActivity = new ActivityCreateNote()
{
context = "https://www.w3.org/ns/activitystreams",
id = $"{noteUri}/activity",
type = "Create",
actor = actor,
published = nowString,
to = note.to,
cc = note.cc,
apObject = note
};
await PostDataAsync(noteActivity, targetHost, actor, targetInbox);
}
catch (Exception e)
{
_logger.LogError(e, "Error sending {Username} post ({NoteId}) to {Host}{Inbox}", username, noteId, targetHost, targetInbox);
throw;
}
} }
public async Task<HttpStatusCode> PostDataAsync<T>(T data, string targetHost, string actorUrl, string inbox = null) public async Task<HttpStatusCode> PostDataAsync<T>(T data, string targetHost, string actorUrl, string inbox = null)