nostr/blowater
1
0
Fork 0
mirror of https://github.com/BlowaterNostr/blowater.git synced 2024-10-18 15:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix import (#272)

Browse Source
This commit is contained in:
BlowaterNostr 2023-11-03 22:09:13 +09:00 committed by GitHub
parent 56c22123ed
commit 790b9638a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DevOps/stats.ts
View File

@ -1,6 +1,6 @@
import { DB } from "https://deno.land/x/sqlite@v3.7.2/mod.ts";
import { NostrKind } from "../lib/nostr-ts/nostr.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
// Open a database
const db = new DB("stats.sqlite");
@ -29,7 +29,7 @@ for (const url of urls) {
}
const r = await pool.newSub("stats", {
kinds: [NostrKind.CustomAppData],
kinds: [NostrKind.Custom_App_Data],
});
if (r instanceof Error) {
throw r;

2
UI/app.tsx
View File

@ -15,7 +15,6 @@ import { AppEventBus, Database_Update, UI_Interaction_Event, UI_Interaction_Upda
import * as time from "../time.ts";
import { PublicKey } from "../lib/nostr-ts/key.ts";
import { NostrAccountContext, NostrEvent, NostrKind } from "../lib/nostr-ts/nostr.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { getCurrentSignInCtx, setSignInState, SignIn } from "./signIn.tsx";
import { AppList } from "./app-list.tsx";
import { SecondaryBackgroundColor } from "./style/colors.ts";
@ -31,6 +30,7 @@ import { OtherConfig } from "./config-other.ts";
import { ProfileGetter } from "./search.tsx";
import { fromEvents } from "../time.ts";
import { DirectedMessageController } from "../features/dm.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
export async function Start(database: DexieDatabase) {
console.log("Start the application");

2
UI/app_update.tsx
View File

@ -38,7 +38,7 @@ import { CreateGroup, CreateGroupChat, StartCreateGroupChat } from "./create-gro
import { prepareNormalNostrEvent } from "../lib/nostr-ts/event.ts";
import { PublicKey } from "../lib/nostr-ts/key.ts";
import { NostrAccountContext, NostrEvent, NostrKind } from "../lib/nostr-ts/nostr.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { OtherConfig } from "./config-other.ts";
import { EditGroup, StartEditGroupChatProfile } from "./edit-group.tsx";
import { GroupMessageController } from "../features/gm.ts";

2
UI/config-other.ts
View File

@ -1,7 +1,7 @@
import * as Automerge from "https://deno.land/x/automerge@2.1.0-alpha.12/index.ts";
import { prepareParameterizedEvent } from "../lib/nostr-ts/event.ts";
import { NostrAccountContext, NostrEvent, NostrKind, verifyEvent } from "../lib/nostr-ts/nostr.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { PinListGetter } from "./conversation-list.tsx";
import * as secp256k1 from "../lib/nostr-ts/vendor/secp256k1.js";
import { parseJSON } from "../features/profile.ts";

2
UI/conversation-list.test.tsx
View File

@ -10,7 +10,7 @@ import { initialModel } from "./app_model.ts";
import { DM_List } from "./conversation-list.ts";
import { NewIndexedDB } from "./dexie-db.ts";
import { ProfileSyncer } from "../features/profile.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { OtherConfig } from "./config-other.ts";
const ctx = InMemoryAccountContext.New(PrivateKey.Generate());

2
UI/dm.test.tsx
View File

@ -7,7 +7,7 @@ import { testEventBus } from "./_setup.test.ts";
import { prepareEncryptedNostrEvent } from "../lib/nostr-ts/event.ts";
import { DM_List } from "./conversation-list.ts";
import { EventSyncer } from "./event_syncer.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { ProfileSyncer } from "../features/profile.ts";
import { handle_SendMessage } from "./app_update.tsx";
import { LamportTime } from "../time.ts";

2
UI/dm.tsx
View File

@ -8,7 +8,7 @@ import { LeftArrowIcon } from "./icons/left-arrow-icon.tsx";
import { CenterClass, IconButtonClass } from "./components/tw.ts";
import { DirectMessageGetter, GroupMessageGetter, UI_Interaction_Event } from "./app_update.tsx";
import { NostrAccountContext, NostrEvent } from "../lib/nostr-ts/nostr.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { ProfileSyncer } from "../features/profile.ts";
import { getFocusedContent } from "./app.tsx";
import { EventSyncer } from "./event_syncer.ts";

4
UI/event_syncer.ts
View File

@ -1,7 +1,5 @@
import { ConnectionPool, SubscriptionAlreadyExist } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { Database_Contextual_View } from "../database.ts";
import { NostrFilters, NostrKind, RelayResponse_REQ_Message, verifyEvent } from "../lib/nostr-ts/nostr.ts";
import { Channel } from "https://raw.githubusercontent.com/BlowaterNostr/csp/master/csp.ts";
import { NoteID } from "../lib/nostr-ts/nip19.ts";
export class EventSyncer {

2
UI/message-panel.test.tsx
View File

@ -8,7 +8,7 @@ import { testEventBus, testEventsAdapter } from "./_setup.test.ts";
import { prepareNormalNostrEvent } from "../lib/nostr-ts/event.ts";
import { DM_List } from "./conversation-list.ts";
import { EventSyncer } from "./event_syncer.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { ProfileSyncer } from "../features/profile.ts";
import { handle_SendMessage } from "./app_update.tsx";
import { LamportTime } from "../time.ts";

2
UI/relay-config.test.ts
View File

@ -1,6 +1,6 @@
import { PrivateKey } from "../lib/nostr-ts/key.ts";
import { InMemoryAccountContext } from "../lib/nostr-ts/nostr.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { RelayConfig } from "./relay-config.ts";
import { assertEquals, assertNotInstanceOf, fail } from "https://deno.land/std@0.176.0/testing/asserts.ts";

3
UI/relay-config.ts
View File

@ -1,9 +1,10 @@
import * as Automerge from "https://deno.land/x/automerge@2.1.0-alpha.12/index.ts";
import { NostrAccountContext, NostrEvent, NostrKind } from "../lib/nostr-ts/nostr.ts";
import * as secp256k1 from "../lib/nostr-ts/vendor/secp256k1.js";
import { ConnectionPool, RelayAlreadyRegistered } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { prepareParameterizedEvent } from "../lib/nostr-ts/event.ts";
import { parseJSON } from "../features/profile.ts";
import { RelayAlreadyRegistered } from "../lib/nostr-ts/relay-single.ts";
export const defaultRelays = [
"wss://relay.blowater.app",

2
UI/setting.test.tsx
View File

@ -1,7 +1,7 @@
/** @jsx h */
import { h, render } from "https://esm.sh/preact@10.17.1";
import { Setting } from "./setting.tsx";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { defaultRelays, RelayConfig } from "./relay-config.ts";
import { InMemoryAccountContext } from "../lib/nostr-ts/nostr.ts";
import { PrivateKey } from "../lib/nostr-ts/key.ts";

2
UI/setting.tsx
View File

@ -25,7 +25,7 @@ import {
import { RelayIcon } from "./icons2/relay-icon.tsx";
import { DeleteIcon } from "./icons2/delete-icon.tsx";
import { RelayConfig } from "./relay-config.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { emitFunc } from "../event-bus.ts";
export interface SettingProps {

2
features/dm.test.ts
View File

@ -4,7 +4,7 @@ import { Database_Contextual_View } from "../database.ts";
import { PrivateKey } from "../lib/nostr-ts/key.ts";
import { InMemoryAccountContext } from "../lib/nostr-ts/nostr.ts";
import { relays } from "../lib/nostr-ts/relay-list.test.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { getAllEncryptedMessagesOf } from "./dm.ts";
const ctx = InMemoryAccountContext.New(

2
features/dm.ts
View File

@ -1,6 +1,6 @@
import * as csp from "https://raw.githubusercontent.com/BlowaterNostr/csp/master/csp.ts";
import { decryptNostrEvent, NostrAccountContext, NostrEvent, NostrKind } from "../lib/nostr-ts/nostr.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { compare, getTags, Parsed_Event, prepareNostrImageEvent, Tag } from "../nostr.ts";
import { PublicKey } from "../lib/nostr-ts/key.ts";
import { prepareEncryptedNostrEvent } from "../lib/nostr-ts/event.ts";

2
features/gm.ts
View File

@ -14,7 +14,7 @@ import {
NostrEvent,
NostrKind,
} from "../lib/nostr-ts/nostr.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
import { getTags, Parsed_Event, Tag } from "../nostr.ts";
import { parseJSON } from "./profile.ts";

2
features/profile.ts
View File

@ -1,10 +1,10 @@
import { Database_Contextual_View } from "../database.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay.ts";
import { NostrAccountContext, NostrKind } from "../lib/nostr-ts/nostr.ts";
import { Parsed_Event, Profile_Nostr_Event } from "../nostr.ts";
import { prepareNormalNostrEvent } from "../lib/nostr-ts/event.ts";
import { semaphore } from "https://raw.githubusercontent.com/BlowaterNostr/csp/master/csp.ts";
import { ProfileAdder } from "./gm.ts";
import { ConnectionPool } from "../lib/nostr-ts/relay-pool.ts";
export class ProfileSyncer implements ProfileAdder {
readonly userSet = new Set<string>();

2
lib/nostr-ts

@ -1 +1 @@
Subproject commit 190ebfd6d426b958e9d387f4d74f8a2786e5408c
Subproject commit 5fa3d231d6f23b977dad70eb02d670afff43eb32