diff --git a/packages/app/src/Element/Event/Create/TrendingHashTagsLine.tsx b/packages/app/src/Element/Event/Create/TrendingHashTagsLine.tsx
index 1be91cd0..45983090 100644
--- a/packages/app/src/Element/Event/Create/TrendingHashTagsLine.tsx
+++ b/packages/app/src/Element/Event/Create/TrendingHashTagsLine.tsx
@@ -25,7 +25,10 @@ export function TrendingHashTagsLine(props: { onClick: (tag: string) => void })
{hashtags.slice(0, 5).map(a => (
-
props.onClick(a.hashtag)}>
+ props.onClick(a.hashtag)}>
#{a.hashtag}
))}
diff --git a/packages/app/src/Element/Event/Create/util.ts b/packages/app/src/Element/Event/Create/util.ts
index d52bb184..ae2f03b8 100644
--- a/packages/app/src/Element/Event/Create/util.ts
+++ b/packages/app/src/Element/Event/Create/util.ts
@@ -10,7 +10,7 @@ export async function sendEventToRelays(
) {
getWebRtcPool()?.send(ev);
if (customRelays) {
- system.HandleEvent({...ev, relays: []});
+ system.HandleEvent({ ...ev, relays: [] });
return removeUndefined(
await Promise.all(
customRelays.map(async r => {
diff --git a/packages/app/src/Element/Trending/TrendingPosts.tsx b/packages/app/src/Element/Trending/TrendingPosts.tsx
index 1c98069d..cffeac14 100644
--- a/packages/app/src/Element/Trending/TrendingPosts.tsx
+++ b/packages/app/src/Element/Trending/TrendingPosts.tsx
@@ -62,7 +62,11 @@ export default function TrendingNotes({ count = Infinity, small = false }) {
return (
{filteredAndLimitedPosts().map(e => (
- setModalThread(NostrLink.fromEvent(e))} />
+ setModalThread(NostrLink.fromEvent(e))}
+ />
))}
);
diff --git a/packages/app/src/Element/Chat/ChatParticipant.tsx b/packages/app/src/Pages/Messages/ChatParticipant.tsx
similarity index 81%
rename from packages/app/src/Element/Chat/ChatParticipant.tsx
rename to packages/app/src/Pages/Messages/ChatParticipant.tsx
index 9cd8bc0c..57eb694f 100644
--- a/packages/app/src/Element/Chat/ChatParticipant.tsx
+++ b/packages/app/src/Pages/Messages/ChatParticipant.tsx
@@ -1,8 +1,8 @@
import { MetadataCache } from "@snort/system";
import { ChatParticipant } from "@/chat";
-import NoteToSelf from "../User/NoteToSelf";
-import ProfileImage from "../User/ProfileImage";
+import NoteToSelf from "../../Element/User/NoteToSelf";
+import ProfileImage from "../../Element/User/ProfileImage";
import useLogin from "@/Hooks/useLogin";
export function ChatParticipantProfile({ participant }: { participant: ChatParticipant }) {
diff --git a/packages/app/src/Element/Chat/DM.css b/packages/app/src/Pages/Messages/DM.css
similarity index 100%
rename from packages/app/src/Element/Chat/DM.css
rename to packages/app/src/Pages/Messages/DM.css
diff --git a/packages/app/src/Element/Chat/DM.tsx b/packages/app/src/Pages/Messages/DM.tsx
similarity index 95%
rename from packages/app/src/Element/Chat/DM.tsx
rename to packages/app/src/Pages/Messages/DM.tsx
index 06999176..3599aea3 100644
--- a/packages/app/src/Element/Chat/DM.tsx
+++ b/packages/app/src/Pages/Messages/DM.tsx
@@ -9,9 +9,9 @@ import NoteTime from "@/Element/Event/NoteTime";
import Text from "@/Element/Text";
import useLogin from "@/Hooks/useLogin";
import { Chat, ChatMessage, ChatType, setLastReadIn } from "@/chat";
-import ProfileImage from "../User/ProfileImage";
+import ProfileImage from "../../Element/User/ProfileImage";
-import messages from "../messages";
+import messages from "../../Element/messages";
export interface DMProps {
chat: Chat;
diff --git a/packages/app/src/Element/Chat/DmWindow.tsx b/packages/app/src/Pages/Messages/DmWindow.tsx
similarity index 96%
rename from packages/app/src/Element/Chat/DmWindow.tsx
rename to packages/app/src/Pages/Messages/DmWindow.tsx
index f8e52495..34d0e09c 100644
--- a/packages/app/src/Element/Chat/DmWindow.tsx
+++ b/packages/app/src/Pages/Messages/DmWindow.tsx
@@ -1,8 +1,8 @@
import { useEffect, useMemo, useRef } from "react";
import ProfileImage from "@/Element/User/ProfileImage";
-import DM from "@/Element/Chat/DM";
+import DM from "@/Pages/Messages/DM";
import useLogin from "@/Hooks/useLogin";
-import WriteMessage from "@/Element/Chat/WriteMessage";
+import WriteMessage from "@/Pages/Messages/WriteMessage";
import { Chat, createEmptyChatObject, useChatSystem } from "@/chat";
import { FormattedMessage } from "react-intl";
import { ChatParticipantProfile } from "./ChatParticipant";
diff --git a/packages/app/src/Pages/Messages/MessagesPage.tsx b/packages/app/src/Pages/Messages/MessagesPage.tsx
index 86e9a2fd..e7fecd0d 100644
--- a/packages/app/src/Pages/Messages/MessagesPage.tsx
+++ b/packages/app/src/Pages/Messages/MessagesPage.tsx
@@ -9,9 +9,9 @@ import NoteToSelf from "@/Element/User/NoteToSelf";
import useLogin from "@/Hooks/useLogin";
import usePageWidth from "@/Hooks/usePageWidth";
import NoteTime from "@/Element/Event/NoteTime";
-import DmWindow from "@/Element/Chat/DmWindow";
+import DmWindow from "@/Pages/Messages/DmWindow";
import { Chat, ChatType, useChatSystem } from "@/chat";
-import { ChatParticipantProfile } from "@/Element/Chat/ChatParticipant";
+import { ChatParticipantProfile } from "@/Pages/Messages/ChatParticipant";
import classNames from "classnames";
import NewChatWindow from "@/Pages/Messages/NewChatWindow";
diff --git a/packages/app/src/Element/Chat/WriteMessage.tsx b/packages/app/src/Pages/Messages/WriteMessage.tsx
similarity index 96%
rename from packages/app/src/Element/Chat/WriteMessage.tsx
rename to packages/app/src/Pages/Messages/WriteMessage.tsx
index 9c4e7892..6d3fa198 100644
--- a/packages/app/src/Element/Chat/WriteMessage.tsx
+++ b/packages/app/src/Pages/Messages/WriteMessage.tsx
@@ -1,6 +1,6 @@
import { useState } from "react";
import useEventPublisher from "@/Hooks/useEventPublisher";
-import Textarea from "../Textarea";
+import Textarea from "../../Element/Textarea";
import { Chat } from "@/chat";
import { AsyncIcon } from "@/Element/Button/AsyncIcon";
diff --git a/packages/app/src/Tasks/TaskList.tsx b/packages/app/src/Tasks/TaskList.tsx
index 638c55fd..b932d991 100644
--- a/packages/app/src/Tasks/TaskList.tsx
+++ b/packages/app/src/Tasks/TaskList.tsx
@@ -1,5 +1,5 @@
import "./TaskList.css";
-import {Fragment, useSyncExternalStore} from "react";
+import { Fragment, useSyncExternalStore } from "react";
import { useUserProfile } from "@snort/system-react";
import useLogin from "@/Hooks/useLogin";
@@ -54,11 +54,7 @@ export const TaskList = () => {
.filter(a => (user ? a.check(user, session) : false))
.map(a => {
if (a.noBaseStyle) {
- return (
-
- {a.render()}
-
- );
+ return {a.render()};
} else {
return (
diff --git a/packages/app/src/chat/nip29.ts b/packages/app/src/chat/nip29.ts
index eecbd01e..e6726315 100644
--- a/packages/app/src/chat/nip29.ts
+++ b/packages/app/src/chat/nip29.ts
@@ -89,7 +89,10 @@ export class Nip29ChatSystem extends ExternalStore
> implements ChatS
];
},
sendMessage: async (ev, system: SystemInterface) => {
- ev.forEach(async a => await system.WriteOnceToRelay(`wss://${relay}`, a));
+ ev.forEach(async a => {
+ system.HandleEvent({ ...a, relays: [] });
+ await system.WriteOnceToRelay(`wss://${relay}`, a);
+ });
},
} as Chat;
});
diff --git a/packages/app/src/webrtc/WebRTCConnection.ts b/packages/app/src/webrtc/WebRTCConnection.ts
index 0178599f..095c993d 100644
--- a/packages/app/src/webrtc/WebRTCConnection.ts
+++ b/packages/app/src/webrtc/WebRTCConnection.ts
@@ -62,7 +62,7 @@ export class WebRTCConnection extends EventEmitter {
} else {
try {
const data = JSON.parse(event.data);
- this.emit("event", data);
+ this.emit("event", { ...data, relays: [`webrtc:${this.peerId}`] });
} catch (e) {
// Ignore
}