octo
/
BirdsiteLive
mirror of https://github.com/NicolasConstant/BirdsiteLive
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #38 from NicolasConstant/develop 

0.3.3 PR
This commit is contained in:
Nicolas Constant 2021-01-10 06:03:55 +01:00 committed by GitHub
parent 4197b9b161 4b9f734687
commit 6b511e9f54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 51 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/BirdsiteLive.ActivityPub/Converters/UrlFactory.cs Normal file
View File

@ -0,0 +1,17 @@
using System.Runtime.CompilerServices;
namespace BirdsiteLive.ActivityPub.Converters
{
public class UrlFactory
{
public static string GetActorUrl(string domain, string username)
{
return $"https://{domain.ToLowerInvariant()}/users/{username.ToLowerInvariant()}";
}
public static string GetNoteUrl(string domain, string username, string noteId)
{
return $"https://{domain.ToLowerInvariant()}/users/{username.ToLowerInvariant()}/statuses/{noteId}";
}
}
}

15
src/BirdsiteLive.Domain/ActivityPubService.cs
View File

@ -6,6 +6,7 @@ using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using BirdsiteLive.ActivityPub;
using BirdsiteLive.ActivityPub.Converters;
using BirdsiteLive.ActivityPub.Models;
using BirdsiteLive.Common.Settings;
using Newtonsoft.Json;
@ -47,18 +48,8 @@ namespace BirdsiteLive.Domain
public async Task<HttpStatusCode> PostNewNoteActivity(Note note, string username, string noteId, string targetHost, string targetInbox)
{
//var username = "gra";
var actor = $"https://{_instanceSettings.Domain}/users/{username}";
//var targetHost = "mastodon.technology";
//var target = $"{targetHost}/users/testtest";
//var inbox = $"/users/testtest/inbox";
//var noteGuid = Guid.NewGuid();
var noteUri = $"https://{_instanceSettings.Domain}/users/{username}/statuses/{noteId}";
//var noteUrl = $"https://{_instanceSettings.Domain}/@{username}/{noteId}";
//var to = $"{actor}/followers";
//var apPublic = "https://www.w3.org/ns/activitystreams#Public";
var actor = UrlFactory.GetActorUrl(_instanceSettings.Domain, username);
var noteUri = UrlFactory.GetNoteUrl(_instanceSettings.Domain, username, noteId);
var now = DateTime.UtcNow;
var nowString = now.ToString("s") + "Z";

12
src/BirdsiteLive.Domain/StatusService.cs
View File

@ -4,6 +4,7 @@ using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using BirdsiteLive.ActivityPub;
using BirdsiteLive.ActivityPub.Converters;
using BirdsiteLive.ActivityPub.Models;
using BirdsiteLive.Common.Settings;
using BirdsiteLive.Domain.Tools;
@ -33,9 +34,8 @@ namespace BirdsiteLive.Domain
public Note GetStatus(string username, ExtractedTweet tweet)
{
var actorUrl = $"https://{_instanceSettings.Domain}/users/{username}";
var noteId = $"https://{_instanceSettings.Domain}/users/{username}/statuses/{tweet.Id}";
var noteUrl = $"https://{_instanceSettings.Domain}/@{username}/{tweet.Id}";
var actorUrl = UrlFactory.GetActorUrl(_instanceSettings.Domain, username);
var noteUrl = UrlFactory.GetNoteUrl(_instanceSettings.Domain, username, tweet.Id.ToString());
var to = $"{actorUrl}/followers";
var apPublic = "https://www.w3.org/ns/activitystreams#Public";
@ -44,12 +44,11 @@ namespace BirdsiteLive.Domain
string inReplyTo = null;
if (tweet.InReplyToStatusId != default)
inReplyTo = $"https://{_instanceSettings.Domain}/users/{tweet.InReplyToAccount}/statuses/{tweet.InReplyToStatusId}";
inReplyTo = $"https://{_instanceSettings.Domain}/users/{tweet.InReplyToAccount.ToLowerInvariant()}/statuses/{tweet.InReplyToStatusId}";
var note = new Note
{
//id = $"{noteId}/activity",
id = $"{noteId}",
id = noteUrl,
published = tweet.CreatedAt.ToString("s") + "Z",
url = noteUrl,
@ -68,7 +67,6 @@ namespace BirdsiteLive.Domain
attachment = Convert(tweet.Media),
tag = extractedTags.tags
};
return note;
}

22
src/BirdsiteLive.Domain/UserService.cs
View File

@ -6,6 +6,7 @@ using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using BirdsiteLive.ActivityPub;
using BirdsiteLive.ActivityPub.Converters;
using BirdsiteLive.Common.Settings;
using BirdsiteLive.Cryptography;
using BirdsiteLive.Domain.BusinessUseCases;
@ -45,21 +46,24 @@ namespace BirdsiteLive.Domain
public Actor GetUser(TwitterUser twitterUser)
{
var actorUrl = UrlFactory.GetActorUrl(_instanceSettings.Domain, twitterUser.Acct);
var acct = twitterUser.Acct.ToLowerInvariant();
var user = new Actor
{
id = $"https://{_instanceSettings.Domain}/users/{twitterUser.Acct}",
type = "Service", //Person Service
followers = $"https://{_instanceSettings.Domain}/users/{twitterUser.Acct}/followers",
preferredUsername = twitterUser.Acct,
id = actorUrl,
type = "Service",
followers = $"{actorUrl}/followers",
preferredUsername = acct,
name = twitterUser.Name,
inbox = $"https://{_instanceSettings.Domain}/users/{twitterUser.Acct}/inbox",
inbox = $"{actorUrl}/inbox",
summary = twitterUser.Description,
url = $"https://{_instanceSettings.Domain}/@{twitterUser.Acct}",
url = actorUrl,
publicKey = new PublicKey()
{
id = $"https://{_instanceSettings.Domain}/users/{twitterUser.Acct}#main-key",
owner = $"https://{_instanceSettings.Domain}/users/{twitterUser.Acct}",
publicKeyPem = _cryptoService.GetUserPem(twitterUser.Acct)
id = $"{actorUrl}#main-key",
owner = actorUrl,
publicKeyPem = _cryptoService.GetUserPem(acct)
},
icon = new Image
{

2
src/BirdsiteLive/BirdsiteLive.csproj
View File

@ -4,7 +4,7 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<UserSecretsId>d21486de-a812-47eb-a419-05682bb68856</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<Version>0.3.2</Version>
<Version>0.3.3</Version>
</PropertyGroup>
<ItemGroup>

6
src/BirdsiteLive/Controllers/UsersController.cs
View File

@ -48,7 +48,7 @@ namespace BirdsiteLive.Controllers
[Route("/users/{id}")]
public IActionResult Index(string id)
{
id = id.Trim(new[] {' ', '@'});
id = id.Trim(new[] {' ', '@'}).ToLowerInvariant();
var user = _twitterService.GetUser(id);
var r = Request.Headers["Accept"].First();
@ -66,11 +66,11 @@ namespace BirdsiteLive.Controllers
{
Name = user.Name,
Description = user.Description,
Acct = user.Acct,
Acct = user.Acct.ToLowerInvariant(),
Url = user.Url,
ProfileImageUrl = user.ProfileImageUrl,
InstanceHandle = $"@{user.Acct}@{_instanceSettings.Domain}"
InstanceHandle = $"@{user.Acct.ToLowerInvariant()}@{_instanceSettings.Domain}"
};
return View(displayableUser);
}

13
src/BirdsiteLive/Controllers/WellKnownController.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using BirdsiteLive.ActivityPub.Converters;
using BirdsiteLive.Common.Settings;
using BirdsiteLive.DAL.Contracts;
using BirdsiteLive.Models;
@ -156,6 +157,9 @@ namespace BirdsiteLive.Controllers
return BadRequest();
}
// Ensure lowercase
name = name.ToLowerInvariant();
if (!string.IsNullOrWhiteSpace(domain) && domain != _settings.Domain)
return NotFound();
@ -163,13 +167,14 @@ namespace BirdsiteLive.Controllers
if (user == null)
return NotFound();
var actorUrl = UrlFactory.GetActorUrl(_settings.Domain, name);
var result = new WebFingerResult()
{
subject = $"acct:{name}@{_settings.Domain}",
aliases = new[]
{
$"https://{_settings.Domain}/@{name}",
$"https://{_settings.Domain}/users/{name}"
actorUrl
},
links = new List<WebFingerLink>
{
@ -177,13 +182,13 @@ namespace BirdsiteLive.Controllers
{
rel = "http://webfinger.net/rel/profile-page",
type = "text/html",
href = $"https://{_settings.Domain}/@{name}"
href = actorUrl
},
new WebFingerLink()
{
rel = "self",
type = "application/activity+json",
href = $"https://{_settings.Domain}/users/{name}"
href = actorUrl
}
}
};