chore: merge main into feat/nip-50-search

cameri · cameri · Jul 5, 2026 · Apr 26, 2026 · Apr 29, 2026 · Apr 29, 2026
commit ba853ccb00fe32656c248ef8ca214d5ceeb718a0
diff --git a/src/repositories/event-repository.ts b/src/repositories/event-repository.ts
@@ -281,99 +281,6 @@ export class EventRepository implements IEventRepository {
     })
   }
 
-  private applyHexFilterConditions(builder: any, currentFilter: SubscriptionFilter): void {
-    builder.andWhere((bd) => {
-      this.applyHexCriteria(bd, ['event_pubkey'], currentFilter.authors)
-    })
-
-    builder.andWhere((bd) => {
-      this.applyHexCriteria(bd, ['event_id'], currentFilter.ids)
-    })
-  }
-
-  private applyHexCriteria(builder: any, tableFields: string[], criteria?: string[]): void {
-    if (typeof criteria === 'undefined') {
-      return
-    }
-
-    if (!criteria.length) {
-      builder.whereRaw('1 = 0')
-      return
-    }
-
-    const groups = this.groupHexCriteria(criteria)
-
-    tableFields.forEach((tableField) => {
-      if (groups.exact.length) {
-        builder.orWhereIn(tableField, groups.exact.map(toBuffer))
-      }
-
-      groups.even.forEach((prefix) => {
-        builder.orWhereRaw(`substring("${tableField}" from 1 for ?) = ?`, [prefix.length >> 1, toBuffer(prefix)])
-      })
-
-      groups.odd.forEach((prefix) => {
-        builder.orWhereRaw(`substring("${tableField}" from 1 for ?) BETWEEN ? AND ?`, [
-          (prefix.length >> 1) + 1,
-          `\\x${prefix}0`,
-          `\\x${prefix}f`,
-        ])
-      })
-    })
-  }
-
-  private groupHexCriteria(criteria: string[]): HexCriterionGroups {
-    return criteria.reduce<HexCriterionGroups>(
-      (groups, criterion) => {
-        if (criterion.length === 64) {
-          groups.exact.push(criterion)
-        } else if (criterion.length % 2 === 0) {
-          groups.even.push(criterion)
-        } else {
-          groups.odd.push(criterion)
-        }
-
-        return groups
-      },
-      {
-        exact: [],
-        even: [],
-        odd: [],
-      },
-    )
-  }
-
-  private applyGenericTagFilterConditions(builder: any, currentFilter: SubscriptionFilter): boolean {
-    const tagFilters = Object.entries(currentFilter).filter(([filterName]) => isGenericTagQuery(filterName))
-
-    tagFilters.forEach(([filterName, criteria]) => {
-      this.applyGenericTagCriteria(builder, filterName, criteria as string[])
-    })
-
-    return tagFilters.length > 0
-  }
-
-  private applyGenericTagCriteria(builder: any, filterName: string, criteria: string[]): void {
-    builder.andWhere((bd) => {
-      if (!criteria.length) {
-        bd.andWhereRaw('1 = 0')
-        return
-      }
-
-      criteria.forEach((criterion) => {
-        if (isGeohashPrefixCriterion(filterName, criterion)) {
-          bd.orWhereRaw('event_tags.tag_name = ? AND event_tags.tag_value LIKE ?', [
-            filterName[1],
-            `${stripGeohashPrefixWildcard(criterion)}%`,
-          ])
-          return
-        }
-
-        bd.orWhereRaw('event_tags.tag_name = ? AND event_tags.tag_value = ?', [filterName[1], criterion])
-      })
-    })
-  }
-
   public async create(event: Event): Promise<number> {
     return this.insert(event).then(prop('rowCount') as () => number, () => 0)
   }

diff --git a/src/routes/callbacks/index.ts b/src/routes/callbacks/index.ts
@@ -35,4 +35,3 @@ router
   )
 
 export default router
-
diff --git a/test/unit/schemas/filter-schema.spec.ts b/test/unit/schemas/filter-schema.spec.ts
@@ -230,47 +230,3 @@ describe('NIP-12', () => {
     })
   })
 })
-
-describe('NIP-12', () => {
-  describe('#g filter validation', () => {
-    it('accepts a valid base32 geohash', () => {
-      const result = validateSchema(filterSchema)({ '#g': ['u4pruydqqvj'] })
-      expect(result.error).to.be.undefined
-    })
-
-    it('accepts a valid geohash prefix with trailing wildcard', () => {
-      const result = validateSchema(filterSchema)({ '#g': ['u4pruyd*'] })
-      expect(result.error).to.be.undefined
-    })
-
-    it('rejects an empty criterion', () => {
-      const result = validateSchema(filterSchema)({ '#g': [''] })
-      expect(result.error).to.not.be.undefined
-    })
-
-    it('rejects a bare wildcard', () => {
-      const result = validateSchema(filterSchema)({ '#g': ['*'] })
-      expect(result.error).to.not.be.undefined
-    })
-
-    it('rejects non-base32 characters', () => {
-      const result = validateSchema(filterSchema)({ '#g': ['u4pruyda'] })
-      expect(result.error).to.not.be.undefined
-    })
-
-    it('rejects uppercase characters', () => {
-      const result = validateSchema(filterSchema)({ '#g': ['U4PRUYDQQVJ'] })
-      expect(result.error).to.not.be.undefined
-    })
-
-    it('rejects wildcard not at the end', () => {
-      const result = validateSchema(filterSchema)({ '#g': ['u4*pruyd'] })
-      expect(result.error).to.not.be.undefined
-    })
-
-    it('rejects multiple wildcards', () => {
-      const result = validateSchema(filterSchema)({ '#g': ['u4pruyd**'] })
-      expect(result.error).to.not.be.undefined
-    })
-  })
-})