Merge branch 'master' into fix-rss-itunes-explicit

Author: sktbrd

.github/workflows/node.js.yml

@@ -49,9 +49,8 @@ jobs:
 
       - name: Build
         run: |
-          yarn global add cross-env
           yarn
-          cross-env NODE_ENV=production yarn compile:web
+          yarn cross-env NODE_ENV=production yarn compile:web
         env:
           # UI
           WELCOME_VERSION: 1.0

.gitignore

@@ -41,3 +41,5 @@ package-lock.json
 .env.lbrytv
 analyzeResults*.html
 ecosystem.config.js
+
+.claude/settings.local.json

config.js

@@ -66,6 +66,15 @@ const config = {
   AUTO_FOLLOW_CHANNELS: process.env.AUTO_FOLLOW_CHANNELS,
   UNSYNCED_SETTINGS: process.env.UNSYNCED_SETTINGS,
 
+  // Farcaster Mini Apps / Frames
+  FARCASTER_ACCOUNT_ASSOC_HEADER: process.env.FARCASTER_ACCOUNT_ASSOC_HEADER,
+  FARCASTER_ACCOUNT_ASSOC_PAYLOAD: process.env.FARCASTER_ACCOUNT_ASSOC_PAYLOAD,
+  FARCASTER_ACCOUNT_ASSOC_SIGNATURE: process.env.FARCASTER_ACCOUNT_ASSOC_SIGNATURE,
+  FARCASTER_ICON_URL: process.env.FARCASTER_ICON_URL,
+  FARCASTER_SPLASH_IMAGE_URL: process.env.FARCASTER_SPLASH_IMAGE_URL,
+  FARCASTER_SPLASH_BACKGROUND_COLOR: process.env.FARCASTER_SPLASH_BACKGROUND_COLOR,
+  FARCASTER_HERO_IMAGE_URL: process.env.FARCASTER_HERO_IMAGE_URL,
+
   // ENABLE FEATURES
   ENABLE_COMMENT_REACTIONS: process.env.ENABLE_COMMENT_REACTIONS === 'true',
   ENABLE_FILE_REACTIONS: process.env.ENABLE_FILE_REACTIONS === 'true',
@@ -106,6 +115,8 @@ const config = {
   // FROM COMMAND LINE
   COMMIT_ID: process.env.COMMIT_ID,
   NODE_ENV: process.env.NODE_ENV,
+  // Dev/staged feature gating
+  DYNAMIC_ROUTES_FIRST: process.env.DYNAMIC_ROUTES_FIRST === 'true',
 };
 
 config.SDK_API_PATH = `${config.LBRY_WEB_API}/api/v1`;

flow-typed/Claim.js

@@ -20,6 +20,7 @@ declare type GenericClaim = {
   amount: string, // bid amount at time of tx
   canonical_url: string, // URL with short id, includes channel with short id
   claim_id: string, // unique claim identifier
+  channel_id?: string, // shown if signing channel can't be resolved
   claim_sequence: number, // not being used currently
   claim_op: 'create' | 'update',
   confirmations: number,
@@ -79,6 +80,15 @@ declare type GenericMetadata = {
   languages?: Array<string>,
   tags?: Array<string>,
   locations?: Array<Location>,
+  fee?: Fee,
+  video?: {
+    duration: number,
+    height: number,
+    width: number,
+  },
+  audio?: {
+    duration: number,
+  },
 };
 
 declare type ChannelMetadataKey =

flow-typed/Comment.js

@@ -1,6 +1,38 @@
 declare type CommentBody = string;
 declare type CommentId = string;
 
+declare type UploadTemplateData = {
+  title?: string,
+  description?: string,
+  tags?: Array<{ name: string }>,
+  thumbnail?: string,
+  language?: string,
+  languages?: Array<string>,
+  licenseType?: string,
+  licenseUrl?: string,
+  otherLicenseDescription?: string,
+  nsfw?: boolean,
+  paywall?: string,
+  fee?: { amount: number, currency: string },
+  fiatPurchaseFee?: Price,
+  fiatPurchaseEnabled?: boolean,
+  fiatRentalFee?: Price,
+  fiatRentalExpiration?: Duration,
+  fiatRentalEnabled?: boolean,
+  visibility?: string,
+  memberRestrictionOn?: boolean,
+  memberRestrictionTierIds?: Array<number>,
+};
+
+declare type UploadTemplate = {
+  id: string,
+  name: string,
+  createdAt: number,
+  lastUsedAt?: number,
+  isPinned?: boolean,
+  data: UploadTemplateData,
+};
+
 declare type Comment = {|
   comment: CommentBody,
   comment_id: CommentId, // sha256 digest
@@ -81,6 +113,7 @@ declare type PerChannelSettings = {
   livestream_chat_members_only?: boolean,
   comments_members_only?: boolean,
   homepage_settings?: any,
+  upload_templates?: Array<UploadTemplate>,
   channel_sections?: Sections,
 };
 
@@ -355,6 +388,8 @@ declare type SettingsResponse = {
   filters_enabled?: boolean,
   livestream_chat_members_only?: boolean,
   comments_members_only?: boolean,
+  homepage_settings?: any,
+  upload_templates?: Array<UploadTemplate>,
 };
 
 declare type UpdateSettingsParams = {
@@ -371,6 +406,8 @@ declare type UpdateSettingsParams = {
   time_since_first_comment?: number,
   livestream_chat_members_only?: boolean,
   comments_members_only?: boolean,
+  homepage_settings?: any,
+  upload_templates?: Array<UploadTemplate>,
 };
 
 declare type BlockWordParams = {

flow-typed/Lbry.js

@@ -140,6 +140,10 @@ declare type ClaimSearchOptions = {|
   remove_duplicates?: boolean, // removes duplicated content from search by picking either the original claim or the oldest matching repost
   has_source?: boolean, // find claims containing a source field
   has_no_source?: boolean, // find claims not containing a source field
+  content_aspect_ratio?: string, // limit claims by content aspect ratio
+  exclude_shorts?: boolean,
+  exclude_shorts_duration_lte?: number,
+  exclude_shorts_aspect_ratio_lte?: number,
 |};
 
 declare type ClaimSearchResponse = {

flow-typed/memberships.js

@@ -1,6 +1,5 @@
 declare type MembershipListParams = {
   id?: string,
-  channel_id?: string,
   channel_claim_id: string,
 };
 
@@ -11,29 +10,29 @@ declare type Perk = {
 }
 // -- CreatorMembership: data the creator sees for a given membership
 declare type CreatorMembership = {
-  membership_id: string,
+  membership_id?: number,
   channel_name: string,
-  channel_claim_id: string,
+  channel_claim_id?: string,
   name: string,
   description: string,
-  perks: Array<Perk>,
-  prices: [{id: number, amount: string, currency: string, address: string }],
+  perks: MembershipOdyseePerks,
+  prices: [{id?: number, amount: number, currency: string, address: string }],
   has_subscribers: boolean,
   enabled: boolean,
 }
 
 declare type MembershipSubscribeParams = {
-  subscriber_channel_claim_id: string,
+  subscriber_channel_claim_id?: string,
   price_id: string,
   source_payment_address: string,
 }
 
 declare type MembershipBuyParams = {
-  membershipId: string, // just for redux state
-  tippedChannelName: string,
-  tippedChannelId: string,
-  subscriberChannelId: string,
-  priceId: number,
+  membershipId?: number, // just for redux state
+  tippedChannelName?: string,
+  tippedChannelId?: string,
+  subscriberChannelId?: string,
+  priceId?: number,
 }
 
 declare type SubscriptionPrice = {
@@ -128,6 +127,9 @@ declare type Membership = {
   enabled: boolean,
   channel_claim_id: string,
   first_payment_due_at: string,
+  created_at: string,
+  payments: MembershipPayment[],
+  description: string,
 }
 
 declare type MembershipUpdateResponse = string;
@@ -280,23 +282,23 @@ declare type StripePriceDetails = {
 };
 
 declare type MembershipAddTierParams = {
-  channel_name: string,
+  channel_name?: string,
   channel_id: string,
   name: string,
   description: string,
   currency: string,
   amount: number,
   perks: string, // csv
   frequency: string,
-  payment_address_id: string,
+  payment_address: string,
   enable_members_only_chat?: boolean,
 };
 
 declare type MembershipUpdateTierParams = {
   new_name?: string,
   new_description?: string,
   new_amount?: number,
-  membership_id: number,
+  membership_id?: number,
   enable_members_only_chat?: boolean,
 }
 

flow-typed/publish.js

@@ -77,6 +77,7 @@ declare type PublishState = {|
   thumbnailError: ?boolean,
   description: string,
   language: string,
+  languages?: Array<string>,
   releaseTime: ?number, // The user-entered value, whether valid or not. The UI
                         // can gray out for some scenarios, but value should be
                         // retained for un-graying. @see PAYLOAD.releaseTime()

flow-typed/stripe.js

@@ -1,3 +1,9 @@
+declare type WalletBalance = {
+  ar: number,
+  u: number,
+  usdc: number,
+};
+
 declare type StripeState = {
   accountCheckFetchingIds: ClaimIds,
   canReceiveFiatTipsById: { [id: string]: boolean },
@@ -250,6 +256,8 @@ declare type StripeTransaction = {
   type: StripeTransactionType,
   tipper_channel_claim_id: string,
   tipper_channel_name: string,
+  locked_rate: string,
+  payment_intent_id: string,
 };
 declare type StripeTransactions = Array<StripeTransaction>;