Skip to content
Open
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
11 changes: 3 additions & 8 deletions src/components/messages.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ export function Messages({ id }: { id: Id<"directMessages" | "channels"> }) {
function TypingIndicator({ id }: { id: Id<"directMessages" | "channels"> }) {
const usernames = useQuery(api.functions.typing.list, { dmOrChannelId: id });

if (!usernames || usernames.length === 0) {
return null;
}

return (
<div className="text-sm text-muted-foreground px-4 py-2">
{usernames.join(", ")} is typing...
Expand All @@ -66,7 +62,7 @@ function MessageItem({ message }: { message: Message }) {
</Avatar>
<div className="flex flex-col mr-auto">
<p className="text-xs text-muted-foreground">
{message.sender?.username ?? "Deleted User"}
{message.sender.username}
</p>
<p className="text-sm">{message.content}</p>
{message.attachment && (
Expand Down Expand Up @@ -120,7 +116,7 @@ function MessageInput({ id }: { id: Id<"directMessages" | "channels"> }) {
const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault();
try {
await sendMessage({
sendMessage({
dmOrChannelId: id,
attachment: imageUpload.storageId,
content,
Expand All @@ -130,7 +126,7 @@ function MessageInput({ id }: { id: Id<"directMessages" | "channels"> }) {
} catch (error) {
toast.error("Failed to send message", {
description:
error instanceof Error ? error.message : "An unknown error occurred",
error instanceof Error,
});
}
};
Expand Down Expand Up @@ -178,7 +174,6 @@ function MessageInput({ id }: { id: Id<"directMessages" | "channels"> }) {

function ImagePreview({
url,
isUploading,
}: {
url: string;
isUploading: boolean;
Expand Down