diff --git a/.flowconfig b/.flowconfig index 2c6b8839f..9e73c0bd0 100644 --- a/.flowconfig +++ b/.flowconfig @@ -41,14 +41,5 @@ module.name_mapper='^web\/component\(.*\)$' -> '/web/component\1' module.name_mapper='^web\/effects\(.*\)$' -> '/web/effects\1' module.name_mapper='^web\/page\(.*\)$' -> '/web/page\1' module.name_mapper='^homepage\(.*\)$' -> '/ui/util/homepage\1' -module.name_mapper='^scss\/component\(.*\)$' -> '/ui/scss/component/\1' - -; Extensions -module.file_ext=.js -module.file_ext=.jsx -module.file_ext=.json -module.file_ext=.css -module.file_ext=.scss - [strict] diff --git a/CHANGELOG.md b/CHANGELOG.md index 39f6715a5..2ebd737be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Added "Shuffle" option on Lists ([#6921](https://github.com/lbryio/lbry-desktop/pull/6921)) - Added Play Next/Previous buttons (with shortcuts SHIFT+N/SHIFT+P) ([#6921](https://github.com/lbryio/lbry-desktop/pull/6921)) - Added separate control for autoplay next on video player ([#6921](https://github.com/lbryio/lbry-desktop/pull/6921)) -- Added Channel Mention selection ability while creating a comment ([#7151](https://github.com/lbryio/lbry-desktop/pull/7151)) ### Changed - Changing the supported language from Filipino to Tagalog _community pr!_ ([#6951](https://github.com/lbryio/lbry-desktop/pull/6951)) @@ -23,9 +22,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Clicking on the title of a floating player will take you back to the list ([#6921](https://github.com/lbryio/lbry-desktop/pull/6921)) - Fix floating player stopping on markdown or image files ([#7073](https://github.com/lbryio/lbry-desktop/pull/7073)) - Fix list thumbnail upload ([#7074](https://github.com/lbryio/lbry-desktop/pull/7074)) -- Stream Key is now hidden _community pr!_ ([#7127](https://github.com/lbryio/lbry-desktop/pull/7127)) -- Fix playlist preview thumbnail ([#7178](https://github.com/lbryio/lbry-desktop/pull/7178) -- Fixed “Your Account” popup on mobile ([#7172](https://github.com/lbryio/lbry-desktop/pull/7172)) ## [0.51.2] - [2021-08-20] diff --git a/flow-typed/Comment.js b/flow-typed/Comment.js index 57a666683..f62993f9e 100644 --- a/flow-typed/Comment.js +++ b/flow-typed/Comment.js @@ -43,7 +43,6 @@ declare type CommentsState = { linkedCommentAncestors: { [string]: Array }, // {"linkedCommentId": ["parentId", "grandParentId", ...]} pinnedCommentsById: {}, // ClaimId -> array of pinned comment IDs isLoading: boolean, - isLoadingById: boolean, isLoadingByParentId: { [string]: boolean }, myComments: ?Set, isFetchingReacts: boolean, @@ -111,14 +110,14 @@ declare type ReactionListResponse = { declare type CommentListParams = { page: number, // pagination: which page of results page_size: number, // pagination: nr of comments to show in a page (max 200) - claim_id?: string, // claim id of claim being commented on + claim_id: string, // claim id of claim being commented on channel_name?: string, // signing channel name of claim (enables 'commentsEnabled' check) channel_id?: string, // signing channel claim id of claim (enables 'commentsEnabled' check) author_claim_id?: string, // filters comments to just this author parent_id?: string, // filters comments to those under this thread top_level?: boolean, // filters to only top level comments hidden?: boolean, // if true, will show hidden comments as well - sort_by?: number, // @see: ui/constants/comments.js::SORT_BY + sort_by?: number, // NEWEST=0, OLDEST=1, CONTROVERSY=2, POPULARITY=3, }; declare type CommentListResponse = { diff --git a/flow-typed/livestream.js b/flow-typed/livestream.js index 9bee62676..40ed13f19 100644 --- a/flow-typed/livestream.js +++ b/flow-typed/livestream.js @@ -24,18 +24,4 @@ declare type LivestreamReplayData = Array; declare type LivestreamState = { fetchingById: {}, viewersById: {}, - fetchingActiveLivestreams: boolean, - activeLivestreams: ?LivestreamInfo, - activeLivestreamsLastFetchedDate: number, - activeLivestreamsLastFetchedOptions: {}, -} - -declare type LivestreamInfo = { - [/* creatorId */ string]: { - live: boolean, - viewCount: number, - creatorId: string, - latestClaimId: string, - latestClaimUri: string, - } } diff --git a/package.json b/package.json index f1545afa3..03ec42389 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "build": "cross-env NODE_ENV=production yarn compile:electron && electron-builder build", "build:dir": "yarn build -- --dir -c.compression=store -c.mac.identity=null", "crossenv": "./node_modules/cross-env/dist/bin/cross-env", - "flow": "flow", "lint": "eslint 'ui/**/*.{js,jsx}' && eslint 'web/**/*.{js,jsx}' && eslint 'electron/**/*.js' && flow", "lint-fix": "eslint --fix --quiet 'ui/**/*.{js,jsx}' && eslint --fix --quiet 'web/**/*.{js,jsx}' && eslint --fix --quiet 'electron/**/*.js'", "format": "prettier 'src/**/*.{js,jsx,scss,json}' --write", diff --git a/static/app-strings.json b/static/app-strings.json index 5baa9217f..e1abc146d 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -51,6 +51,7 @@ "Description of your content": "Description of your content", "Price": "Price", "Free": "Free", + "Learn more": "Learn more", "Name": "Name", "Deposit": "Deposit", "Language": "Language", @@ -102,6 +103,7 @@ "Enter a URL for your thumbnail.": "Enter a URL for your thumbnail.", "Thumbnail Preview": "Thumbnail Preview", "Use thumbnail upload tool": "Use thumbnail upload tool", + "Thumbnails that entice a viewer to watch a video work best": "Thumbnails that entice a viewer to watch a video work best", "Create a URL for this content. Simpler names are easier to find and remember.": "Create a URL for this content. Simpler names are easier to find and remember.", "Open file": "Open file", "Delete": "Delete", @@ -173,6 +175,7 @@ "Continue": "Continue", "This file has been shared with you by other people.": "This file has been shared with you by other people.", "LBRY Inc is not responsible for its content, click continue to proceed at your own risk.": "LBRY Inc is not responsible for its content, click continue to proceed at your own risk.", + "Find what you were looking for?": "Find what you were looking for?", "Yes": "Yes", "No": "No", "These search results are provided by LBRY, Inc.": "These search results are provided by LBRY, Inc.", @@ -204,14 +207,8 @@ "View": "View", "Edit": "Edit", "Copied": "Copied", - "Copied stream key.": "Copied stream key.", - "Copied stream server URL.": "Copied stream server URL.", - "Failed to copy.": "Failed to copy.", "The publisher has chosen to charge %lbc% to view this content. Your balance is currently too low to view it. Check out %reward_link% for free %lbc% or send more %lbc% to your wallet. You can also %buy_link% more %lbc%.": "The publisher has chosen to charge %lbc% to view this content. Your balance is currently too low to view it. Check out %reward_link% for free %lbc% or send more %lbc% to your wallet. You can also %buy_link% more %lbc%.", "Connecting...": "Connecting...", - "Your comments": "Your comments", - "View your past comments.": "View your past comments.", - "Content or channel was deleted.": "Content or channel was deleted.", "Comments": "Comments", "Comment": "Comment", "Comment --[button to submit something]--": "Comment", @@ -317,8 +314,6 @@ "Confirm Thumbnail Upload": "Confirm Thumbnail Upload", "Upload": "Upload", "upload": "upload", - "Your uploads": "Your uploads", - "Invalid thumbnail": "Invalid thumbnail", "Uploading thumbnail": "Uploading thumbnail", "Please wait for thumbnail to finish uploading": "Please wait for thumbnail to finish uploading", "A thumbnail is required. Please upload or provide an image URL above.": "A thumbnail is required. Please upload or provide an image URL above.", @@ -543,7 +538,6 @@ "Create a new account or sign in.": "Create a new account or sign in.", "Terms of Service": "Terms of Service", "Learn More": "Learn More", - "Learn more": "Learn more", "Community": "Community", "Resources": "Resources", "Policies": "Policies", @@ -786,7 +780,6 @@ "There was an error reposting this claim. Please try again later.": "There was an error reposting this claim. Please try again later.", "Claim ID": "Claim ID", "Official YouTube Creator": "Official YouTube Creator", - "YouTube Sync": "YouTube Sync", "Last checked %time_ago%": "Last checked %time_ago%", "Install Now": "Install Now", "Invite Link": "Invite Link", @@ -1404,8 +1397,8 @@ "Gaming": "Gaming", "Game": "Game", "Nice People": "Nice People", - "Lab": "Lab", "Tech": "Tech", + "Lab": "Lab", "Technology": "Technology", "Movies": "Movies", "News": "News", @@ -1463,7 +1456,6 @@ "Staked LBRY Credits": "Staked LBRY Credits", "1 comment": "1 comment", "%total_comments% comments": "%total_comments% comments", - "No comments": "No comments", "Upvote": "Upvote", "Downvote": "Downvote", "You loved this": "You loved this", @@ -1760,8 +1752,12 @@ "Moderator": "Moderator", "Global Unblock Channel": "Global Unblock Channel", "Global Block Channel": "Global Block Channel", - "Block this channel on behalf of %creator%.": "Block this channel on behalf of %creator%.", - "Block this channel on behalf of the creator.": "Block this channel on behalf of the creator.", + "Moderator tools": "Moderator tools", + "Global Block": "Global Block", + "Block this channel as global admin": "Block this channel as global admin", + "Moderator Block": "Moderator Block", + "Block this channel on behalf of %creator%": "Block this channel on behalf of %creator%", + "creator": "creator", "Enter the timeout duration. Examples: %examples%": "Enter the timeout duration. Examples: %examples%", "Wow, banned for more than 100 years?": "Wow, banned for more than 100 years?", "Invalid duration.": "Invalid duration.", @@ -1779,15 +1775,12 @@ "Moderators": "Moderators", "Moderators can block channels on your behalf. Blocked channels will appear in your \"Blocked and Muted\" list.": "Moderators can block channels on your behalf. Blocked channels will appear in your \"Blocked and Muted\" list.", "Add as moderator": "Add as moderator", - "Assign this user to moderate %channel%.": "Assign this user to moderate %channel%.", - "Assign this user to moderate your channel.": "Assign this user to moderate your channel.", + "Assign this user to moderate %channel%": "Assign this user to moderate %channel%", "Mute (m)": "Mute (m)", "Playback Rate (<, >)": "Playback Rate (<, >)", "Fullscreen (f)": "Fullscreen (f)", "Pause (space)": "Pause (space)", "Play (space)": "Play (space)", - "Play Next (SHIFT+N)": "Play Next (SHIFT+N)", - "Play Previous (SHIFT+P)": "Play Previous (SHIFT+P)", "Unmute (m)": "Unmute (m)", "Exit Fullscreen (f)": "Exit Fullscreen (f)", "Theater Mode (t)": "Theater Mode (t)", @@ -2115,7 +2108,6 @@ "Manage Card": "Manage Card", "Card Details": "Card Details", "Remove Card": "Remove Card", - "Sorry, there was an error in processing your payment!": "Sorry, there was an error in processing your payment!", "Congratulations! Your account has been connected with Odysee.": "Congratulations! Your account has been connected with Odysee.", "Your account balance is %balance% USD. Functionality to view your transactions and withdraw your balance will be landing shortly.": "Your account balance is %balance% USD. Functionality to view your transactions and withdraw your balance will be landing shortly.", "Your account balance is $0 USD. When you receive a tip you will see it here.": "Your account balance is $0 USD. When you receive a tip you will see it here.", @@ -2177,11 +2169,5 @@ "Content Page": "Content Page", "Card Last 4": "Card Last 4", "Search blocked channel name": "Search blocked channel name", - "Discuss": "Discuss", - "lbry.tv has been retired. You have been magically transported to Odysee.com. %more%": "lbry.tv has been retired. You have been magically transported to Odysee.com. %more%", - "Show more livestreams": "Show more livestreams", - "Creator": "Creator", - "From comments": "From comments", - "From search": "From search", "--end--": "--end--" } diff --git a/static/img/favicon-spaceman.png b/static/img/favicon-spaceman.png deleted file mode 100644 index f6925795a..000000000 Binary files a/static/img/favicon-spaceman.png and /dev/null differ diff --git a/static/index-web.html b/static/index-web.html index 8c599178e..248dcd0e6 100644 --- a/static/index-web.html +++ b/static/index-web.html @@ -13,8 +13,6 @@ - -