From bead2b8604b25890f5edc29d0fb2a293120abf08 Mon Sep 17 00:00:00 2001
From: hzrd149 <github@hzrd149.com>
Date: Wed, 27 Mar 2024 08:18:02 -0500
Subject: [PATCH] fix dependencies

---
 package.json                              |  4 ++--
 src/components/user/user-dns-identity.tsx |  4 +---
 src/helpers/media-upload/blossom.ts       |  2 +-
 src/views/dms/chat.tsx                    |  9 ++-------
 yarn.lock                                 | 16 ++++++++--------
 5 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index 32cd3ba60..1359d6b32 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,8 @@
     "@uiw/react-codemirror": "^4.21.21",
     "@webscopeio/react-textarea-autocomplete": "^4.9.2",
     "bech32": "^2.0.0",
-    "blossom-client": "^0.4.0",
-    "blossom-drive-client": "^0.1.0",
+    "blossom-client-sdk": "^0.4.0",
+    "blossom-drive-sdk": "^0.1.1",
     "blurhash": "^2.0.5",
     "chart.js": "^4.4.1",
     "cheerio": "^1.0.0-rc.12",
diff --git a/src/components/user/user-dns-identity.tsx b/src/components/user/user-dns-identity.tsx
index 483331d5f..74f7e896b 100644
--- a/src/components/user/user-dns-identity.tsx
+++ b/src/components/user/user-dns-identity.tsx
@@ -5,9 +5,7 @@ import UserDnsIdentityIcon from "./user-dns-identity-icon";
 
 export default function UserDnsIdentity({ pubkey, onlyIcon }: { pubkey: string; onlyIcon?: boolean }) {
   const metadata = useUserMetadata(pubkey);
-  if (!metadata?.nip05) {
-    return null;
-  }
+  if (!metadata?.nip05) return null;
 
   if (onlyIcon) {
     return (
diff --git a/src/helpers/media-upload/blossom.ts b/src/helpers/media-upload/blossom.ts
index 9bd6837d5..5b82d74bd 100644
--- a/src/helpers/media-upload/blossom.ts
+++ b/src/helpers/media-upload/blossom.ts
@@ -1,6 +1,6 @@
 import { NostrEvent } from "nostr-tools";
 import { safeUrl } from "../parse";
-import { BlobDescriptor, BlossomClient, Signer } from "blossom-client";
+import { BlobDescriptor, BlossomClient, Signer } from "blossom-client-sdk";
 
 export function getServersFromEvent(event: NostrEvent) {
   return event.tags
diff --git a/src/views/dms/chat.tsx b/src/views/dms/chat.tsx
index c5273adb4..4e1c25beb 100644
--- a/src/views/dms/chat.tsx
+++ b/src/views/dms/chat.tsx
@@ -81,13 +81,8 @@ function DirectMessageChatPage({ pubkey }: { pubkey: string }) {
     [
       {
         kinds: [kinds.EncryptedDirectMessage],
-        "#p": [account.pubkey],
-        authors: [pubkey],
-      },
-      {
-        kinds: [kinds.EncryptedDirectMessage],
-        "#p": [pubkey],
-        authors: [account.pubkey],
+        "#p": [account.pubkey, pubkey],
+        authors: [pubkey, account.pubkey],
       },
     ],
   );
diff --git a/yarn.lock b/yarn.lock
index 5e5a1a71d..d4a51ff08 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3308,21 +3308,21 @@ better-path-resolve@1.0.0:
   resolved "https://registry.yarnpkg.com/bezier-js/-/bezier-js-6.1.4.tgz#c7828f6c8900562b69d5040afb881bcbdad82001"
   integrity sha512-PA0FW9ZpcHbojUCMu28z9Vg/fNkwTj5YhusSAjHHDfHDGLxJ6YUKrAN2vk1fP2MMOxVw4Oko16FMlRGVBGqLKg==
 
-blossom-client@^0.4.0:
+blossom-client-sdk@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/blossom-client/-/blossom-client-0.4.0.tgz#1607e5f862aa14a4f7e3ca91c025c778477b0163"
-  integrity sha512-kMEMmvaH2sJ2vyJoaG28raBmTtohbFgAJ/wu0/wvNCQORxsfCrmDEmF0QuKCaFYEL4eUoBOTyhEPzhd7dekjlA==
+  resolved "https://registry.yarnpkg.com/blossom-client-sdk/-/blossom-client-sdk-0.4.0.tgz#3b40e478dbe1a324f579e29570b46eb12968074d"
+  integrity sha512-xw1lq15VCfwb8RrmKvwxV92bwD5qwou97PpZvutH+WHT87bokZrx1uCBh0Ww3x+eJqamevvW2w6QAc+BYwILCg==
   dependencies:
     cross-fetch "^4.0.0"
 
-blossom-drive-client@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/blossom-drive-client/-/blossom-drive-client-0.1.0.tgz#9cb2b20df55ad11789f6492086110633e94bdce5"
-  integrity sha512-E9KaOeqJUbhdexL9woYkViz72mKaNxNBaLiAVq2+D1N1F0d4NZ+zytNevr/+pL/rSQhbMOMZLb3Wap3UKKj/0w==
+blossom-drive-sdk@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/blossom-drive-sdk/-/blossom-drive-sdk-0.1.1.tgz#7b196548b85bb1141c32ed37dec37e412f5984f1"
+  integrity sha512-p7IaQUvK4j1nDcP4EhVXI5Yeoyfyigq9M44My6rn/98dWMFLEHQGMEbJICwuEDcjwT9VKbHAwxMeoRrgSsDPhg==
   dependencies:
     "@noble/hashes" "^1.4.0"
     "@scure/base" "^1.1.6"
-    blossom-client "^0.4.0"
+    blossom-client-sdk "^0.4.0"
     events "^3.3.0"
     mime "^4.0.1"
     nanoid "^5.0.6"