coracle/welshman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add CreatedAt and Search feeds, combine date feeds into one type, fix Tags.replies, fix sort order of relay selections

Browse Source
This commit is contained in:
Jon Staab
2024-05-02 09:45:49 -07:00
parent fefcd1b042
commit a343f74241
4 changed files with 82 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/feeds/core.ts
+42 -21
View File
@@ -3,6 +3,7 @@ import type {Filter} from '@welshman/util'
export enum FeedType {
Address = "address",
Author = "author",
CreatedAt = "created_at",
DVM = "dvm",
Difference = "difference",
ID = "id",
@@ -12,13 +13,10 @@ export enum FeedType {
WOT = "wot",
Relay = "relay",
Scope = "scope",
Since = "since",
SinceAgo = "since_ago",
Search = "search",
SymmetricDifference = "symmetric_difference",
Tag = "tag",
Union = "union",
Until = "until",
UntilAgo = "until_ago",
}
export enum Scope {
@@ -55,8 +53,15 @@ export type WOTItem = {
max?: number,
}
export type CreatedAtItem = {
since?: number,
until?: number,
relative?: boolean,
}
export type AddressFeed = [type: FeedType.Address, ...addresses: string[]]
export type AuthorFeed = [type: FeedType.Author, ...pubkeys: string[]]
export type CreatedAtFeed = [type: FeedType.CreatedAt, ...items: CreatedAtItem[]]
export type DVMFeed = [type: FeedType.DVM, ...items: DVMItem[]]
export type DifferenceFeed = [type: FeedType.Difference, ...feeds: Feed[]]
export type IDFeed = [type: FeedType.ID, ...ids: string[]]
@@ -66,17 +71,15 @@ export type ListFeed = [type: FeedType.List, ...items: ListItem[]]
export type WOTFeed = [type: FeedType.WOT, ...items: WOTItem[]]
export type RelayFeed = [type: FeedType.Relay, ...urls: string[]]
export type ScopeFeed = [type: FeedType.Scope, ...scopes: Scope[]]
export type SinceAgoFeed = [type: FeedType.SinceAgo, since_ago: number]
export type SinceFeed = [type: FeedType.Since, since: number]
export type SearchFeed = [type: FeedType.Search, ...searches: string[]]
export type SymmetricDifferenceFeed = [type: FeedType.SymmetricDifference, ...feeds: Feed[]]
export type TagFeed = [type: FeedType.Tag, key: string, ...values: string[]]
export type UnionFeed = [type: FeedType.Union, ...feeds: Feed[]]
export type UntilAgoFeed = [type: FeedType.UntilAgo, until_ago: number]
export type UntilFeed = [type: FeedType.Until, until: number]
export type Feed =
AddressFeed |
AuthorFeed |
CreatedAtFeed |
DVMFeed |
DifferenceFeed |
IDFeed |
@@ -86,16 +89,14 @@ export type Feed =
WOTFeed |
RelayFeed |
ScopeFeed |
SinceAgoFeed |
SinceFeed |
SearchFeed |
SymmetricDifferenceFeed |
TagFeed |
UnionFeed |
UntilAgoFeed |
UntilFeed
UnionFeed
export const addressFeed = (...addresses: string[]): AddressFeed => [FeedType.Address, ...addresses]
export const authorFeed = (...pubkeys: string[]): AuthorFeed => [FeedType.Author, ...pubkeys]
export const createdAtFeed = (...items: CreatedAtItem[]): CreatedAtFeed => [FeedType.CreatedAt, ...items]
export const dvmFeed = (...items: DVMItem[]): DVMFeed => [FeedType.DVM, ...items]
export const differenceFeed = (...feeds: Feed[]): DifferenceFeed => [FeedType.Difference, ...feeds]
export const idFeed = (...ids: string[]): IDFeed => [FeedType.ID, ...ids]
@@ -105,23 +106,26 @@ export const listFeed = (...items: ListItem[]): ListFeed => [FeedType.List, ...i
export const wotFeed = (...items: WOTItem[]): WOTFeed => [FeedType.WOT, ...items]
export const relayFeed = (...urls: string[]): RelayFeed => [FeedType.Relay, ...urls]
export const scopeFeed = (...scopes: Scope[]): ScopeFeed => [FeedType.Scope, ...scopes]
export const sinceAgoFeed = (since_ago: number): SinceAgoFeed => [FeedType.SinceAgo, since_ago]
export const sinceFeed = (since: number): SinceFeed => [FeedType.Since, since]
export const searchFeed = (...searches: string[]): SearchFeed => [FeedType.Search, ...searches]
export const symmetricDifferenceFeed = (...feeds: Feed[]): SymmetricDifferenceFeed => [FeedType.SymmetricDifference, ...feeds]
export const tagFeed = (key: string, ...values: string[]): TagFeed => [FeedType.Tag, key, ...values]
export const unionFeed = (...feeds: Feed[]): UnionFeed => [FeedType.Union, ...feeds]
export const untilAgoFeed = (until_ago: number): UntilAgoFeed => [FeedType.UntilAgo, until_ago]
export const untilFeed = (until: number): UntilFeed => [FeedType.Until, until]
export const feedsFromFilter = (filter: Filter) => {
export const feedsFromFilter = ({since, until, ...filter}: Filter) => {
const feeds = []
if (since && until) {
feeds.push(createdAtFeed({since, until}))
} else if (since) {
feeds.push(createdAtFeed({since}))
} else if (until) {
feeds.push(createdAtFeed({until}))
}
for (const [k, v] of Object.entries(filter)) {
if (k === 'ids') feeds.push(idFeed(...v as string[]))
else if (k === 'kinds') feeds.push(kindFeed(...v as number[]))
else if (k === 'authors') feeds.push(authorFeed(...v as string[]))
else if (k === 'since') feeds.push(sinceFeed(v as number))
else if (k === 'until') feeds.push(untilFeed(v as number))
else if (k.startsWith('#')) feeds.push(tagFeed(k as string, ...v as string[]))
else throw new Error(`Unable to create feed from filter ${k}: ${v}`)
}
@@ -131,7 +135,24 @@ export const feedsFromFilter = (filter: Filter) => {
export const feedFromFilter = (filter: Filter) => intersectionFeed(...feedsFromFilter(filter))
export const hasSubFeeds = ([type]: [FeedType]) =>
export const isAddressFeed = (feed: Feed) => feed[0] === FeedType.Address
export const isAuthorFeed = (feed: Feed) => feed[0] === FeedType.Author
export const isCreatedAtFeed = (feed: Feed) => feed[0] === FeedType.CreatedAt
export const isDvmFeed = (feed: Feed) => feed[0] === FeedType.DVM
export const isDifferenceFeed = (feed: Feed) => feed[0] === FeedType.Difference
export const isIdFeed = (feed: Feed) => feed[0] === FeedType.ID
export const isIntersectionFeed = (feed: Feed) => feed[0] === FeedType.Intersection
export const isKindFeed = (feed: Feed) => feed[0] === FeedType.Kind
export const isListFeed = (feed: Feed) => feed[0] === FeedType.List
export const isWotFeed = (feed: Feed) => feed[0] === FeedType.WOT
export const isRelayFeed = (feed: Feed) => feed[0] === FeedType.Relay
export const isScopeFeed = (feed: Feed) => feed[0] === FeedType.Scope
export const isSearchFeed = (feed: Feed) => feed[0] === FeedType.Search
export const isSymmetricDifferenceFeed = (feed: Feed) => feed[0] === FeedType.SymmetricDifference
export const isTagFeed = (feed: Feed) => feed[0] === FeedType.Tag
export const isUnionFeed = (feed: Feed) => feed[0] === FeedType.Union
export const hasSubFeeds = ([type]: [FeedType, ...any[]]) =>
[
FeedType.Union,
FeedType.Intersection,