@snort/system - npm Package Compare versions

Comparing version 1.1.1 to 1.1.2

dist/zaps.d.ts

@@ -1,6 +0,4 @@
-import { FeedCache } from "@snort/shared";
 import { NostrEvent } from "./nostr";
-import { MetadataCache } from "./cache";
 import { NostrLink } from "./nostr-link";
-export declare function parseZap(zapReceipt: NostrEvent, userCache: FeedCache<MetadataCache>, refNote?: NostrEvent): ParsedZap;
+export declare function parseZap(zapReceipt: NostrEvent): ParsedZap;
 export interface ParsedZap {
@@ -7,0 +5,0 @@ id: string;

dist/zaps.js

@@ -21,3 +21,3 @@ "use strict";
 }
-function parseZap(zapReceipt, userCache, refNote) {
+function parseZap(zapReceipt) {
     const existing = ParsedZapCache.get(zapReceipt.id);
@@ -41,3 +41,2 @@ if (existing) {
             const requestContext = zapRequestThread?.root;
-            const isForwardedZap = refNote?.tags.some(a => a[0] === "zap") ?? false;
             const anonZap = zapRequest.tags.find(a => a[0] === "anon");
@@ -66,6 +65,2 @@ const pollOpt = zapRequest.tags.find(a => a[0] === "poll_option")?.[1];
             }
-            /*if (userCache.getFromCache(ret.receiver)?.zapService !== ret.zapService && !isForwardedZap) {
-              ret.valid = false;
-              ret.errors.push("zap service pubkey doesn't match");
-            }*/
             if (!ret.valid) {
@@ -95,2 +90,2 @@ Log("Invalid zap %O", ret);
 exports.parseZap = parseZap;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiemFwcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy96YXBzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUNBLDBDQUE4RDtBQUU5RCxtQ0FBa0M7QUFFbEMsMkNBQXVDO0FBQ3ZDLDZDQUF5QztBQUN6QyxrREFBMEI7QUFFMUIsTUFBTSxHQUFHLEdBQUcsSUFBQSxlQUFLLEVBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUIsTUFBTSxjQUFjLEdBQUcsSUFBSSxHQUFHLEVBQXFCLENBQUM7QUFFcEQsU0FBUyxVQUFVLENBQUMsR0FBZTtJQUNqQyxNQUFNLE1BQU0sR0FBRyxJQUFBLGVBQU8sRUFBQyxHQUFHLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDdEMsSUFBSSxDQUFDLE1BQU0sRUFBRTtRQUNYLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQWlDLENBQUMsQ0FBQztLQUNwRDtJQUNELE9BQU8sSUFBQSxzQkFBYSxFQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQy9CLENBQUM7QUFFRCxTQUFnQixRQUFRLENBQUMsVUFBc0IsRUFBRSxTQUFtQyxFQUFFLE9BQW9CO0lBQ3hHLE1BQU0sUUFBUSxHQUFHLGNBQWMsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQ25ELElBQUksUUFBUSxFQUFFO1FBQ1osT0FBTyxRQUFRLENBQUM7S0FDakI7SUFFRCxJQUFJLFlBQVksR0FBRyxJQUFBLGVBQU8sRUFBQyxVQUFVLEVBQUUsYUFBYSxDQUFDLENBQUM7SUFDdEQsSUFBSSxZQUFZLEVBQUU7UUFDaEIsSUFBSTtZQUNGLE1BQU0sT0FBTyxHQUFHLFVBQVUsQ0FBQyxVQUFVLENBQUMsQ0FBQztZQUN2QyxJQUFJLFlBQVksQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLEVBQUU7Z0JBQ2hDLFlBQVksR0FBRyxrQkFBa0IsQ0FBQyxZQUFZLENBQUMsQ0FBQzthQUNqRDtZQUNELE1BQU0sVUFBVSxHQUFlLElBQUksQ0FBQyxL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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiemFwcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy96YXBzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBLDBDQUE4RDtBQUU5RCxtQ0FBa0M7QUFDbEMsMkNBQXVDO0FBQ3ZDLDZDQUF5QztBQUN6QyxrREFBMEI7QUFFMUIsTUFBTSxHQUFHLEdBQUcsSUFBQSxlQUFLLEVBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUIsTUFBTSxjQUFjLEdBQUcsSUFBSSxHQUFHLEVBQXFCLENBQUM7QUFFcEQsU0FBUyxVQUFVLENBQUMsR0FBZTtJQUNqQyxNQUFNLE1BQU0sR0FBRyxJQUFBLGVBQU8sRUFBQyxHQUFHLEVBQUUsUUFBUSxDQUFDLENBQUM7SUFDdEMsSUFBSSxDQUFDLE1BQU0sRUFBRTtRQUNYLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQWlDLENBQUMsQ0FBQztLQUNwRDtJQUNELE9BQU8sSUFBQSxzQkFBYSxFQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQy9CLENBQUM7QUFFRCxTQUFnQixRQUFRLENBQUMsVUFBc0I7SUFDN0MsTUFBTSxRQUFRLEdBQUcsY0FBYyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDbkQsSUFBSSxRQUFRLEVBQUU7UUFDWixPQUFPLFFBQVEsQ0FBQztLQUNqQjtJQUVELElBQUksWUFBWSxHQUFHLElBQUEsZUFBTyxFQUFDLFVBQVUsRUFBRSxhQUFhLENBQUMsQ0FBQztJQUN0RCxJQUFJLFlBQVksRUFBRTtRQUNoQixJQUFJO1lBQ0YsTUFBTSxPQUFPLEdBQUcsVUFBVSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQ3ZDLElBQUksWUFBWSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsRUFBRTtnQkFDaEMsWUFBWSxHQUFHLGtCQUFrQixDQUFDLFlBQVksQ0FBQyxDQUFDO2FBQ2pEO1lBQ0QsTUFBTSxVQUFVLEdBQWUsSUFBSSxDQUFDLEtBQUssQ0FBQyxZQUFZLENBQUMsQ0FB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

package.json

 {
   "name": "@snort/system",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Snort nostr system package",
@@ -5,0 +5,0 @@ "main": "dist/index.js",

src/zaps.ts

@@ -1,6 +0,4 @@
-import { FeedCache } from "@snort/shared";
 import { decodeInvoice, InvoiceDetails } from "@snort/shared";
 import { NostrEvent } from "./nostr";
 import { findTag } from "./utils";
-import { MetadataCache } from "./cache";
 import { EventExt } from "./event-ext";
@@ -21,3 +19,3 @@ import { NostrLink } from "./nostr-link";
 
-export function parseZap(zapReceipt: NostrEvent, userCache: FeedCache<MetadataCache>, refNote?: NostrEvent): ParsedZap {
+export function parseZap(zapReceipt: NostrEvent): ParsedZap {
   const existing = ParsedZapCache.get(zapReceipt.id);
@@ -43,3 +41,2 @@ if (existing) {
 
-      const isForwardedZap = refNote?.tags.some(a => a[0] === "zap") ?? false;
       const anonZap = zapRequest.tags.find(a => a[0] === "anon");
@@ -68,7 +65,2 @@ const pollOpt = zapRequest.tags.find(a => a[0] === "poll_option")?.[1];
       }
-      /*if (userCache.getFromCache(ret.receiver)?.zapService !== ret.zapService && !isForwardedZap) {
-        ret.valid = false;
-        ret.errors.push("zap service pubkey doesn't match");
-      }*/
-
       if (!ret.valid) {
@@ -75,0 +67,0 @@ Log("Invalid zap %O", ret);

No alert changes

Worsened metrics

Total package byte prevSize

584797

decreased by-0.21%

Lines of code

10996

decreased by-0.13%

No dependency changes