Prettier

packages/app/src/Element/Thread.tsx

@@ -154,8 +154,9 @@ const TierThree = ({ active, isLastSubthread, notes, related, chains, onNavigate
   return (
     <>
       <div
-        className={`subthread-container ${hasMultipleNotes ? "subthread-multi" : ""} ${isLast ? "subthread-last" : "subthread-mid"
+        className={`subthread-container ${hasMultipleNotes ? "subthread-multi" : ""} ${
-          }`}>
+          isLast ? "subthread-last" : "subthread-mid"
+        }`}>
         <Divider variant="small" />
         <Note
           highlight={active === first.id}
@@ -184,8 +185,9 @@ const TierThree = ({ active, isLastSubthread, notes, related, chains, onNavigate
         return (
           <div
             key={r.id}
-            className={`subthread-container ${lastReply ? "" : "subthread-multi"} ${lastReply ? "subthread-last" : "subthread-mid"
+            className={`subthread-container ${lastReply ? "" : "subthread-multi"} ${
-              }`}>
+              lastReply ? "subthread-last" : "subthread-mid"
+            }`}>
             <Divider variant="small" />
             <Note
               className={`thread-note ${lastNote ? "is-last-note" : ""}`}

packages/app/src/Feed/ThreadFeed.ts

@@ -12,11 +12,7 @@ export default function useThreadFeed(link: NostrLink) {
     sub.withOptions({
       leaveOpen: true,
     });
-    sub
+    sub.withFilter().kinds([EventKind.TextNote]).link(link).replyToLink(link);
-      .withFilter()
-      .kinds([EventKind.TextNote])
-      .link(link)
-      .replyToLink(link);
     allEvents.forEach(x => {
       sub.withFilter().kinds([EventKind.TextNote]).link(x).replyToLink(x);
     });

packages/system/src/event-ext.ts

@@ -111,7 +111,7 @@ export abstract class EventExt {
       pubKeys: [],
     } as Thread;
     const replyTags = ev.tags.filter(a => a[0] === "e" || a[0] === "a").map(a => EventExt.parseTag(a));
-    if(replyTags.length > 0) {
+    if (replyTags.length > 0) {
       const marked = replyTags.some(a => a.marker);
       if (!marked) {
         ret.root = replyTags[0];

packages/system/src/nostr-system.ts

@@ -296,11 +296,14 @@ export class NostrSystem extends ExternalStore<SystemSnapshot> implements System
         if (cacheResults.length > 0) {
           const resultIds = new Set(cacheResults.map(a => a.id));
           f.ids = f.ids.filter(a => !resultIds.has(a));
-          q.insertCompletedTrace({
+          q.insertCompletedTrace(
-            filters:[{...f, ids: [...resultIds]}],
+            {
-            strategy: RequestStrategy.ExplicitRelays,
+              filters: [{ ...f, ids: [...resultIds] }],
-            relay: ""
+              strategy: RequestStrategy.ExplicitRelays,
-          }, cacheResults as Array<TaggedNostrEvent>);
+              relay: "",
+            },
+            cacheResults as Array<TaggedNostrEvent>,
+          );
         }
       }
     }

packages/system/src/profile-cache.ts

@@ -39,7 +39,7 @@ export class ProfileLoaderService {
   TrackMetadata(pk: HexKey | Array<HexKey>) {
     for (const p of Array.isArray(pk) ? pk : [pk]) {
       if (p.length === 64) {
-        this.#wantsMetadata.add(p)
+        this.#wantsMetadata.add(p);
       }
     }
   }

packages/system/src/query.ts

@@ -198,14 +198,14 @@ export class Query implements QueryBase {
   }
 
   /**
-   * Insert a new trace as a placeholder 
+   * Insert a new trace as a placeholder
    */
   insertCompletedTrace(subq: BuiltRawReqFilter, data: Readonly<Array<TaggedNostrEvent>>) {
     const qt = new QueryTrace(
       "",
       subq.filters,
       "",
-      () => { 
+      () => {
         // nothing to close
       },
       () => {

packages/system/src/request-builder.ts

@@ -146,7 +146,9 @@ export class RequestBuilder {
 
     const filtersSquashed = [...relayMerged.values()].map(a => {
       return {
-        filters: system.QueryOptimizer.flatMerge(a.flatMap(b => b.filters.flatMap(c => system.QueryOptimizer.expandFilter(c)))),
+        filters: system.QueryOptimizer.flatMerge(
+          a.flatMap(b => b.filters.flatMap(c => system.QueryOptimizer.expandFilter(c))),
+        ),
         relay: a[0].relay,
         strategy: a[0].strategy,
       } as BuiltRawReqFilter;
@@ -252,7 +254,7 @@ export class RequestFilterBuilder {
     if (link.type === NostrPrefix.Address) {
       this.tag("a", [`${link.kind}:${link.author}:${link.id}`]);
       link.relays?.forEach(v => this.relay(v));
-    } else if(link.type === NostrPrefix.PublicKey || link.type === NostrPrefix.Profile) {
+    } else if (link.type === NostrPrefix.PublicKey || link.type === NostrPrefix.Profile) {
       this.tag("p", [link.id]);
       link.relays?.forEach(v => this.relay(v));
     } else {

packages/system/src/request-trim.ts

@@ -4,23 +4,23 @@ import { ReqFilter } from "nostr";
  * Remove empty filters, filters which would result in no results
  */
 export function trimFilters(filters: Array<ReqFilter>) {
-     const fNew = [];
+  const fNew = [];
-     for(const f of filters) {
+  for (const f of filters) {
-       let arrays = 0;
+    let arrays = 0;
-       for(const [k, v] of Object.entries(f)) {
+    for (const [k, v] of Object.entries(f)) {
-         if(Array.isArray(v)) {
+      if (Array.isArray(v)) {
-           arrays++;
+        arrays++;
-           if(v.length === 0) {
+        if (v.length === 0) {
-             delete f[k];
+          delete f[k];
-           }
+        }
-         }
+      }
-       }
+    }
- 
+
-       if(arrays > 0 && Object.entries(f).some(v => Array.isArray(v))) {
+    if (arrays > 0 && Object.entries(f).some(v => Array.isArray(v))) {
-         fNew.push(f);
+      fNew.push(f);
-       } else if(arrays === 0) {
+    } else if (arrays === 0) {
-        fNew.push(f);
+      fNew.push(f);
-       }
+    }
-     }
+  }
-     return fNew;
+  return fNew;
-}
+}