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

extract links/mentions/... from summary, fix #34

Browse source
This commit is contained in:
Nicolas Constant 2021-01-11 18:32:45 -05:00
parent 7ccd619af1
commit b80d4040e1
No known key found for this signature in database
GPG key ID: 1E9F677FB01A5688
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/BirdsiteLive.Domain/UserService.cs
View file

@ -10,6 +10,7 @@ using BirdsiteLive.ActivityPub.Converters;
using BirdsiteLive.Common.Settings; using BirdsiteLive.Common.Settings;
using BirdsiteLive.Cryptography; using BirdsiteLive.Cryptography;
using BirdsiteLive.Domain.BusinessUseCases; using BirdsiteLive.Domain.BusinessUseCases;
using BirdsiteLive.Domain.Tools;
using BirdsiteLive.Twitter.Models; using BirdsiteLive.Twitter.Models;
using Tweetinvi.Core.Exceptions; using Tweetinvi.Core.Exceptions;
using Tweetinvi.Models; using Tweetinvi.Models;
@ -31,15 +32,17 @@ namespace BirdsiteLive.Domain
private readonly InstanceSettings _instanceSettings; private readonly InstanceSettings _instanceSettings;
private readonly ICryptoService _cryptoService; private readonly ICryptoService _cryptoService;
private readonly IActivityPubService _activityPubService; private readonly IActivityPubService _activityPubService;
private readonly IStatusExtractor _statusExtractor;
#region Ctor #region Ctor
public UserService(InstanceSettings instanceSettings, ICryptoService cryptoService, IActivityPubService activityPubService, IProcessFollowUser processFollowUser, IProcessUndoFollowUser processUndoFollowUser) public UserService(InstanceSettings instanceSettings, ICryptoService cryptoService, IActivityPubService activityPubService, IProcessFollowUser processFollowUser, IProcessUndoFollowUser processUndoFollowUser, IStatusExtractor statusExtractor)
{ {
_instanceSettings = instanceSettings; _instanceSettings = instanceSettings;
_cryptoService = cryptoService; _cryptoService = cryptoService;
_activityPubService = activityPubService; _activityPubService = activityPubService;
_processFollowUser = processFollowUser; _processFollowUser = processFollowUser;
_processUndoFollowUser = processUndoFollowUser; _processUndoFollowUser = processUndoFollowUser;
_statusExtractor = statusExtractor;
//_host = $"https://{instanceSettings.Domain.Replace("https://",string.Empty).Replace("http://", string.Empty).TrimEnd('/')}"; //_host = $"https://{instanceSettings.Domain.Replace("https://",string.Empty).Replace("http://", string.Empty).TrimEnd('/')}";
} }
#endregion #endregion
@ -49,6 +52,14 @@ namespace BirdsiteLive.Domain
var actorUrl = UrlFactory.GetActorUrl(_instanceSettings.Domain, twitterUser.Acct); var actorUrl = UrlFactory.GetActorUrl(_instanceSettings.Domain, twitterUser.Acct);
var acct = twitterUser.Acct.ToLowerInvariant(); var acct = twitterUser.Acct.ToLowerInvariant();
// Extract links, mentions, etc
var description = twitterUser.Description;
if (!string.IsNullOrWhiteSpace(description))
{
var extracted = _statusExtractor.ExtractTags(description);
description = extracted.content;
}
var user = new Actor var user = new Actor
{ {
id = actorUrl, id = actorUrl,
@ -57,7 +68,7 @@ namespace BirdsiteLive.Domain
preferredUsername = acct, preferredUsername = acct,
name = twitterUser.Name, name = twitterUser.Name,
inbox = $"{actorUrl}/inbox", inbox = $"{actorUrl}/inbox",
summary = twitterUser.Description, summary = description,
url = actorUrl, url = actorUrl,
publicKey = new PublicKey() publicKey = new PublicKey()
{ {