Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions platforms/blabsy/src/components/chat/chat-window.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,8 @@ function MessageItem({
<div
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand DownExpand Up@@ -119,8 +119,8 @@ function MessageItem({
className='break-words whitespace-pre-wrap'
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand Down
51 changes: 25 additions & 26 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,33 +103,32 @@ export function ChatContextProvider({
(snapshot) => {
const chatsData = snapshot.docs.map((doc) => doc.data());

// Sort chats by last message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: lastMessage timestamp > updatedAt > createdAt
const sortedChats = chatsData.sort((a, b) => {
// If both have lastMessage, sort by timestamp
if (a.lastMessage?.timestamp && b.lastMessage?.timestamp) {
return (
b.lastMessage.timestamp.toMillis() -
a.lastMessage.timestamp.toMillis()
);
}
// If only one has lastMessage, prioritize it
if (a.lastMessage?.timestamp && !b.lastMessage?.timestamp)
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
// Get the most recent activity timestamp for each chat
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: lastMessage timestamp (most recent activity)
if (chat.lastMessage?.timestamp) {
return chat.lastMessage.timestamp.toMillis();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.toMillis();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.toMillis();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

setChats(sortedChats);
Expand Down
47 changes: 37 additions & 10 deletions platforms/pictique-api/src/services/ChatService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,11 @@ export class ChatService {

const savedMessage = await this.messageRepository.save(message);

// Explicitly update the chat's updatedAt to ensure proper sorting
await this.chatRepository.update(chatId, {
updatedAt: new Date()
});

console.log("Sent event", `chat:${chatId}`);
this.eventEmitter.emit(`chat:${chatId}`, [savedMessage]);

Expand DownExpand Up@@ -361,24 +366,46 @@ export class ChatService {
],
});

// Sort the chats by latest message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: latest message timestamp > updatedAt > createdAt
const sortedChats = chatsWithRelations.sort((a, b) => {
const aLatestMessage = a.messages[a.messages.length - 1];
const bLatestMessage = b.messages[b.messages.length - 1];
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: latest message timestamp (most recent activity)
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (latestMessage) {
return latestMessage.createdAt.getTime();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.getTime();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.getTime();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

if (!aLatestMessage && !bLatestMessage) {
return b.createdAt.getTime() - a.createdAt.getTime();
}
if (!aLatestMessage) return 1;
if (!bLatestMessage) return -1;
const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

return bLatestMessage.createdAt.getTime() - aLatestMessage.createdAt.getTime();
// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

// For each chat, get the latest message and its read status
const chatsWithLatestMessage = await Promise.all(
sortedChats.map(async (chat) => {
const latestMessage = chat.messages[chat.messages.length - 1];
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (!latestMessage) {
return { ...chat, latestMessage: undefined };
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,8 @@
<div class="inline-block rounded-[10px] border border-gray-300 bg-gray-200 px-4 py-2">
<div class="text-left text-sm font-medium whitespace-pre-wrap text-black">
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand DownExpand Up@@ -102,8 +102,8 @@

<div class={cn(`${!isOwn ? 'text-white' : 'text-black-600'} whitespace-pre-wrap`)}>
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,13 @@

<div>
<Label>eName</Label>
<Input type="text" placeholder="Your eName" bind:value={handle} disabled class="cursor-not-allowed opacity-70" />
<Input
type="text"
placeholder="Your eName"
bind:value={handle}
disabled
class="cursor-not-allowed opacity-70"
/>
</div>
<div>
<Label>Profile Name</Label>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions platforms/blabsy/src/components/chat/chat-window.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,8 @@ function MessageItem({
<div
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand DownExpand Up@@ -119,8 +119,8 @@ function MessageItem({
className='break-words whitespace-pre-wrap'
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand Down
51 changes: 25 additions & 26 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,33 +103,32 @@ export function ChatContextProvider({
(snapshot) => {
const chatsData = snapshot.docs.map((doc) => doc.data());

// Sort chats by last message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: lastMessage timestamp > updatedAt > createdAt
const sortedChats = chatsData.sort((a, b) => {
// If both have lastMessage, sort by timestamp
if (a.lastMessage?.timestamp && b.lastMessage?.timestamp) {
return (
b.lastMessage.timestamp.toMillis() -
a.lastMessage.timestamp.toMillis()
);
}
// If only one has lastMessage, prioritize it
if (a.lastMessage?.timestamp && !b.lastMessage?.timestamp)
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
// Get the most recent activity timestamp for each chat
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: lastMessage timestamp (most recent activity)
if (chat.lastMessage?.timestamp) {
return chat.lastMessage.timestamp.toMillis();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.toMillis();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.toMillis();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

setChats(sortedChats);
Expand Down
47 changes: 37 additions & 10 deletions platforms/pictique-api/src/services/ChatService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,11 @@ export class ChatService {

const savedMessage = await this.messageRepository.save(message);

// Explicitly update the chat's updatedAt to ensure proper sorting
await this.chatRepository.update(chatId, {
updatedAt: new Date()
});

console.log("Sent event", `chat:${chatId}`);
this.eventEmitter.emit(`chat:${chatId}`, [savedMessage]);

Expand DownExpand Up@@ -361,24 +366,46 @@ export class ChatService {
],
});

// Sort the chats by latest message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: latest message timestamp > updatedAt > createdAt
const sortedChats = chatsWithRelations.sort((a, b) => {
const aLatestMessage = a.messages[a.messages.length - 1];
const bLatestMessage = b.messages[b.messages.length - 1];
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: latest message timestamp (most recent activity)
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (latestMessage) {
return latestMessage.createdAt.getTime();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.getTime();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.getTime();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

if (!aLatestMessage && !bLatestMessage) {
return b.createdAt.getTime() - a.createdAt.getTime();
}
if (!aLatestMessage) return 1;
if (!bLatestMessage) return -1;
const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

return bLatestMessage.createdAt.getTime() - aLatestMessage.createdAt.getTime();
// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

// For each chat, get the latest message and its read status
const chatsWithLatestMessage = await Promise.all(
sortedChats.map(async (chat) => {
const latestMessage = chat.messages[chat.messages.length - 1];
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (!latestMessage) {
return { ...chat, latestMessage: undefined };
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,8 @@
<div class="inline-block rounded-[10px] border border-gray-300 bg-gray-200 px-4 py-2">
<div class="text-left text-sm font-medium whitespace-pre-wrap text-black">
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand DownExpand Up@@ -102,8 +102,8 @@

<div class={cn(`${!isOwn ? 'text-white' : 'text-black-600'} whitespace-pre-wrap`)}>
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,13 @@

<div>
<Label>eName</Label>
<Input type="text" placeholder="Your eName" bind:value={handle} disabled class="cursor-not-allowed opacity-70" />
<Input
type="text"
placeholder="Your eName"
bind:value={handle}
disabled
class="cursor-not-allowed opacity-70"
/>
</div>
<div>
<Label>Profile Name</Label>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions platforms/blabsy/src/components/chat/chat-window.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,8 @@ function MessageItem({
<div
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand DownExpand Up@@ -119,8 +119,8 @@ function MessageItem({
className='break-words whitespace-pre-wrap'
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand Down
51 changes: 25 additions & 26 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,33 +103,32 @@ export function ChatContextProvider({
(snapshot) => {
const chatsData = snapshot.docs.map((doc) => doc.data());

// Sort chats by last message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: lastMessage timestamp > updatedAt > createdAt
const sortedChats = chatsData.sort((a, b) => {
// If both have lastMessage, sort by timestamp
if (a.lastMessage?.timestamp && b.lastMessage?.timestamp) {
return (
b.lastMessage.timestamp.toMillis() -
a.lastMessage.timestamp.toMillis()
);
}
// If only one has lastMessage, prioritize it
if (a.lastMessage?.timestamp && !b.lastMessage?.timestamp)
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
// Get the most recent activity timestamp for each chat
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: lastMessage timestamp (most recent activity)
if (chat.lastMessage?.timestamp) {
return chat.lastMessage.timestamp.toMillis();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.toMillis();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.toMillis();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

setChats(sortedChats);
Expand Down
47 changes: 37 additions & 10 deletions platforms/pictique-api/src/services/ChatService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,11 @@ export class ChatService {

const savedMessage = await this.messageRepository.save(message);

// Explicitly update the chat's updatedAt to ensure proper sorting
await this.chatRepository.update(chatId, {
updatedAt: new Date()
});

console.log("Sent event", `chat:${chatId}`);
this.eventEmitter.emit(`chat:${chatId}`, [savedMessage]);

Expand DownExpand Up@@ -361,24 +366,46 @@ export class ChatService {
],
});

// Sort the chats by latest message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: latest message timestamp > updatedAt > createdAt
const sortedChats = chatsWithRelations.sort((a, b) => {
const aLatestMessage = a.messages[a.messages.length - 1];
const bLatestMessage = b.messages[b.messages.length - 1];
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: latest message timestamp (most recent activity)
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (latestMessage) {
return latestMessage.createdAt.getTime();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.getTime();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.getTime();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

if (!aLatestMessage && !bLatestMessage) {
return b.createdAt.getTime() - a.createdAt.getTime();
}
if (!aLatestMessage) return 1;
if (!bLatestMessage) return -1;
const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

return bLatestMessage.createdAt.getTime() - aLatestMessage.createdAt.getTime();
// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

// For each chat, get the latest message and its read status
const chatsWithLatestMessage = await Promise.all(
sortedChats.map(async (chat) => {
const latestMessage = chat.messages[chat.messages.length - 1];
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (!latestMessage) {
return { ...chat, latestMessage: undefined };
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,8 @@
<div class="inline-block rounded-[10px] border border-gray-300 bg-gray-200 px-4 py-2">
<div class="text-left text-sm font-medium whitespace-pre-wrap text-black">
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand DownExpand Up@@ -102,8 +102,8 @@

<div class={cn(`${!isOwn ? 'text-white' : 'text-black-600'} whitespace-pre-wrap`)}>
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,13 @@

<div>
<Label>eName</Label>
<Input type="text" placeholder="Your eName" bind:value={handle} disabled class="cursor-not-allowed opacity-70" />
<Input
type="text"
placeholder="Your eName"
bind:value={handle}
disabled
class="cursor-not-allowed opacity-70"
/>
</div>
<div>
<Label>Profile Name</Label>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions platforms/blabsy/src/components/chat/chat-window.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,8 @@ function MessageItem({
<div
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand DownExpand Up@@ -119,8 +119,8 @@ function MessageItem({
className='break-words whitespace-pre-wrap'
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand Down
51 changes: 25 additions & 26 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,33 +103,32 @@ export function ChatContextProvider({
(snapshot) => {
const chatsData = snapshot.docs.map((doc) => doc.data());

// Sort chats by last message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: lastMessage timestamp > updatedAt > createdAt
const sortedChats = chatsData.sort((a, b) => {
// If both have lastMessage, sort by timestamp
if (a.lastMessage?.timestamp && b.lastMessage?.timestamp) {
return (
b.lastMessage.timestamp.toMillis() -
a.lastMessage.timestamp.toMillis()
);
}
// If only one has lastMessage, prioritize it
if (a.lastMessage?.timestamp && !b.lastMessage?.timestamp)
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
// Get the most recent activity timestamp for each chat
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: lastMessage timestamp (most recent activity)
if (chat.lastMessage?.timestamp) {
return chat.lastMessage.timestamp.toMillis();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.toMillis();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.toMillis();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

setChats(sortedChats);
Expand Down
47 changes: 37 additions & 10 deletions platforms/pictique-api/src/services/ChatService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,11 @@ export class ChatService {

const savedMessage = await this.messageRepository.save(message);

// Explicitly update the chat's updatedAt to ensure proper sorting
await this.chatRepository.update(chatId, {
updatedAt: new Date()
});

console.log("Sent event", `chat:${chatId}`);
this.eventEmitter.emit(`chat:${chatId}`, [savedMessage]);

Expand DownExpand Up@@ -361,24 +366,46 @@ export class ChatService {
],
});

// Sort the chats by latest message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: latest message timestamp > updatedAt > createdAt
const sortedChats = chatsWithRelations.sort((a, b) => {
const aLatestMessage = a.messages[a.messages.length - 1];
const bLatestMessage = b.messages[b.messages.length - 1];
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: latest message timestamp (most recent activity)
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (latestMessage) {
return latestMessage.createdAt.getTime();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.getTime();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.getTime();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

if (!aLatestMessage && !bLatestMessage) {
return b.createdAt.getTime() - a.createdAt.getTime();
}
if (!aLatestMessage) return 1;
if (!bLatestMessage) return -1;
const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

return bLatestMessage.createdAt.getTime() - aLatestMessage.createdAt.getTime();
// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

// For each chat, get the latest message and its read status
const chatsWithLatestMessage = await Promise.all(
sortedChats.map(async (chat) => {
const latestMessage = chat.messages[chat.messages.length - 1];
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (!latestMessage) {
return { ...chat, latestMessage: undefined };
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,8 @@
<div class="inline-block rounded-[10px] border border-gray-300 bg-gray-200 px-4 py-2">
<div class="text-left text-sm font-medium whitespace-pre-wrap text-black">
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand DownExpand Up@@ -102,8 +102,8 @@

<div class={cn(`${!isOwn ? 'text-white' : 'text-black-600'} whitespace-pre-wrap`)}>
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,13 @@

<div>
<Label>eName</Label>
<Input type="text" placeholder="Your eName" bind:value={handle} disabled class="cursor-not-allowed opacity-70" />
<Input
type="text"
placeholder="Your eName"
bind:value={handle}
disabled
class="cursor-not-allowed opacity-70"
/>
</div>
<div>
<Label>Profile Name</Label>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions platforms/blabsy/src/components/chat/chat-window.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,8 @@ function MessageItem({
<div
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand DownExpand Up@@ -119,8 +119,8 @@ function MessageItem({
className='break-words whitespace-pre-wrap'
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand Down
51 changes: 25 additions & 26 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,33 +103,32 @@ export function ChatContextProvider({
(snapshot) => {
const chatsData = snapshot.docs.map((doc) => doc.data());

// Sort chats by last message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: lastMessage timestamp > updatedAt > createdAt
const sortedChats = chatsData.sort((a, b) => {
// If both have lastMessage, sort by timestamp
if (a.lastMessage?.timestamp && b.lastMessage?.timestamp) {
return (
b.lastMessage.timestamp.toMillis() -
a.lastMessage.timestamp.toMillis()
);
}
// If only one has lastMessage, prioritize it
if (a.lastMessage?.timestamp && !b.lastMessage?.timestamp)
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
// Get the most recent activity timestamp for each chat
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: lastMessage timestamp (most recent activity)
if (chat.lastMessage?.timestamp) {
return chat.lastMessage.timestamp.toMillis();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.toMillis();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.toMillis();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

setChats(sortedChats);
Expand Down
47 changes: 37 additions & 10 deletions platforms/pictique-api/src/services/ChatService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,11 @@ export class ChatService {

const savedMessage = await this.messageRepository.save(message);

// Explicitly update the chat's updatedAt to ensure proper sorting
await this.chatRepository.update(chatId, {
updatedAt: new Date()
});

console.log("Sent event", `chat:${chatId}`);
this.eventEmitter.emit(`chat:${chatId}`, [savedMessage]);

Expand DownExpand Up@@ -361,24 +366,46 @@ export class ChatService {
],
});

// Sort the chats by latest message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: latest message timestamp > updatedAt > createdAt
const sortedChats = chatsWithRelations.sort((a, b) => {
const aLatestMessage = a.messages[a.messages.length - 1];
const bLatestMessage = b.messages[b.messages.length - 1];
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: latest message timestamp (most recent activity)
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (latestMessage) {
return latestMessage.createdAt.getTime();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.getTime();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.getTime();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

if (!aLatestMessage && !bLatestMessage) {
return b.createdAt.getTime() - a.createdAt.getTime();
}
if (!aLatestMessage) return 1;
if (!bLatestMessage) return -1;
const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

return bLatestMessage.createdAt.getTime() - aLatestMessage.createdAt.getTime();
// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

// For each chat, get the latest message and its read status
const chatsWithLatestMessage = await Promise.all(
sortedChats.map(async (chat) => {
const latestMessage = chat.messages[chat.messages.length - 1];
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (!latestMessage) {
return { ...chat, latestMessage: undefined };
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,8 @@
<div class="inline-block rounded-[10px] border border-gray-300 bg-gray-200 px-4 py-2">
<div class="text-left text-sm font-medium whitespace-pre-wrap text-black">
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand DownExpand Up@@ -102,8 +102,8 @@

<div class={cn(`${!isOwn ? 'text-white' : 'text-black-600'} whitespace-pre-wrap`)}>
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,13 @@

<div>
<Label>eName</Label>
<Input type="text" placeholder="Your eName" bind:value={handle} disabled class="cursor-not-allowed opacity-70" />
<Input
type="text"
placeholder="Your eName"
bind:value={handle}
disabled
class="cursor-not-allowed opacity-70"
/>
</div>
<div>
<Label>Profile Name</Label>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions platforms/blabsy/src/components/chat/chat-window.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,8 @@ function MessageItem({
<div
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand DownExpand Up@@ -119,8 +119,8 @@ function MessageItem({
className='break-words whitespace-pre-wrap'
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand Down
51 changes: 25 additions & 26 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,33 +103,32 @@ export function ChatContextProvider({
(snapshot) => {
const chatsData = snapshot.docs.map((doc) => doc.data());

// Sort chats by last message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: lastMessage timestamp > updatedAt > createdAt
const sortedChats = chatsData.sort((a, b) => {
// If both have lastMessage, sort by timestamp
if (a.lastMessage?.timestamp && b.lastMessage?.timestamp) {
return (
b.lastMessage.timestamp.toMillis() -
a.lastMessage.timestamp.toMillis()
);
}
// If only one has lastMessage, prioritize it
if (a.lastMessage?.timestamp && !b.lastMessage?.timestamp)
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
// Get the most recent activity timestamp for each chat
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: lastMessage timestamp (most recent activity)
if (chat.lastMessage?.timestamp) {
return chat.lastMessage.timestamp.toMillis();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.toMillis();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.toMillis();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

setChats(sortedChats);
Expand Down
47 changes: 37 additions & 10 deletions platforms/pictique-api/src/services/ChatService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,11 @@ export class ChatService {

const savedMessage = await this.messageRepository.save(message);

// Explicitly update the chat's updatedAt to ensure proper sorting
await this.chatRepository.update(chatId, {
updatedAt: new Date()
});

console.log("Sent event", `chat:${chatId}`);
this.eventEmitter.emit(`chat:${chatId}`, [savedMessage]);

Expand DownExpand Up@@ -361,24 +366,46 @@ export class ChatService {
],
});

// Sort the chats by latest message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: latest message timestamp > updatedAt > createdAt
const sortedChats = chatsWithRelations.sort((a, b) => {
const aLatestMessage = a.messages[a.messages.length - 1];
const bLatestMessage = b.messages[b.messages.length - 1];
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: latest message timestamp (most recent activity)
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (latestMessage) {
return latestMessage.createdAt.getTime();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.getTime();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.getTime();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

if (!aLatestMessage && !bLatestMessage) {
return b.createdAt.getTime() - a.createdAt.getTime();
}
if (!aLatestMessage) return 1;
if (!bLatestMessage) return -1;
const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

return bLatestMessage.createdAt.getTime() - aLatestMessage.createdAt.getTime();
// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

// For each chat, get the latest message and its read status
const chatsWithLatestMessage = await Promise.all(
sortedChats.map(async (chat) => {
const latestMessage = chat.messages[chat.messages.length - 1];
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (!latestMessage) {
return { ...chat, latestMessage: undefined };
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,8 @@
<div class="inline-block rounded-[10px] border border-gray-300 bg-gray-200 px-4 py-2">
<div class="text-left text-sm font-medium whitespace-pre-wrap text-black">
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand DownExpand Up@@ -102,8 +102,8 @@

<div class={cn(`${!isOwn ? 'text-white' : 'text-black-600'} whitespace-pre-wrap`)}>
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,13 @@

<div>
<Label>eName</Label>
<Input type="text" placeholder="Your eName" bind:value={handle} disabled class="cursor-not-allowed opacity-70" />
<Input
type="text"
placeholder="Your eName"
bind:value={handle}
disabled
class="cursor-not-allowed opacity-70"
/>
</div>
<div>
<Label>Profile Name</Label>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions platforms/blabsy/src/components/chat/chat-window.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,8 @@ function MessageItem({
<div
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand DownExpand Up@@ -119,8 +119,8 @@ function MessageItem({
className='break-words whitespace-pre-wrap'
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand Down
51 changes: 25 additions & 26 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,33 +103,32 @@ export function ChatContextProvider({
(snapshot) => {
const chatsData = snapshot.docs.map((doc) => doc.data());

// Sort chats by last message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: lastMessage timestamp > updatedAt > createdAt
const sortedChats = chatsData.sort((a, b) => {
// If both have lastMessage, sort by timestamp
if (a.lastMessage?.timestamp && b.lastMessage?.timestamp) {
return (
b.lastMessage.timestamp.toMillis() -
a.lastMessage.timestamp.toMillis()
);
}
// If only one has lastMessage, prioritize it
if (a.lastMessage?.timestamp && !b.lastMessage?.timestamp)
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
// Get the most recent activity timestamp for each chat
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: lastMessage timestamp (most recent activity)
if (chat.lastMessage?.timestamp) {
return chat.lastMessage.timestamp.toMillis();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.toMillis();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.toMillis();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

setChats(sortedChats);
Expand Down
47 changes: 37 additions & 10 deletions platforms/pictique-api/src/services/ChatService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,11 @@ export class ChatService {

const savedMessage = await this.messageRepository.save(message);

// Explicitly update the chat's updatedAt to ensure proper sorting
await this.chatRepository.update(chatId, {
updatedAt: new Date()
});

console.log("Sent event", `chat:${chatId}`);
this.eventEmitter.emit(`chat:${chatId}`, [savedMessage]);

Expand DownExpand Up@@ -361,24 +366,46 @@ export class ChatService {
],
});

// Sort the chats by latest message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: latest message timestamp > updatedAt > createdAt
const sortedChats = chatsWithRelations.sort((a, b) => {
const aLatestMessage = a.messages[a.messages.length - 1];
const bLatestMessage = b.messages[b.messages.length - 1];
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: latest message timestamp (most recent activity)
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (latestMessage) {
return latestMessage.createdAt.getTime();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.getTime();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.getTime();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

if (!aLatestMessage && !bLatestMessage) {
return b.createdAt.getTime() - a.createdAt.getTime();
}
if (!aLatestMessage) return 1;
if (!bLatestMessage) return -1;
const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

return bLatestMessage.createdAt.getTime() - aLatestMessage.createdAt.getTime();
// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

// For each chat, get the latest message and its read status
const chatsWithLatestMessage = await Promise.all(
sortedChats.map(async (chat) => {
const latestMessage = chat.messages[chat.messages.length - 1];
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (!latestMessage) {
return { ...chat, latestMessage: undefined };
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,8 @@
<div class="inline-block rounded-[10px] border border-gray-300 bg-gray-200 px-4 py-2">
<div class="text-left text-sm font-medium whitespace-pre-wrap text-black">
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand DownExpand Up@@ -102,8 +102,8 @@

<div class={cn(`${!isOwn ? 'text-white' : 'text-black-600'} whitespace-pre-wrap`)}>
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,13 @@

<div>
<Label>eName</Label>
<Input type="text" placeholder="Your eName" bind:value={handle} disabled class="cursor-not-allowed opacity-70" />
<Input
type="text"
placeholder="Your eName"
bind:value={handle}
disabled
class="cursor-not-allowed opacity-70"
/>
</div>
<div>
<Label>Profile Name</Label>
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions platforms/blabsy/src/components/chat/chat-window.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -51,8 +51,8 @@ function MessageItem({
<div
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand DownExpand Up@@ -119,8 +119,8 @@ function MessageItem({
className='break-words whitespace-pre-wrap'
dangerouslySetInnerHTML={{
__html: displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)
}}
/>
Expand Down
51 changes: 25 additions & 26 deletions platforms/blabsy/src/lib/context/chat-context.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,33 +103,32 @@ export function ChatContextProvider({
(snapshot) => {
const chatsData = snapshot.docs.map((doc) => doc.data());

// Sort chats by last message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: lastMessage timestamp > updatedAt > createdAt
const sortedChats = chatsData.sort((a, b) => {
// If both have lastMessage, sort by timestamp
if (a.lastMessage?.timestamp && b.lastMessage?.timestamp) {
return (
b.lastMessage.timestamp.toMillis() -
a.lastMessage.timestamp.toMillis()
);
}
// If only one has lastMessage, prioritize it
if (a.lastMessage?.timestamp && !b.lastMessage?.timestamp)
return -1;
if (!a.lastMessage?.timestamp && b.lastMessage?.timestamp)
return 1;
// If neither has lastMessage, sort by updatedAt (with null checks)
if (a.updatedAt && b.updatedAt) {
return b.updatedAt.toMillis() - a.updatedAt.toMillis();
}
// If only one has updatedAt, prioritize it
if (a.updatedAt && !b.updatedAt) return -1;
if (!a.updatedAt && b.updatedAt) return 1;
// If both are null, sort by createdAt as fallback
if (a.createdAt && b.createdAt) {
return b.createdAt.toMillis() - a.createdAt.toMillis();
}
// If all else fails, maintain order
return 0;
// Get the most recent activity timestamp for each chat
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: lastMessage timestamp (most recent activity)
if (chat.lastMessage?.timestamp) {
return chat.lastMessage.timestamp.toMillis();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.toMillis();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.toMillis();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

setChats(sortedChats);
Expand Down
47 changes: 37 additions & 10 deletions platforms/pictique-api/src/services/ChatService.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -215,6 +215,11 @@ export class ChatService {

const savedMessage = await this.messageRepository.save(message);

// Explicitly update the chat's updatedAt to ensure proper sorting
await this.chatRepository.update(chatId, {
updatedAt: new Date()
});

console.log("Sent event", `chat:${chatId}`);
this.eventEmitter.emit(`chat:${chatId}`, [savedMessage]);

Expand DownExpand Up@@ -361,24 +366,46 @@ export class ChatService {
],
});

// Sort the chats by latest message timestamp (most recent first)
// Sort chats by most recent activity (most recent first)
// Priority: latest message timestamp > updatedAt > createdAt
const sortedChats = chatsWithRelations.sort((a, b) => {
const aLatestMessage = a.messages[a.messages.length - 1];
const bLatestMessage = b.messages[b.messages.length - 1];
const getMostRecentTimestamp = (chat: typeof a): number => {
// Priority 1: latest message timestamp (most recent activity)
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (latestMessage) {
return latestMessage.createdAt.getTime();
}
// Priority 2: updatedAt (for updated chats without messages)
if (chat.updatedAt) {
return chat.updatedAt.getTime();
}
// Priority 3: createdAt (for new chats)
if (chat.createdAt) {
return chat.createdAt.getTime();
}
// Fallback: 0 for chats with no timestamps
return 0;
};

if (!aLatestMessage && !bLatestMessage) {
return b.createdAt.getTime() - a.createdAt.getTime();
}
if (!aLatestMessage) return 1;
if (!bLatestMessage) return -1;
const aTimestamp = getMostRecentTimestamp(a);
const bTimestamp = getMostRecentTimestamp(b);

return bLatestMessage.createdAt.getTime() - aLatestMessage.createdAt.getTime();
// Sort by most recent timestamp (descending)
return bTimestamp - aTimestamp;
});

// For each chat, get the latest message and its read status
const chatsWithLatestMessage = await Promise.all(
sortedChats.map(async (chat) => {
const latestMessage = chat.messages[chat.messages.length - 1];
// Sort messages by createdAt ascending to get the latest one
const sortedMessages = [...(chat.messages || [])].sort(
(m1, m2) => m1.createdAt.getTime() - m2.createdAt.getTime()
);
const latestMessage = sortedMessages[sortedMessages.length - 1];
if (!latestMessage) {
return { ...chat, latestMessage: undefined };
}
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,8 @@
<div class="inline-block rounded-[10px] border border-gray-300 bg-gray-200 px-4 py-2">
<div class="text-left text-sm font-medium whitespace-pre-wrap text-black">
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand DownExpand Up@@ -102,8 +102,8 @@

<div class={cn(`${!isOwn ? 'text-white' : 'text-black-600'} whitespace-pre-wrap`)}>
{@html displayText.replace(
/<a href="([^"]+)">([^<]+)<\/a>/g,
'<a href="$1" class="text-blue-600 hover:text-blue-800 underline">$2</a>'
/<a href="([^"]+)"([^>]*)>([^<]+)<\/a>/g,
'<a href="$1"$2 class="text-blue-600 hover:text-blue-800 underline cursor-pointer">$3</a>'
)}
</div>
</div>
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,7 +83,13 @@

<div>
<Label>eName</Label>
<Input type="text" placeholder="Your eName" bind:value={handle} disabled class="cursor-not-allowed opacity-70" />
<Input
type="text"
placeholder="Your eName"
bind:value={handle}
disabled
class="cursor-not-allowed opacity-70"
/>
</div>
<div>
<Label>Profile Name</Label>
Expand Down