-
- 
+
+
+
+
+
+
+
+
+ ![](\"https://abs.twimg.com/hashflags/Bitcoin_evergreen/Bitcoin_evergreen.png\")
";
+
+ return content
+ .replace(/#bitcoin/i, `#bitcoin${bitcoinImage}`);
+}
\ No newline at end of file
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index d8fee70..61ff85b 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,4 +1,5 @@
+ {#if zappingIt}
+
+
+
+
+ {/if}
+
+
+
+
+
+
+
+
+
+
+
+
+ (hover = true)}
+ on:mouseleave={() => (hover = false)}
+ on:click|preventDefault={zap}
+>
+ {#if !hover}
+ {icon}
+ {:else}
+
+ {amountDisplay||amount}
+
+ {/if}
+
\ No newline at end of file
diff --git a/src/lib/adapters/index.js b/src/lib/adapters/index.js
index 53f6001..db37f74 100644
--- a/src/lib/adapters/index.js
+++ b/src/lib/adapters/index.js
@@ -5,6 +5,7 @@ import { createEventDispatcher } from 'svelte';
import EventEmitter from 'events';
import * as uuid from 'uuid';
import debug from 'debug';
+import { NDKEvent, zapInvoiceFromEvent } from 'nostr-dev-kit';
const log = new debug('nostr:adapter');
const profilesLog = new debug('nostr:adapter:profiles');
@@ -174,10 +175,27 @@ class NstrAdapter {
if (!this.#delayedSubscriptionTimeouts[family]) {
this.#delayedSubscriptionTimeouts[family] = setTimeout(() => {
delete this.#delayedSubscriptionTimeouts[family];
- filters = this.#delayedSubscriptions[family];
+
+ // if there are more than 10 filters then we need to split them up
+ // into multiple subscriptions
+ let filters = this.#delayedSubscriptions[family];
delete this.#delayedSubscriptions[family];
- this.subscribe(filters, (e) => { this.#emitMessage(e)});
+ // split filters into groups of 10
+ let groups = [];
+ groups = filters.reduce((groups, filter, index) => {
+ if (index % 10 === 0) {
+ groups.push([]);
+ }
+ groups[groups.length - 1].push(filter);
+ return groups;
+ }, groups);
+
+ console.log(`turned ${filters.length} filters into ${groups.length} groups`);
+
+ groups.forEach((filters) => {
+ this.subscribe(filters, (e) => { this.#emitMessage(e)});
+ });
}, timeout)
}
}
@@ -191,6 +209,9 @@ class NstrAdapter {
const subId = uuid.v4();
this.#handlers[subId] = messageCallback;
if (!Array.isArray(filters)) { filters = [filters] }
+
+
+
this.#pool.subscribe(subId, filters);
this.#pool.on('event', (relay, recSubId, e) => {
this.onEvent(e, this.#handlers[recSubId])
@@ -212,23 +233,24 @@ class NstrAdapter {
event.content = await this.decrypt(this.#websiteOwnerPubkey, event.content);
}
- if (event.kind === 1) {
- if (!event.tags.find(t => t[0] === 'e')) {
- // a top level message that we should subscribe to since responses won't tag the url
- this.subscribe({ kinds: [1], '#e': [event.id] })
- }
- }
-
let deletedEvents = []
if (event.kind === 5) {
deletedEvents = event.tags.filter(tag => tag[0] === 'e').map(tag => tag[1]);
}
+ let zap;
+ if (event.kind === 9735) {
+ const ndkEvent = new NDKEvent(null, event);
+ zap = zapInvoiceFromEvent(ndkEvent);
+ console.log(`received a zap invoice: ${zap}`, event);
+ }
+
switch (event.kind) {
case 1: this.#eventEmitter.emit('message', event); break;
case 4: this.#eventEmitter.emit('message', event); break;
case 5: this.#eventEmitter.emit('deleted', deletedEvents); break;
case 7: this.#eventEmitter.emit('reaction', event); break;
+ case 9735: this.#eventEmitter.emit('zap', zap); break;
default:
// alert('unknown event kind ' + event.kind)
console.log('unknown event kind', event.kind, event);
diff --git a/src/lib/store.js b/src/lib/store.js
index 740428b..3de0de0 100644
--- a/src/lib/store.js
+++ b/src/lib/store.js
@@ -2,4 +2,6 @@ import { writable } from 'svelte/store';
export const chatAdapter = writable(null);
export const chatData = writable({ events: [], profiles: {}});
-export const selectedMessage = writable(null);
\ No newline at end of file
+export const selectedMessage = writable(null);
+export const zappingMessage = writable(null);
+export const zapsPerMessage = writable({});
\ No newline at end of file
diff --git a/src/lib/utils.js b/src/lib/utils.js
new file mode 100644
index 0000000..144ecdd
--- /dev/null
+++ b/src/lib/utils.js
@@ -0,0 +1,6 @@
+export function prettifyContent(content) {
+ const bitcoinImage = "";
+
+ return content
+ .replace(/#bitcoin/i, `#bitcoin${bitcoinImage}`);
+}
\ No newline at end of file
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index d8fee70..61ff85b 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,4 +1,5 @@