- This is your bio. It's a short piece of text that's visible on your profile. By default, it's empty.
+ This is your bio. It's a short piece of text that's visible on your profile. By
+ default, it's empty.
@@ -150,16 +196,17 @@ onMounted(updateProfile);
-
+
{{ link.name }}
{{ link.url }}
-
+
+
@@ -170,7 +217,7 @@ onMounted(updateProfile);
overflow: hidden;
}
-.main-container > fieldset {
+.main-container>fieldset {
margin-bottom: 20px;
}
@@ -213,7 +260,7 @@ textarea {
margin-bottom: 5px;
}
-.link-display > button {
+.link-display>button {
float: right;
}
@@ -227,8 +274,7 @@ textarea {
font-size: 10pt;
}
-.link-display > div {
+.link-display>div {
display: inline-block;
-}
-
+}
\ No newline at end of file
diff --git a/PinkSea/Lexicons/Objects/Author.cs b/PinkSea/Lexicons/Objects/Author.cs
index a4b713f..d7afef6 100644
--- a/PinkSea/Lexicons/Objects/Author.cs
+++ b/PinkSea/Lexicons/Objects/Author.cs
@@ -18,4 +18,16 @@ public class Author
///
[JsonPropertyName("handle")]
public required string Handle { get; set; }
+
+ ///
+ /// The nickname of the author.
+ ///
+ [JsonPropertyName("nickname"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+ public string? Nickname { get; set; }
+
+ ///
+ /// The avatar of the author.
+ ///
+ [JsonPropertyName("avatar"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+ public string? Avatar { get; set; }
}
\ No newline at end of file
diff --git a/PinkSea/Lexicons/Objects/HydratedOekaki.cs b/PinkSea/Lexicons/Objects/HydratedOekaki.cs
index c55bf6f..524037a 100644
--- a/PinkSea/Lexicons/Objects/HydratedOekaki.cs
+++ b/PinkSea/Lexicons/Objects/HydratedOekaki.cs
@@ -59,12 +59,12 @@ public class HydratedOekaki
/// Constructs an oekaki DTO from an oekaki model and the author's handle.
///
/// The oekaki model.
- /// The author's handle.
+ /// The author.
/// The endpoint of the image proxy.
/// The oekaki DTO.
public static HydratedOekaki FromOekakiModel(
OekakiModel oekakiModel,
- string authorHandle,
+ UserModel authorModel,
string imageProxyEndpoint)
{
var imageLink = string.Format(
@@ -77,7 +77,14 @@ public static HydratedOekaki FromOekakiModel(
Author = new Author
{
Did = oekakiModel.AuthorDid,
- Handle = authorHandle
+ Handle = authorModel.Handle ?? "invalid.handle",
+ Avatar = authorModel.Avatar is not null ?
+ string.Format(
+ imageProxyEndpoint,
+ oekakiModel.AuthorDid,
+ authorModel.Avatar!.BlobCid)
+ : null,
+ Nickname = authorModel.Nickname
},
CreationTime = oekakiModel.IndexedAt,
ImageLink = imageLink,
diff --git a/PinkSea/Lexicons/Procedures/PutProfileProcedureRequest.cs b/PinkSea/Lexicons/Procedures/PutProfileProcedureRequest.cs
new file mode 100644
index 0000000..61c9384
--- /dev/null
+++ b/PinkSea/Lexicons/Procedures/PutProfileProcedureRequest.cs
@@ -0,0 +1,16 @@
+using System.Text.Json.Serialization;
+using PinkSea.Lexicons.Records;
+
+namespace PinkSea.Lexicons.Procedures;
+
+///
+/// The request for the "com.shinolabs.pinksea.putProfile" xrpc call.
+///
+public class PutProfileProcedureRequest
+{
+ ///
+ /// The updated profile.
+ ///
+ [JsonPropertyName("profile")]
+ public required Profile Profile { get; set; }
+}
\ No newline at end of file
diff --git a/PinkSea/Lexicons/Records/Profile.cs b/PinkSea/Lexicons/Records/Profile.cs
index 2a7a6f8..21eb4d8 100644
--- a/PinkSea/Lexicons/Records/Profile.cs
+++ b/PinkSea/Lexicons/Records/Profile.cs
@@ -11,13 +11,13 @@ public class Profile
///
/// The nickname of this profile.
///
- [JsonPropertyName("nickname")]
+ [JsonPropertyName("nickname"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public string? Nickname { get; set; }
///
/// The bio of this profile.
///
- [JsonPropertyName("bio")]
+ [JsonPropertyName("bio"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public string? Bio { get; set; }
///
@@ -29,6 +29,6 @@ public class Profile
///
/// The links this profile has.
///
- [JsonPropertyName("links")]
+ [JsonPropertyName("links"), JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
public IReadOnlyList? Links { get; set; }
}
\ No newline at end of file
diff --git a/PinkSea/Services/FeedBuilder.cs b/PinkSea/Services/FeedBuilder.cs
index 98c0a02..8abdd2e 100644
--- a/PinkSea/Services/FeedBuilder.cs
+++ b/PinkSea/Services/FeedBuilder.cs
@@ -16,7 +16,7 @@ namespace PinkSea.Services;
/// The database context.
public class FeedBuilder(
PinkSeaDbContext dbContext,
- IDidResolver didResolver,
+ UserService userService,
IOptions opts)
{
///
@@ -105,15 +105,7 @@ public FeedBuilder Limit(int count)
public async Task> FromOekakiModelList(IList list)
{
var dids = list.Select(o => o.AuthorDid);
- var map = new ConcurrentDictionary();
-
- await Parallel.ForEachAsync(dids, new ParallelOptions
- {
- MaxDegreeOfParallelism = 5
- }, async (did, _) =>
- {
- map[did] = await didResolver.GetHandleFromDid(did) ?? "invalid.handle";
- });
+ var map = await userService.GetMultipleUsers(dids);
var oekakiDtos = list
.Select(o => HydratedOekaki.FromOekakiModel(o, map[o.AuthorDid], opts.Value.ImageProxyTemplate))
diff --git a/PinkSea/Services/SearchService.cs b/PinkSea/Services/SearchService.cs
index cd0f9b3..7af77a8 100644
--- a/PinkSea/Services/SearchService.cs
+++ b/PinkSea/Services/SearchService.cs
@@ -11,7 +11,7 @@ namespace PinkSea.Services;
public class SearchService(
PinkSeaDbContext dbContext,
- IDidResolver didResolver,
+ UserService userService,
IOptions opts)
{
public async Task> SearchPosts(string query, int limit, DateTimeOffset since)
@@ -51,15 +51,7 @@ public async Task> SearchTags(string query, int limit, Dat
.ToListAsync();
var dids = list.Select(o => o.Oekaki.AuthorDid);
- var map = new ConcurrentDictionary();
-
- await Parallel.ForEachAsync(dids, new ParallelOptions
- {
- MaxDegreeOfParallelism = 5
- }, async (did, _) =>
- {
- map[did] = await didResolver.GetHandleFromDid(did) ?? "invalid.handle";
- });
+ var map = await userService.GetMultipleUsers(dids);
var oekakiDtos = list
.Select(o => new TagSearchResult
diff --git a/PinkSea/Services/UserService.cs b/PinkSea/Services/UserService.cs
index 9145df6..0c0bea9 100644
--- a/PinkSea/Services/UserService.cs
+++ b/PinkSea/Services/UserService.cs
@@ -1,8 +1,11 @@
using Microsoft.EntityFrameworkCore;
using PinkSea.AtProto.Helpers;
+using PinkSea.AtProto.Models.OAuth;
using PinkSea.AtProto.Resolvers.Did;
using PinkSea.AtProto.Resolvers.Domain;
+using PinkSea.AtProto.Shared.Lexicons.AtProto;
using PinkSea.AtProto.Shared.Lexicons.Types;
+using PinkSea.AtProto.Xrpc.Client;
using PinkSea.Database;
using PinkSea.Database.Models;
using PinkSea.Lexicons.Records;
@@ -16,6 +19,7 @@ public class UserService(
PinkSeaDbContext dbContext,
IDidResolver didResolver,
IDomainDidResolver domainDidResolver,
+ IXrpcClientFactory xrpcClientFactory,
ILogger logger)
{
///
@@ -42,6 +46,35 @@ public async Task UserExists(
.Include(u => u.Avatar)
.FirstOrDefaultAsync(u => u.Did == did);
}
+
+ ///
+ /// Gets a full user model by their DID.
+ ///
+ /// The DID of the user.
+ /// The user model, or nothing if they don't exist.
+ public async Task GetFullUserByDid(
+ string did)
+ {
+ return await dbContext.Users
+ .Include(u => u.Avatar)
+ .Include(u => u.Links)
+ .FirstOrDefaultAsync(u => u.Did == did);
+ }
+
+ ///
+ /// Gets multiple users at once.
+ ///
+ /// The list of user's DIDs.
+ /// A dictionary mapping from a did to a user model.
+ public async Task> GetMultipleUsers(IEnumerable dids)
+ {
+ var list = await dbContext.Users
+ .Where(u => dids.Contains(u.Did))
+ .Include(u => u.Avatar)
+ .ToListAsync();
+
+ return list.ToDictionary(u => u.Did, u => u);
+ }
///
/// Gets all of the users.
@@ -116,18 +149,70 @@ public async Task UpdateProfile(
string did,
Profile profile)
{
- var user = await GetUserByDid(did);
+ var user = await GetFullUserByDid(did);
if (user is null)
return;
user.Nickname = profile.Nickname;
user.Description = profile.Bio;
await UpdateAvatarForProfile(user, profile.Avatar);
+ await UpdateLinksForProfile(user, profile.Links);
dbContext.Users.Update(user);
await dbContext.SaveChangesAsync();
}
+ ///
+ /// Publishes a profile update to the user's repo.
+ ///
+ /// The oauth state of the user.
+ /// The changed profile.
+ public async Task PublishProfileUpdateToRepo(
+ OAuthState oauthState,
+ Profile profile)
+ {
+ using var xrpcClient = await xrpcClientFactory.GetForOAuthState(oauthState);
+ if (xrpcClient is null)
+ return;
+
+ await xrpcClient.Procedure(
+ "com.atproto.repo.putRecord",
+ new PutRecordRequest
+ {
+ Repo = oauthState.Did,
+ Collection = "com.shinolabs.pinksea.profile",
+ RecordKey = "self",
+ Record = profile
+ });
+ }
+
+ private async Task UpdateLinksForProfile(
+ UserModel user,
+ IEnumerable? links)
+ {
+ if (user.Links?.Count > 0)
+ {
+ foreach (var link in user.Links)
+ {
+ dbContext.Remove(link);
+ }
+ }
+
+ if (links is null)
+ return;
+
+ var newLinks = links.Select(link => new UserLinkModel()
+ {
+ UserDid = user.Did,
+ User = user,
+ Url = link.Link,
+ Name = link.Name
+ })
+ .ToList();
+
+ user.Links = newLinks;
+ }
+
private async Task UpdateAvatarForProfile(
UserModel user,
StrongRef? avatarRef)
diff --git a/PinkSea/Xrpc/GetOekakiQueryHandler.cs b/PinkSea/Xrpc/GetOekakiQueryHandler.cs
index 90edbf4..abb74c7 100644
--- a/PinkSea/Xrpc/GetOekakiQueryHandler.cs
+++ b/PinkSea/Xrpc/GetOekakiQueryHandler.cs
@@ -18,7 +18,7 @@ namespace PinkSea.Xrpc;
public class GetOekakiQueryHandler(
PinkSeaDbContext dbContext,
FeedBuilder feedBuilder,
- IDidResolver didResolver,
+ UserService userService,
IOptions opts)
: IXrpcQuery
{
@@ -27,11 +27,13 @@ public async Task> Handle(GetOekakiQueryRequ
{
var parent = await dbContext.Oekaki
.Include(o => o.TagOekakiRelations)
+ .Include(o => o.Author)
+ .ThenInclude(u => u.Avatar)
.FirstOrDefaultAsync(o => o.AuthorDid == request.Did && o.OekakiTid == request.RecordKey);
if (parent == null)
return XrpcErrorOr.Fail("NotFound", "Could not find this record.");
-
+
var childrenFeed = await feedBuilder
.StartWithOrdering(c => c.IndexedAt)
.Where(c => c.ParentId == parent.Key)
@@ -43,7 +45,7 @@ public async Task> Handle(GetOekakiQueryRequ
!parent.Tombstone
? HydratedOekaki.FromOekakiModel(
parent,
- await didResolver.GetHandleFromDid(parent.AuthorDid) ?? "invalid.handle",
+ parent.Author,
opts.Value.ImageProxyTemplate)
: TombstoneOekaki.FromOekakiModel(
parent),
diff --git a/PinkSea/Xrpc/GetProfileQueryHandler.cs b/PinkSea/Xrpc/GetProfileQueryHandler.cs
index 59ca3fd..f73fab9 100644
--- a/PinkSea/Xrpc/GetProfileQueryHandler.cs
+++ b/PinkSea/Xrpc/GetProfileQueryHandler.cs
@@ -25,7 +25,7 @@ public class GetProfileQueryHandler(
public async Task> Handle(
GetProfileQueryRequest request)
{
- var userModel = await userService.GetUserByDid(request.Did);
+ var userModel = await userService.GetFullUserByDid(request.Did);
if (userModel is null)
{
return XrpcErrorOr.Fail(
diff --git a/PinkSea/Xrpc/PutProfileProcedureHandler.cs b/PinkSea/Xrpc/PutProfileProcedureHandler.cs
new file mode 100644
index 0000000..c8bb729
--- /dev/null
+++ b/PinkSea/Xrpc/PutProfileProcedureHandler.cs
@@ -0,0 +1,34 @@
+using PinkSea.AtProto.Providers.Storage;
+using PinkSea.AtProto.Server.Xrpc;
+using PinkSea.AtProto.Shared.Xrpc;
+using PinkSea.Extensions;
+using PinkSea.Lexicons;
+using PinkSea.Lexicons.Procedures;
+using PinkSea.Services;
+
+namespace PinkSea.Xrpc;
+
+///
+/// The handler for the "com.shinolabs.pinksea.putProfile" XRPC procedure. Updates a user's profile.
+///
+[Xrpc("com.shinolabs.pinksea.putProfile")]
+public class PutProfileProcedureHandler(IHttpContextAccessor contextAccessor, IOAuthStateStorageProvider oauthStateStorageProvider, UserService userService)
+ : IXrpcProcedure
+{
+ ///
+ public async Task> Handle(PutProfileProcedureRequest request)
+ {
+ var state = contextAccessor.HttpContext?.GetStateToken();
+ if (state is null)
+ return XrpcErrorOr.Fail("NoAuthToken", "Missing authorization token.");
+
+ var oauthState = await oauthStateStorageProvider.GetForStateId(state);
+ if (oauthState is null)
+ return XrpcErrorOr.Fail("InvalidToken", "Invalid token.");
+
+ await userService.UpdateProfile(oauthState.Did, request.Profile);
+ await userService.PublishProfileUpdateToRepo(oauthState, request.Profile);
+
+ return XrpcErrorOr.Ok(new Empty());
+ }
+}
\ No newline at end of file
diff --git a/PinkSea/cursorfile b/PinkSea/cursorfile
new file mode 100644
index 0000000..1ede254
--- /dev/null
+++ b/PinkSea/cursorfile
@@ -0,0 +1 @@
+1751916170599031
\ No newline at end of file
From e54d58f9fb5f34da1a00c1b7796a10b56ae125fc Mon Sep 17 00:00:00 2001
From: purifetchi <0xlunaric@gmail.com>
Date: Tue, 8 Jul 2025 00:35:26 +0200
Subject: [PATCH 04/23] feat: start working on showing profile pics in oekaki
cards.
---
.../public/assets/img}/blank_avatar.png | Bin
.../src/components/TimeLineOekakiCard.vue | 40 ++------
.../components/oekaki/OekakiMetaContainer.vue | 87 ++++++++++++++++++
.../oekaki/PostViewOekakiParentCard.vue | 27 +-----
.../src/components/profile/Avatar.vue | 13 +++
.../components/search/SearchProfileCard.vue | 17 +++-
PinkSea.Frontend/src/models/author.ts | 4 +-
PinkSea/cursorfile | 2 +-
8 files changed, 124 insertions(+), 66 deletions(-)
rename {PinkSea/wwwroot => PinkSea.Frontend/public/assets/img}/blank_avatar.png (100%)
create mode 100644 PinkSea.Frontend/src/components/oekaki/OekakiMetaContainer.vue
create mode 100644 PinkSea.Frontend/src/components/profile/Avatar.vue
diff --git a/PinkSea/wwwroot/blank_avatar.png b/PinkSea.Frontend/public/assets/img/blank_avatar.png
similarity index 100%
rename from PinkSea/wwwroot/blank_avatar.png
rename to PinkSea.Frontend/public/assets/img/blank_avatar.png
diff --git a/PinkSea.Frontend/src/components/TimeLineOekakiCard.vue b/PinkSea.Frontend/src/components/TimeLineOekakiCard.vue
index e6d0c99..4109384 100644
--- a/PinkSea.Frontend/src/components/TimeLineOekakiCard.vue
+++ b/PinkSea.Frontend/src/components/TimeLineOekakiCard.vue
@@ -5,6 +5,7 @@ import { useRouter } from 'vue-router'
import TagContainer from '@/components/TagContainer.vue'
import { usePersistedStore } from '@/state/store'
import { buildOekakiUrlFromOekakiObject, formatDate } from '@/api/atproto/helpers'
+import OekakiMetaContainer from './oekaki/OekakiMetaContainer.vue'
const router = useRouter();
const persistedStore = usePersistedStore();
@@ -14,10 +15,6 @@ const props = defineProps<{
}>()
const imageLink = computed(() => `url(${props.oekaki.image})`)
-const authorProfileLink = computed(() => `/${props.oekaki.author.did}`);
-const creationTime = computed(() => {
- return formatDate(props.oekaki.creationTime)
-})
const altText = computed(() => props.oekaki.alt ?? "");
const navigateToPost = () => {
@@ -29,38 +26,21 @@ const openInNewTab = () => {
const url = buildOekakiUrlFromOekakiObject(props.oekaki);
window.open(url, "_blank");
};
+
+
\ No newline at end of file
diff --git a/PinkSea.Frontend/src/components/oekaki/PostViewOekakiParentCard.vue b/PinkSea.Frontend/src/components/oekaki/PostViewOekakiParentCard.vue
index 3da6af2..8485e94 100644
--- a/PinkSea.Frontend/src/components/oekaki/PostViewOekakiParentCard.vue
+++ b/PinkSea.Frontend/src/components/oekaki/PostViewOekakiParentCard.vue
@@ -1,34 +1,20 @@
diff --git a/PinkSea.Frontend/src/intl/translations/en.json b/PinkSea.Frontend/src/intl/translations/en.json
index bb5e84e..4ee7d63 100644
--- a/PinkSea.Frontend/src/intl/translations/en.json
+++ b/PinkSea.Frontend/src/intl/translations/en.json
@@ -41,8 +41,8 @@
"nothing_here": "Nothing here so far... (╥﹏╥)"
},
"post": {
- "response_from_before_handle": "Response from ",
- "response_from_after_handle": "",
+ "response_from_before_handle": "",
+ "response_from_after_handle": "responded ",
"response_from_at_date": " at ",
"this_post_no_longer_exists": "This post no longer exists."
},
@@ -84,10 +84,26 @@
"hint_confirm": "Once you're ready, click the button above to publish your image!"
},
"profile": {
- "bluesky_profile": "Bluesky profile",
- "domain": "Website",
"posts_tab": "Posts",
- "replies_tab": "Replies"
+ "replies_tab": "Replies",
+ "edit_profile": "Edit profile"
+ },
+ "profile_edit": {
+ "how_others_will_see_you": "This is how others will see you",
+ "basic_data": "Basic data",
+ "nickname": "Nickname",
+ "nickname_description": "This is the name others will identify you by. By default, it's equal to your handle.",
+ "your_bio": "Your bio",
+ "your_bio_description": "This is your bio. It's a short piece of text that's visible on your profile. By default, it's empty.",
+ "avatar": "Avatar",
+ "avatar_description": "Select an avatar from the list of oekaki you've drawn!",
+ "links": "Links",
+ "link_name": "Name",
+ "link_name_description": "This is the name of the link you're creating.",
+ "link_url": "Url",
+ "link_url_description": "This is the url of the link you're creating.",
+ "link_add": "Add link",
+ "save_changes": "Save your changes"
},
"tegakijs": {
"badDimensions": "Invalid dimensions.",
diff --git a/PinkSea.Frontend/src/views/UserEditView.vue b/PinkSea.Frontend/src/views/UserEditView.vue
index b9be6b3..407c1f5 100644
--- a/PinkSea.Frontend/src/views/UserEditView.vue
+++ b/PinkSea.Frontend/src/views/UserEditView.vue
@@ -120,36 +120,35 @@ onMounted(updateProfile);
loading...
-
+
-
+
-
Nickname
+
{{ $t("profile_edit.nickname") }}
- This is the name others will identify you by. By default, it's equal to your handle.
+ {{ $t("profile_edit.nickname_description") }}
-
Your bio
+
{{ $t("profile_edit.your_bio") }}
- This is your bio. It's a short piece of text that's visible on your profile. By
- default, it's empty.
+ {{ $t("profile_edit.your_bio_description") }}
@@ -157,45 +156,46 @@ onMounted(updateProfile);
-
+
- Select an avatar from the list of oekaki you've drawn!
+ {{ $t("profile_edit.avatar_description") }}
-
+
-
Name
+
{{ $t("profile_edit.link_name") }}
- This is the name of the link you're creating.
+ {{ $t("profile_edit.link_name_description") }}
-
Url
+
{{ $t("profile_edit.link_url") }}
- This is the url of the link you're creating.
+ {{ $t("profile_edit.link_url_description") }}