From 03827fcbeedbe75db60e7000cc412f7a79bf748a Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Fri, 11 Jun 2021 13:47:56 -0400 Subject: [PATCH] odysee fix replay select styling make meme a link Fix audio references get newest livestream claim in livestreamLink pin crackermilk fix livestream banner placement fix live page fix rebase fix rebase fix error nag fix darkmode blockquote style break word on livestream comment text fix dark mode snack fix live badge fix lint small fixes - word wrap, live badge wip Fix invisible snack in Odysee Light Theme Revert "wip" This reverts commit d17e477fe0e6633709ea30bdc403448825db4c71. Revert "small fixes - word wrap, live badge" This reverts commit 0e431d4038d774079c78f0de32238aac7260e4ca. fix blank pinned destiny fix badges and homepage again only get livestreams live for less than a day pinned hammy and olivia multi pin pin destiny updated pinned videos update tagline Update view.jsx pins updated destiny's video updated pinned videos removed destiny, added lie likes music pinned destiny and mason's woodshop removed hammy and olivia unpinned mason's woodshop removed pins added hammy and olivia pinned sam seder unpinned destiny and hammy and olivia Fix merge on ChannelThumbnails - sam seder, + hammy & olivia and passion for food update tagline (#6086) removed everyone, added kona and suba Theme color fixes (odysee) (#6089) * Cherry-pick master's 'base-theme.scss' * Non-functional cleanup (remove dups, re-order, etc.) * Dark: update positive Toast to --color-primary as well. This follows the intention of the refactoring, which I guess was (1) reduce the number of color names (2) reduce the number of customizations needed. The only issue I have with this is that the current Odysee primary color is pink, which can be intepreted as an error. The original (pre-refactoring color was green). For now, I follow the refactoring path. We can tweak this later. * Fix text color inside '--color-card-background-highlighted' Light: use base-theme (it was the same value anyway). Dark: use bright text. * Dark: add some contrast between the components The color for the background, header, card, placeholder, etc. is almost identical -- it looks like there are all in the same component. The almost-invisible border doesn't help. One would have to crank up the monitor's contrast setting to see separation of components. Brighten up the components a bit, somewhat following the same scale as lbry.tv's dark theme. Overall, I still think it's too dark. The Card's background color can still be brightened up further for better contrast, but I try not to make too drastic of a change for now. The original lbry.tv's gray theme is the most pleasant theme I've seen so far, but this is all subjective. changed pins removed kona and suba added destiny changed pins removed destiny pinned sgtducky changed pins removed sgtducky added hammy and olivia added chrissie mayr added the bite shot changed pins removed the bite shot added heads of tech changed pins removed hammy and olivia removed chrissie mayr changed pins removed heads of tech added crackermilk changed pins removed crackermilk added some ordinary gamer added passion for food changed pins removed some ordinary gamers removed passion for food added emmy hucker changed pins added game knights Update view.jsx Force rebuild changed pins removed emmy hucker changed pins removed game knights added crackermilk changed pins removed crackermilk added some ordinary gamer changed pins removed some ordinary gamers added passion for food added green renaissance changed pins removed passion for food removed green renaissance added expand love changed pins removed expand love added dr nora change tagline (#6122) there's so much room for activities comment out music changed pins removed dr nora added kona and suba changed pins removed kona and suba added destiny changed pins removed destiny added crackermilk changed pins removed crackermilk added someordinarygamers change tagline Drake, where's the door hole? changed pins unpinned someordinarygamers pinned kona and suba Add message for mature content changed pin changed pins removed creative model changed pins added bcpov added krish mohan added cigarvixen changed pins removed krish mohan added adrian logan bump fix footer change tagline just like the simulations changed pins removed: bcpov cigarvixen adrian logan added: someordinarygamers quick fix for reposts oops fix channel tabs changed pin removed someordinarygamers added kona and suba changed pins removed kona and suba added dirtyworkz added crackermilk fix channel tabs again again changed pins someordinarygamers arvie's cookbook changed pins removed some ordinary gamers removed arvie's cookbook added fna van life changed pins removed fna vanlife added game knights change tagline "this cave is not a natural formation" changed pins removed game knights added some ordinary gamers fix popup put footer back bump lightouse throttle bump lighthouse throttle changed pins removed some orginary gamers added adrian logan pinned bret weinstein fix referral fix-superchats changed pins removed bret weinstein added passion for food added dark horse clips fix incorrect variable being used to determine view state changed pins removed passion for food changed pins removed bret weinstein added sgt ducky add recsys related functionality Create plugin to hold code for recsys send recsys on dispose cleanup recsys code add userId to props validation appease the linter add todo note extra characters pinned jungle survival fix autoplay for transcoded files change tagline changed pins pinned destiny pinned chris williamson FIX video.js event firing issues fore RecsysPlugin - The `rateChange` event now logs the updated speed, not just the time at which it occurred. - The `scrub` now (more) accurately logs the position it came from before the destination. - The recsys events get consolidated for logical consistency. Wunderbar: change throttle to debounce + add min chars 6314: prevent lighthouse spam from wunderbar - Wunderbar: change throttle to debounce + add min chars. - useLighthouse: added option to not throttle. Wunderbar: immediate feedback to convey status Make immediate GUI feedback to convey the current status, which can be the following: - typing - waiting lighthouse results - waiting claim resolve - no results or failed. pinned someordinarygamers Wunderbar: bump debounce to 1s per feedback pinned jungle survival pinned james julier --- flow-typed/homepage.js | 5 +- homepages/homepage.js | 1431 ++++++++++++++--- static/app-strings.json | 2 +- static/img/favicon.png | Bin 1349 -> 3009 bytes static/img/lbry-favicon.png | Bin 0 -> 1349 bytes ui/analytics.js | 6 +- ui/component/channelContent/view.jsx | 5 +- ui/component/channelThumbnail/spaceman.png | Bin 0 -> 8265 bytes ui/component/channelThumbnail/view.jsx | 6 +- ui/component/claimList/view.jsx | 4 + ui/component/claimListDiscover/view.jsx | 46 +- ui/component/claimPreview/view.jsx | 2 +- ui/component/claimPreviewTile/view.jsx | 7 +- ui/component/claimTilesDiscover/view.jsx | 31 +- ui/component/commentCreate/view.jsx | 20 +- ui/component/commentReactions/view.jsx | 4 +- ui/component/fileActions/view.jsx | 30 +- ui/component/fileReactions/view.jsx | 71 +- ui/component/fileSubtitle/view.jsx | 4 +- ui/component/fileTitleSection/view.jsx | 10 +- ui/component/fileViewCount/view.jsx | 4 +- ui/component/fileViewerEmbeddedTitle/view.jsx | 8 +- ui/component/header/view.jsx | 32 +- ui/component/livestreamComments/view.jsx | 2 +- ui/component/livestreamFeed/index.js | 9 + ui/component/livestreamFeed/view.jsx | 38 + ui/component/livestreamLink/view.jsx | 4 +- ui/component/notificationBubble/view.jsx | 6 +- .../notificationHeaderButton/view.jsx | 7 +- ui/component/page/view.jsx | 2 +- ui/component/publishFile/view.jsx | 2 +- ui/component/publishForm/view.jsx | 5 +- ui/component/publishName/name-help-text.jsx | 1 - ui/component/repostCreate/view.jsx | 24 +- ui/component/selectThumbnail/view.jsx | 2 +- ui/component/sideNavigation/view.jsx | 7 +- ui/component/subscribeButton/index.js | 2 - ui/component/subscribeButton/view.jsx | 3 +- ui/component/userChannelFollowIntro/view.jsx | 27 +- ui/component/userSignUp/view.jsx | 23 +- ui/component/userVerify/view.jsx | 8 +- ui/component/viewers/videoViewer/index.js | 4 +- .../internal/plugins/videojs-recsys/plugin.js | 284 ++++ .../viewers/videoViewer/internal/videojs.jsx | 34 +- ui/component/viewers/videoViewer/view.jsx | 27 +- ui/component/webUploadList/view.jsx | 4 +- ui/component/youtubeTransferStatus/view.jsx | 4 +- ui/constants/form-field.js | 2 +- ui/modal/modalPublish/view.jsx | 5 +- ui/modal/modalPublishPreview/index.js | 2 + ui/modal/modalRemoveFile/view.jsx | 6 +- ui/modal/modalTransactionFailed/view.jsx | 2 +- ui/modal/modalYoutubeWelcome/view.jsx | 32 +- ui/page/adsTest/index.js | 12 + ui/page/adsTest/view.jsx | 20 + ui/page/buy/view.jsx | 1 + ui/page/channelsFollowingDiscover/view.jsx | 163 +- ui/page/discover/view.jsx | 20 +- ui/page/file/view.jsx | 25 + ui/page/home/view.jsx | 13 +- ui/page/search/index.js | 2 +- ui/page/settings/view.jsx | 18 +- ui/page/show/view.jsx | 1 + ui/redux/actions/search.js | 5 + ui/redux/reducers/search.js | 6 +- ui/redux/reducers/settings.js | 12 +- ui/scss/component/_button.scss | 6 + ui/scss/component/_file-render.scss | 30 +- ui/scss/component/_form-field.scss | 2 +- ui/scss/component/_header.scss | 1 - ui/scss/component/_livestream.scss | 11 +- ui/scss/component/_navigation.scss | 4 + ui/scss/component/section.scss | 2 +- ui/scss/init/_color.scss | 57 - ui/scss/init/_gui.scss | 23 +- ui/scss/init/_vars.scss | 2 +- ui/scss/themes/dark.scss | 135 +- ui/scss/themes/light.scss | 153 ++ ui/util/query-params.js | 4 + .../fileViewerEmbeddedEnded/view.jsx | 6 +- web/component/footer.jsx | 117 +- 81 files changed, 2420 insertions(+), 737 deletions(-) create mode 100644 static/img/lbry-favicon.png create mode 100644 ui/component/channelThumbnail/spaceman.png create mode 100644 ui/component/livestreamFeed/index.js create mode 100644 ui/component/livestreamFeed/view.jsx create mode 100644 ui/component/viewers/videoViewer/internal/plugins/videojs-recsys/plugin.js create mode 100644 ui/page/adsTest/index.js create mode 100644 ui/page/adsTest/view.jsx delete mode 100644 ui/scss/init/_color.scss diff --git a/flow-typed/homepage.js b/flow-typed/homepage.js index a2bbeb7b7..ee4b1226f 100644 --- a/flow-typed/homepage.js +++ b/flow-typed/homepage.js @@ -4,12 +4,12 @@ declare type HomepageObject = { options: any, route: string, title: string, -} +}; declare type HomepageData = { [string]: HomepageObject, default: any => any, -} +}; declare type RowDataItem = { title: any, @@ -19,6 +19,7 @@ declare type RowDataItem = { extra?: any, options?: { channelIds?: Array, + limitClaimsPerChannel?: number, pageSize: number, }, route?: string, diff --git a/homepages/homepage.js b/homepages/homepage.js index 48181bcf1..e6cbec0a5 100644 --- a/homepages/homepage.js +++ b/homepages/homepage.js @@ -2,17 +2,1240 @@ import * as PAGES from 'constants/pages'; import * as ICONS from 'constants/icons'; import * as CS from 'constants/claim_search'; +import React from 'react'; import { parseURI } from 'lbry-redux'; import moment from 'moment'; import { toCapitalCase } from 'util/string'; import { useIsLargeScreen } from 'effects/use-screensize'; export type RowDataItem = { - title: string, + title: any, link?: string, help?: any, - options?: {}, icon?: string, + extra?: any, + options?: { + channelIds?: Array, + limitClaimsPerChannel?: number, + pageSize: number, + }, + route?: string, + hideForUnauth?: boolean, +}; + +export const PRIMARY_CONTENT_CHANNEL_IDS = [ + '3fec094c5937e9eb4e8f5e71e4ca430e8a993d03', + '6184648aab0431c4c95c649072d1f9ff08b9bb7c', + 'b5d31cde873073718c033076656a27471e392afc', + '7317cdf6f62be93b22295062e191f6ba59a5db26', + '1cdb5d0bdcb484907d0a2fea4efdfe0153838642', + 'b516294f541a18ce00b71a60b2c82ad2f87ff78d', + '91e42cc450075f2c4c245bac7617bf903f16b4ce', + 'b6e207c5f8c58e7c8362cd05a1501bf2f5b694f2', + '25f384bd95e218f6ac37fcaca99ed40f36760d8c', + 'f33657a2fcbab2dc3ce555d5d6728f8758af7bc7', + '294f5c164da5ac9735658b2d58d8fee6745dfc45', + '119a2e8c0b50f78d3861636d37c3b44ba8e689b5', + '7b23cca3f49059f005e812be03931c81272eaac4', + 'fb0efeaa3788d1292bb49a94d77622503fe08129', + '797a528c49b6535560f7fd8222b121b0223287c8', + 'bc490776f367b8afccf0ea7349d657431ba1ded6', + '48c7ea8bc2c4adba09bf21a29689e3b8c2967522', + 'bf7490f905904e79de5c90e472bb9e6f26e634a0', + 'df961194a798cc76306b9290701130c592530fb6', + 'cf0be9078d76951e2e228df68b5b0bbf71313aaa', + 'd746ac8d782f94d12d176c7a591f5bf8365bef3d', + '1f30267438257020f08abf452746a48e53a71ad5', + '4ad942982e43326c7700b1b6443049b3cfd82161', + '1cdb5d0bdcb484907d0a2fea4efdfe0153838642', + '6616707e1109aaa1c11b9f399f914d0cfb4f5303', + '4ee7cfaf1fc50a6df858ed0b99c278d633bccca9', + 'b7d02b4a0036114732c072269adb891dc5e34ca4', + '9c51c1a119137cd17ed5ae09daa80c1cab6ac01d', + '5f2a5c14b971a6f5eed0a67dc7af3a3fe5c0b6a4', + '0e2b5b4cf59e859860000ff123dc12a317ad416b', + '3fe68ad3da93065e35c37b14fbeef88b4b7785ed', + 'fd7ffcbafb74412a8812df4720feaf11fe70fe12', + 'b4c30fe36b79870a79c55e1e909adb5ad23f323f', + '92c0f2f3239f1f61496997bd2cdc197ec51bd423', + '29193e9240a71a735639c66ee954e68414f11236', + '25f384bd95e218f6ac37fcaca99ed40f36760d8c', + '87b13b074936b1f42a7c6758c7c2995f58c602e7', + '8d935c6c30510e1dfc10f803a9646fa8aa128b07', + '8f4fecfc836ea33798ee3e5cef56926fa54e2cf9', + '9a5dfcb1a4b29c3a1598392d039744b9938b5a26', + 'c5724e280283cd985186af9a62494aae377daabd', + 'b39833be3032bbe1005f4f719f379a4621faeb13', + '589276465a23c589801d874f484cc39f307d7ec7', + 'fb364ef587872515f545a5b4b3182b58073f230f', + '6c0bf1fed2705d675da950a94e4af004ec975a06', + 'b924ac36b7499591f7929d9c4903de79b07b1cb9', + '113515e893b8186595595e594ecc410bae50c026', + '72f9815b087b6d346745e3de71a6ce5fe73a8677', + 'b0198a465290f065378f3535666bee0653d6a9bb', + '020ebeb40642bfb4bc3d9f6d28c098afc0a47481', + '5c15e604c4207f52c8cf58fe21e63164c230e257', + '273a2fa759f1a9f56b078633ea2f08fc2406002a', + '930fc43ca7bae20d4706543e97175d1872b0671f', + '0cb2ec46f06ba85520a1c1a56706acf35d5176dd', + '057053dfb657aaa98553e2c544b06e1a2371557e', + '64e091964a611a48424d254a3de2b952d0d6565a', + '50ebba2b06908f93d7963b1c6826cc0fd6104477', + '374ff82251a384601da73f30485c3ac8d7f4176b', + '1487afc813124abbeb0629d2172be0f01ccec3bf', + '6a4fa1a68b92336e64006a4310cb160b07854329', + '15f986a262fc6eff5774050c94d174c0533d505d', + '6184648aab0431c4c95c649072d1f9ff08b9bb7c', + '1efa9b640ad980b2ec53834d60e9cff9554979cd', + '064d4999ea15e433e06f16f391922390acab01cb', + '4884e30b93b3c4c123a83154516196095f9e831e', + '2827bfc459c12d7c6d280cbacee750811291d4ba', + '9626816275585ac3443e7cddd1272c8652c23f1d', + 'a2e1bb1fed32c6a6290b679785dd31ca5c59cb5f', + 'd9535951222dd7a1ff7f763872cb0df44f7962bf', + '243b6f18093ff97c861d0568c7d3379606201a4b', + '1ce5ac7bab7f2e82af02305ced3c095e320b52e5', + '3e63119a8503a6f666b0a736c8fdeb9e79d11eb4', + 'e33372c0d8b2cdd3e12252962ee1671d66143075', + '7364ba2ac9090e468855ce9074bb50c306196f4c', + 'd6350f9158825662b99e4b5e0442bcc94d39bc11', + '2a294ea41312c6da8de5ebd0f18dbfb2963bb1a4', + '44c49bbab8a3e9999f3ba9dee0186288b1d960a7', + '2305db36455aa0d18571015b9e9bd0950262aa0f', + '82f1d8c257d3e76b711a5cecd1e49bd3fa6a9de9', + 'faed2b028a9b5a712d5180eaa6fd2aa619f941bc', + '39ac239b5687f7d1c2ba74cd020b3547545dfdaf', + '5737eb22f6119f27c9afccfe73ba710afd885371', + '5f22b6daf7204d73cf79d3ff0b46fc4fe237c7f7', + '3583f5a570af6870504eea5a5f7afad6e1508508', + 'b0e489f986c345aef23c4a48d91cbcf5a6fdb9ac', + 'ba79c80788a9e1751e49ad401f5692d86f73a2db', + 'c54323436f50c633c870298bb374ac8e7560e6cd', + '83725c7ee23bd4a8ca28a4fab0e313409def1dc7', + '61c4e8636704f2f38bbe88b1f30ef0d74d6c0f49', + '87ef9ba36019f7f3bf217cf47511645893b13f2e', + '1bd0adfcf1c75bafc1ba3fc9b65a1a0470df6a91', + '1be15348c51955179b7bf9aa90230a9425927ef6', + '1f45ab3495df2c3be7d9c882bca9966305115cbb', + '7317777e3751efa66218f6da5ef0d01dda69af48', + '3346a4ff80b70ee7eea8a79fc79f19c43bb4464a', + '452916a904030d2ce4ea2440fad2d0774e7296d9', + '2675ef3adf52ebf8a44ff5da4306c293dfa6f901', + 'e2a76643735f8611a561794509c6bb2aac70eb04', + 'dc577db3caf5ff83a3b573ba92f2d447f067eee1', + '89c4cf244099918b1d3ed413df27d4216e97b499', + '4b2b5822c8af3074c6ef9b789a8142d0ef623402', + '3c5794f775975669745c412b0c30f48991d9e455', + '1df464dbb302ced815c61431a5548a273e6de8e1', + '1c0129135a23ff8096d533e0241921859f065f35', + '6d2dac42692c279aed436f000c053c34c3ccec29', + '403cd55421118093e83d490cf7991ebb477a320c', + 'b48a89b235fa577fab38ef56b57008c2aa0655fd', + '06f6e7b9a05f12823c7d93dc04826636ae99c938', + '3772507e49303f6db071f6361494deaafcbbf4cb', + 'e5872eb7237883e4158cf88e96a465f7a674c968', + 'b4ccefa53e0bb5730b56facb9b2ae5ad92c99935', + 'a30c5c8cb8faf78b7ad82118e8fd7039901a5a32', + '5701b00a32d91035baa53e6a65800f0f5d4e520c', + '6f061a2d8cf613a1ccca86468cf38143d2887c18', + '4de30a6590a288684ab200409988c47c17a12ef2', + 'd0dec51ee295fae711466a6642749217b6e48032', + '693d8aa643c30d4afb1a5e712ec57ac4ae699b26', + 'c73409178a35717a9a735aea942945fca53604fc', + 'f58e50a4c5fd2db81e1b5f4f5c36642d45f805c4', + '24fbe1f81dddd872270648f038cf368b49cc4c4a', + '074973ec6f89e0445903c844d02f9b15a64b2222', + 'f40f4a4546dabc9c47d9c75d0e5c0a9ba8581bec', + 'f74655b4911e09c77d2fa0e700d5a76d2bc68ba5', + '16fb96ca5b1713a4cc787e9e2542da724a45c854', + 'c1296488bc1aa7a8c8890509fd231267b3cf9e16', + '0b7925083d4c382cb441f5f44ad626f7627bc198', + 'af0f5d9e055d07c8308da7f6726562420ff0bb82', + 'd6d17103b4aadd46c47236431eb7a96427ef98d7', + '638f9e7b024efc24a14c161f8ccf4bacbcfda10b', + '01c80abaf2f957cd0e37e0a0c58d357070c2b6ff', + '44492321a13a0087c12394d4fb48c208ca6d4b27', + 'cc8f04f02b15a4de03381f1ef506bd270c7b0936', + '3264777dacecd86cb6b5b2f67b7e52b7b3b9f06a', + '1698fe7e7cc0e748d99408e67df73f584e18113f', + '38a83de67a246c72cd793104073968d7440e3509', + '4c4c9e44dd32e618ce56c7ca2e2e2b53e8027779', + '77912e1d53cec04f2343a754dd3ccb1853c5ea66', + '617886394bee35c359766fb4d9ae889b8fd39079', + '5c1777eed58b6729c4502c12b4e2d5f0a78450d5', + '88f9585ed0139d8775c47d2502b60ff028acc17e', + '37f3125b8ae2a19082300e05951d6c33d65b84d3', + '1dd1f89c9fec0450b8f446d88c8ca7eae806c54e', +]; + +export const PRIMARY_CONTENT = { + route: '/$/general', + icon: ICONS.HOME, + title: __('General'), + options: { + claimType: ['stream'], + orderBy: ['release_time'], + pageSize: 20, // temporary, to facilitate screenshots until repitition parameter is added + channelIds: PRIMARY_CONTENT_CHANNEL_IDS, + limitClaimsPerChannel: 3, + releaseTime: `>${Math.floor(moment().subtract(1, 'months').startOf('week').unix())}`, + }, +}; + +export const PRIMARY_CONTENT_2 = { + title: __("Don't Be Evil"), + link: `/$/${PAGES.DISCOVER}?${CS.CLAIM_TYPE}=${CS.CLAIM_STREAM}&${ + CS.CHANNEL_IDS_KEY + }=${PRIMARY_CONTENT_CHANNEL_IDS.join(',')}`, + options: { + claimType: ['stream'], + orderBy: ['release_time'], + pageSize: 8, + channelIds: PRIMARY_CONTENT_CHANNEL_IDS, + limitClaimsPerChannel: 3, + releaseTime: `>${Math.floor(moment().subtract(1, 'months').startOf('week').unix())}`, + }, +}; + +export const RABBIT_HOLE_CHANNEL_IDS = [ + 'a5af5f42b57d31b982fd700f65b02ee589751b96', + 'ea86138fdfac9891a2e15cec9b2143ef64805435', + 'b541d03b30c3fea017280d8ae1758a9f2035f44f', + '81c637fdba001ff4406123c1fd4f5a1c6e1772f7', + '0c4a8b59b2e1bf396210be96f690d8d37251d39b', + 'a190ec65b6d67df868be2208c62510c257ace16e', + 'df75764e06247ccec50dbc87a9c4a8a95a32658d', + 'd70c3d47eff085d56e6328fc2f2def163b1d21fb', + '02f3c6b00fcaa365c5858352ca1ee149aea7b90f', + '6259aac793195c93a4dce1940e2581c238fd2021', + '526b15b49e5ff7d1fd9443b7f9b30ad1194c3235', + '70d122698cc6d3511036c7fb2e6dca5c358463de', + 'f14e64d962c226630702f9a61f48ab4f55ecffb9', + 'bc490776f367b8afccf0ea7349d657431ba1ded6', + '935e7ed2c8b2a184ba2f39167f0201a74910235b', + '3fec094c5937e9eb4e8f5e71e4ca430e8a993d03', + '780abbacb30bffd0554a3d6e79764cdc3551a0a5', + 'e8db076af81d517098c81b30c71ce42cf05daeda', + '4407261b86abf43b85448657d9d2a4f13a968d87', + '191a3374da974a9528cd39497ffb31011988dfce', + '40592b2f8bba7f702c62b8ab91402bd1a257ab18', + '0e42d95f05f3543937390f1a573d6fd9840eaa46', + '7a3c90e0e7d7214f6bbe2994a4a5fff6d4afd515', + '8dc55cd4acb6e8d903a85e3bd9b15478bbdad3b5', + 'a8d874a26b64b7cf2584268ffcfe4c5e07aac6d4', + 'f6190681f20cbb905f5ff7d58e568603f81de8ba', + '82f1d8c257d3e76b711a5cecd1e49bd3fa6a9de9', + '302e6aeb7e8f31e17660bbbe5c94ad4e072ba904', + '4651d91cc32c01243069af1f39468928102750dc', + '5e0ee088f3b80915a24dc3b59adf164460141359', + '28945e47d977bb49f8eb2ca4e98ef2ee243e1f2e', + 'e8b0d5e34558b8a852374fd40af1c0150a65504b', + '9170327aa5ad2c6bea0b167f840032036eaf9064', + 'b4fea5d9a31024fd5b6609c188b55bfa883a8ae0', + '3645cf2f5d0bdac0523f945be1c3ff60758f7845', + '0f8078f7710ce929ac176e3df0e08cf0b6ab2125', + 'b325961c50c986f2022313220e5b98da9b0004bc', + '6175f135650778103c72ae3bee8561b75f264586', + '7f1137707c918dab287ac91c9dbb28748696a36b', + 'a527400d6bf96de2bd1811e978f23790748b06e1', + 'eca0cce47d1111668f2ad040ed13fa4924d4c346', + 'e99c0ecc262375abfc2b9548d9bd0c0d11bb3a71', + '5c15e604c4207f52c8cf58fe21e63164c230e257', + '09d4223819ac29d5462a3eea2b1f35b5482770a2', + 'b0198a465290f065378f3535666bee0653d6a9bb', + 'f4c726ebb9e9e6308cae9970c5f1cf430b33ddc1', + '9f58aaa07638c45e6d7be611b5e8714f7cdd09bf', + 'f2318083d4a21c9b1b619ed4d2f420c9766683f5', + '0b3d9716a33b3958bc89fd23d550f17cab5bbf98', + '13edd7e7e2fbaf845699cf2f8f0b1c095bacb05f', + '5663072977d3a0f161780cfd6ddc7507f157ffcd', + '207d310712f28c7e7c3436bb3d86f2481a8cfaf1', + 'b9288432bd089c6f332145aab08a56eec155f307', + '9db218b153feebb1fcc847ee0e5e921c85fc8852', + '56f784fd6682f2b75a64be95f9443eadf2ef4a66', + '2379d6ca19ce29e64035682ed2b94cb6ec18bb83', + '94fb122085a5f934292bee5547085e4961f847e1', + 'e39dd89fc7ace77e84aebc0b4c88182e21196ff4', + 'a4361b1435691b54b6e1abe2546080809c4029f9', + 'ea5810ca7e60b4e906b021eaf3c55c61d2aea6f6', + 'e7ac2c49710f5657760bcb34abf65802f8c8e13c', + '51d000168749e39034f90c90be803f0536ab0243', + '34ecf8b9cd2f49580a49a175589207625ad2ac8d', + 'd388ed630deef5adddd63767e7dd9b0a2fefdf4a', + '2a3ef5da49872fa4c8cc4103c237e8f9fd7634e3', + '4a966b4b5144027d9339922cfc6a03fc66c9f3fb', + 'e0941d15ea9fd1872c58f51b2d2109fc66b4c96e', + 'b04bd5e53b5d72e912d68e09d7f326f5c14fce28', + '818c4e6b66467cea971c9a26d79723c58582af3e', + 'b7a15c35aa63c02b62f3fd8b02a3fe5ae7263ad6', + '07bfd6eb2935e9be50bdec56d34d9227c511f8c6', + 'c7e6f045bbcf10f651d8948605a42758ebda18e7', + 'b89ed227c49e726fcccf913bdc9dec4c8fec99c2', + 'cde3b125543e3e930ac2647df957a836e3da3816', + '88745fbeb9655201b1824ee1cda5c6e718bcb4fd', + '0d2ad3f6c9810bad6c3e7bb0d06caf3c8112a44f', + '68eb3f3e884400f60080bb910055bc11fecd26d2', + 'e11e2fc3056137948d2cc83fb5ca2ce9b57025ec', + 'cec54cfc1b67da757bcab8a8643328717bbd339d', + 'ee1aaf96d05ddf21e96deb681d5ed2f5dea1d237', + '5cad54ea797c4ec339cc3437a12b144a97d63c08', + '8efc01ef6c24793d0f2f0a415b201d22a427a1d9', + 'c34bc395a4ca536acf394d522cee2a240d49dd98', + '9e263a378138a370c89e9554a7315b8aafc40276', + '14541b47e10941a338e38889ae8f679a0db03698', + '6fcbab41969557ece4660326a5f9cacbff747ad8', + 'd10f0ee5ad036d2cfe7f1d898dea0e58dd5a09a6', + 'c145a475a806c7ccce0a81d22e81a88af6ff5c42', + '2677aa4bb592d97c4be07b80124507db18a529f4', + '964c0e89e04bd31a3d876537f9aeef83d47ebb91', + '4d7725281395247e16133f25044cc16d6f0573ec', + '211cd5ccf2e6911928f9009099a9f81986912b28', + '703b5a1045dddd0d8eacbe21ec4fe83093302cc8', + 'a748ca0dc776ec6ea70cfbb928dca17f1054f714', + '02ebbc46574b6a4e7d7aa523b81f847ea7aa368d', + '6d1173b12c14d756ffd268a401431cd2cd2401c3', + '72c796c2fd82f34914bca296a0f5a69151ac0e37', + 'd3b01081547ef997d07fa41cbb377623b1a27e47', + 'cc7f56eafbf2e763e96ace32a8f617fc5672cd75', + 'd3775ea92591d328ca949ac1a9905c4d125a9aaa', + '0755b84db5b73ce79ea1f48dc8fad273725e9667', + '2f04823d34317bb4f4c9624440667ea614942237', + '0a8021998531fb7acf0022653e5660211bf09f9a', + '5499c784a960d96497151f5e0e8434b84ea5da24', + '5097b175c4c58c431424ce3b60901de6ae650127', + '49f1876b382a69414a330995908e326c7b96c132', + '97f9e09764c0cd76b6a1b8567c5a261b49a41dae', + 'e80e3070d5c82d934f09d439fb9ca9eca5e155b8', + 'a757e39ff8abb2e2f13e88c9b7ad0105ea459ed9', + '2556ed1cab9d17f2a9392030a9ad7f5d138f11bd', + 'f67929e214b9d2e6a317f96750093d00c757515a', + 'e5335287649b30009ed07f65cfc99f777af57784', + 'cb80a9d182a3233d55eb32210778b277cf28da13', + '0cefa1d479bd45c7f8cb224e097e63b5307c3f88', + '0f5d9ae65d82b15c58cc8c962ffd11a0fffed646', + 'b36f5f628e63c2c8a0d063c2be08c1f004984d68', + '6b854ef31764b6472242cdfdd2d7f7009aeeca89', + '5774289bd81edf5442aa23693007e611d9be14e4', + '85fc3229d358fc21ccb1648a94a20993cda74182', + '2bef7359b6036a4d83d83ca47a42d18b458ef498', + 'e063b0a1c3c738fec204b2eacc5c97953e7635cf', + '084a9ad04c084a1d30573593a5f6c75d059d6737', + 'b8e52d9cfdfe2fc2c3e05f812ec542c9eca85729', + '7a5b927c47b5c98e439836792272db86201c9302', + '02f3c6b00fcaa365c5858352ca1ee149aea7b90f', + 'f96048ed8ad4e001fb5401f9cb9bae68714e03eb', + 'b356b4300d0b3048997b19c55612e97c12f1f4a0', + '1e0cd736f5bdc43edd57d1ecd205f6b0039c5020', + 'c718a85496d48288cdefab1f73014875c3e3f29e', + '3479ced09893440157be4bb3ca8fc4d56af991c2', + 'd504cf542d5e93af2812426aec690fcc111b6d83', + '999fd8985272943a1e3750cdde1df95aae85f22d', + 'a5d459452ef00c6127fcae56bcb1cfa93af23a00', + 'd8f706316391002c214de187f67b4ed825d5b12b', + '51e1e35410e8749c0720b3e5fd64e5f852709f1c', + 'f0958d20e77d932c26ccfedfcc9319a59b239267', + 'f0ab91c7ce2964d3286803916c6e0630ffa9c8c0', + 'b88d5fc723c5e26cb48f7aaa2b59963864a635e4', + 'ebfdcacd3258e86c936e6d783f9dd166cecdc892', + '745ad866e987dfe2ebf5a8601cd41c2db42c4be5', + '39a1e426f1ed3f83171ae814ca57c8c2f2559b8f', + 'dd96ce703e6b46ed3b6ac1e1309289a345ce92c2', + '64263461dc7c78dbb9c920e393991afa725817a9', + '62c47bb894a31775cb02f68a10cd757338b5f4e8', + 'e80b78ab8133ffc53fbf1dc429e57c3fb9cd9470', + '7fcb028ee0035bbe6d1618653ff9e5ee48d3df50', + 'b0cc819802b92d5701b041934cf0d0d888f21b5d', + '2ea3b0ffb219917a5b6f48847edcf9979db576a6', + '5e10dfdfe8b0dc4b60570e7e27f399ac521fa9e6', + 'f12ae07aa8caa27259795b0b7de382a00067159e', + '58afb8092ec1b72503a252745852fd469b8e0841', + '05fe959c2e0fe1a04e3a4ae2b716e409a9280e9c', + '9e099e2e0920aa8425664affe3fa01aaada61bc1', + 'd881ba593dfa6c6c0bb56f1c848d980711ad3363', + '223edd5d0432c26dba21f821cc261126e8447ae6', + 'a03be4e3463eadd9e3eefa71e7964e485279ad35', + '468ad74f611803b9eb11355d4ddc2f7a2948d93f', + '92b7f813e4210a06fc55968dbea36e5f1f095e6d', + 'd2e58ac96e77babdd34e45b5cda39c75ac9be1fa', + '5dd2355cfabcbc685a8b6e60160213b43dd730d8', + 'e208836ed9fbdbb1bfc70c4e5aa251a0baa25fb0', + '334c5ae331a5602d0f5c2961240261f1f8625846', + '733f6720ab1db4326b3801686313085e8e7b3faa', + 'b164413f24ff6ff3cd46f205820370d8e8775545', + '001e3bcead62e29acaac6b18d947db5d10f5d15e', + 'be822b2a6c9ddaa9df4bc5bec481d7247db403b1', + '735c841ec371efe8d0d6c5cea937ecfb55f918d3', + 'c3a3c6e917bc78cd201b30c4937ef886023cdd97', + '5ea30bcdaddd1177e2588811b14b82c549ff49b9', + '5af17e406f247c5a50f259828ce6c98b3902e64c', +]; + +export const RABBIT_HOLE = { + title: __('The Rabbit Hole'), + route: '/$/rabbithole', + icon: ICONS.RABBIT_HOLE, + link: `/$/${PAGES.DISCOVER}?${CS.CLAIM_TYPE}=${CS.CLAIM_STREAM}&${CS.CHANNEL_IDS_KEY}=${RABBIT_HOLE_CHANNEL_IDS.join( + ',' + )}`, + options: { + orderBy: ['release_time'], + pageSize: 8, + channelIds: RABBIT_HOLE_CHANNEL_IDS, + limitClaimsPerChannel: 3, + releaseTime: `>${Math.floor(moment().subtract(1, 'months').startOf('week').unix())}`, + }, +}; + +export const ENLIGHTENMENT_CHANNEL_IDS = [ + '82f1d8c257d3e76b711a5cecd1e49bd3fa6a9de9', + '3fec094c5937e9eb4e8f5e71e4ca430e8a993d03', + '0871b29c7db6f1ec013694c8146f772539fcffa3', + '537305bc1bd71e2a5d76efacd607fd0f4d95da0c', + 'bf7490f905904e79de5c90e472bb9e6f26e634a0', + 'c07ce3862335cfe9ba72054347c4ea7808ce4eaa', + '0e1aff187fbd3d2b2b16e5e8c213d3e782dafa98', + 'a1303dc6a592605b08d60cac19ecbc1c877d7de7', + '2a294ea41312c6da8de5ebd0f18dbfb2963bb1a4', + 'd6350f9158825662b99e4b5e0442bcc94d39bc11', + '3e7bb536a1b755b6eb64043ae3fa933d5935eaad', + '0518c93a80efeaf06fb4ac4d3fa72cc6390ac100', + 'b8a2d928a3d3f44457a10abd0539b84e4a29c286', + '564789ffe2420980dcf9e00c4746feb5bc0daad0', + '7364ba2ac9090e468855ce9074bb50c306196f4c', + 'e33372c0d8b2cdd3e12252962ee1671d66143075', + '3e63119a8503a6f666b0a736c8fdeb9e79d11eb4', + '1ce5ac7bab7f2e82af02305ced3c095e320b52e5', + '588ff6ffc72884e61e8d19a9412d6db9ec67167e', + 'b51872361cc68c914eb7c6f2d22eace9570a9f4a', + '51d34684ec97cc7057f2c371d8edbadb6b841707', + '7d30976c407fa3cf82675f7d1e8ea99b5ab2959d', + '64adb5d029acaff293b2934e870d3976760a1353', + 'd9c552d38238f00503741e8e468cd3da612b42c4', + '0831bef6095a57ec440f626aac2a650a20282945', + '81c637fdba001ff4406123c1fd4f5a1c6e1772f7', + 'ddc7f2030c474ca4c9c0043bf19ec0bf79e2783f', + '2827bfc459c12d7c6d280cbacee750811291d4ba', + '0b875d01f2578bde0cbb221eb6a67f23f2222823', + '47e1d179bd2753e6e53f28f5e99fb090d336d2e8', + '5c4370bfff3070458df198f6ba60c6eb1244c014', + '6184648aab0431c4c95c649072d1f9ff08b9bb7c', + '45e55a50627305311479123e0fec171e16a0cd0f', + 'c62490d59850450bc8acf26e227f56aee4e9bdf5', + '07e4546674268fc0222b2ca22d31d0549dc217ee', + '1487afc813124abbeb0629d2172be0f01ccec3bf', + '8e9ef4a69ef17507d1a3649573999a61e97f262c', + 'e918922b39e09492e0c54828ee58e0cd7165e950', + '64e091964a611a48424d254a3de2b952d0d6565a', + 'ffc92d8fddf384075f871445d67090887497c587', + '057053dfb657aaa98553e2c544b06e1a2371557e', + '0cb2ec46f06ba85520a1c1a56706acf35d5176dd', + 'd421f5954690807d3e5749e9a9671d7b067ef9e5', + '711da3ea1683900643021c58342b1608e9be0524', + 'a77b073817c8b25edcea146feb84c726efba8269', + '526b15b49e5ff7d1fd9443b7f9b30ad1194c3235', + '5c15e604c4207f52c8cf58fe21e63164c230e257', + 'b0198a465290f065378f3535666bee0653d6a9bb', + '2eefe1b1cfdcf6c58a0fe37f71dffca36a41030a', + '6c0bf1fed2705d675da950a94e4af004ec975a06', + 'c5724e280283cd985186af9a62494aae377daabd', + '5b8c91cdf40b2b0c14a2ef1a4fbe987a34d4677c', + 'd25ae97a1516f5700fc717152b885f33da47f12b', + '56f784fd6682f2b75a64be95f9443eadf2ef4a66', + 'f07a506ee0396b004a7b535f3207a69387fb5a86', + '2c9485e000eac29349bc4538a91d5a45ec56b126', + 'b4c30fe36b79870a79c55e1e909adb5ad23f323f', + 'da5534547c15856646c1bd281313ddd55cbec407', + '495a668d18b93c11079f1ce93195a330fe35e603', + '2677aa4bb592d97c4be07b80124507db18a529f4', + '74e380497449d9eb13de9bc4038676097e4730fe', + '36e6a8937381df34825dfbc8a85f38c30de02eee', + 'ce59b0c52f73407a8bcf95c604803dd8c9c30986', + '92fc977af0e937e9ed6b135a54ae01f978d9cb04', + 'e39dd89fc7ace77e84aebc0b4c88182e21196ff4', + '6ab0d775b951fa2ba3770bb72e129663d963f08a', + '2425da1f0245d08e53559b2f4243f82a2a459505', + '7a8954b2c09cb835f4b90be69fd4a5fc4f1b5f04', + '1cdb5d0bdcb484907d0a2fea4efdfe0153838642', + '68846c9a38ffac12c9b59a2f989a6554a1fada3c', + '0cd2ffa6045eafce28c1abcb518688bed8c79acf', + 'ae64f8ff59f5c226b61434eee805afea56b85a97', + '5c3ae8555f9706bff568d28549b8d66ed05fd490', + '0ec0442f7faf0b3aa18fcef68dccadc04c3e7bd6', + 'd388ed630deef5adddd63767e7dd9b0a2fefdf4a', + '76a00fbe5bec7fe7f7649d4c74c6ede151f083ee', + '4a966b4b5144027d9339922cfc6a03fc66c9f3fb', + '120d6665e352eb1733396a59bd3ffea87268033a', + '5190f00b950ae96607a5f1f1585b06dc1d869ef4', + '1f30267438257020f08abf452746a48e53a71ad5', + '5640bb7d84d8953d367841909967ab345f2c11ca', + 'ddc7f2030c474ca4c9c0043bf19ec0bf79e2783f', + 'f14e64d962c226630702f9a61f48ab4f55ecffb9', + 'cec54cfc1b67da757bcab8a8643328717bbd339d', + '46be492ee0f56db11e005991c537c867a8682f77', + 'a403ce7eff82b75a530dffd211ddc69847be4425', + '8c3b45178de9a3636753271b034061c7e4b8c3ea', + 'f37bc3cbe8aaf2826cc6e42f2cd9b41cb68be191', + 'cab85829af32668a3f78f3fe9c18dfcd6793b56d', + 'a0976c3d6e0948c55c935006a1f87799fc03f413', + '39ac239b5687f7d1c2ba74cd020b3547545dfdaf', + '22076b79263e9c2696ca3198843d85c2066ee30d', + '6563ad2e10baf2c4f3624dab2b129999222f3fa7', + '4262bceff4420f24349944b3d9a02fd331ca9f34', + '87515affb1d52602a0a456b400482d7db9cf7de4', + 'a68e2f8fcf4a2e201bdc700fedcfcd0eb429bb7f', + '06b6d6d6a893fb589ec2ded948f5122856921ed5', + '5a1b164d0a2e7adf1db08d7363ea1cb06c30cd74', + '703b5a1045dddd0d8eacbe21ec4fe83093302cc8', + '4f274af7dfbcfc15803d32eef9bd36a441aa6de2', + 'ae12172e991e675ed842a0a4412245d8ee1eb398', + 'e04ece044748d52b0fddde21b5b1a2bd3b4b8b43', + '177946d040a1e1cb0c608d115c2419e49ffb8ba7', + 'd16e18834d123c5df038358e4964b9a1b5c8b464', + '6280fe7926ba4421c8f9bc0006407766d587bd53', + '0755b84db5b73ce79ea1f48dc8fad273725e9667', + '4ecc029cac207edb5bb7770947ebb9e84f7ebab9', + 'dfa7d9854c7935b9312ed0aac66aa3dd3f48684e', + '1d729d8a4bbed9f3e9bec0cf1e958980569b0681', + 'a6bb6b4d8ab63b6580855903da440789aec2d5fb', + 'c191c83abf8b5c892ba2e96e629414a0d5acc9fb', + '9b533cddf16a00f9c1fef598db1b71b8dfa6f9b8', + '4b2b5822c8af3074c6ef9b789a8142d0ef623402', + 'dc577db3caf5ff83a3b573ba92f2d447f067eee1', + 'a034887d7bc1baf3d8503fa1d940ba4b753130a6', + '14238e19a38d7bf1d748a0d8eb2a90c46de01f9c', + '992dec920b87ed9ce06dc7ae69df7c8be03afb85', + '6ea7e01f0dbdea4efc857a5cdb1f03770ff570c4', + 'f85c9989f66e09b8d248e65f838e0d2cd7126cb9', + 'a3e777832e63ab29cf36010c58004aef955dc5b5', + '8ddde2e2330194594e1b70d90b2170843a84e786', + '0657cacd7dd60fd25032b998b98ef5822700667a', + '06f6e7b9a05f12823c7d93dc04826636ae99c938', + '941ea9f49e136a45e3c1ebded90aef66dccaa07a', + 'ca60ebc129f11ced61e010d2a0a27656cb2003f7', + '116d17f196e19681d00d19803d2674cd740391dc', + 'f66c7b4fa8d6c62cf420e100a28b144d78cda1d2', + 'e329ce51a201d565f6b87c6c260df51396e18a40', + '5701b00a32d91035baa53e6a65800f0f5d4e520c', + '3479ced09893440157be4bb3ca8fc4d56af991c2', + '8a42cda79b4ccc9bcf06a5cf286a18fe0ae6029b', + '0fd0cfcd533255ea682f3488a5778075d7e29bbb', + '96f98fe1a19b86eda83b3c29f6cdabd1e2379943', + '47c979a88e6afe85395b8205e30a57f90365947c', + '4fd6950858377dc247952b6c94065273c8fd083e', + '4de30a6590a288684ab200409988c47c17a12ef2', + 'd74267e5bf95d71e1cd0c16f7e77f849dff5edd7', + 'dd96ce703e6b46ed3b6ac1e1309289a345ce92c2', + '62c47bb894a31775cb02f68a10cd757338b5f4e8', + 'f58e50a4c5fd2db81e1b5f4f5c36642d45f805c4', + 'e2b63a6a359896b5f7fdfac500a321a4bfd2871a', + 'cb7a6655353e39198d01172f47b4349e798cb95e', + '2f5c671e5e1f9dc5714b51b938d818cee6421a2b', + 'f74655b4911e09c77d2fa0e700d5a76d2bc68ba5', + '16fb96ca5b1713a4cc787e9e2542da724a45c854', + 'c1296488bc1aa7a8c8890509fd231267b3cf9e16', + 'f9e35814abee0aeab5d85c06b99bc00a8e1d3d1b', + '0b7925083d4c382cb441f5f44ad626f7627bc198', + '468ad74f611803b9eb11355d4ddc2f7a2948d93f', + '01c80abaf2f957cd0e37e0a0c58d357070c2b6ff', + '7cefac5dfb1013fe53a1c9717770535f1d622c90', + '733f6720ab1db4326b3801686313085e8e7b3faa', + '3264777dacecd86cb6b5b2f67b7e52b7b3b9f06a', + '6c5e16c3faf9dfc7edc1fdfa82d3d16a7af55a34', + '5c1777eed58b6729c4502c12b4e2d5f0a78450d5', + '88f9585ed0139d8775c47d2502b60ff028acc17e', + '37f3125b8ae2a19082300e05951d6c33d65b84d3', + '1dd1f89c9fec0450b8f446d88c8ca7eae806c54e', +]; + +export const ENLIGHTENMENT = { + title: __('Enlightenment'), + route: '/$/enlightenment', + icon: ICONS.ENLIGHTENMENT, + link: `/$/${PAGES.DISCOVER}?${CS.CLAIM_TYPE}=${CS.CLAIM_STREAM}&${ + CS.CHANNEL_IDS_KEY + }=${ENLIGHTENMENT_CHANNEL_IDS.join(',')}`, + options: { + orderBy: ['release_time'], + pageSize: 12, + channelIds: ENLIGHTENMENT_CHANNEL_IDS, + limitClaimsPerChannel: 3, + releaseTime: `>${Math.floor(moment().subtract(1, 'months').startOf('week').unix())}`, + }, +}; + +export const GAMING_CHANNEL_IDS = [ + 'b7d204c8ac9b0b5df4ffc4350afa432bf579543e', + '02c020b2fab7dd1fbd175c3b22947688c0a219e5', + 'e8c71ade66ffb2cd7be3fa08f1d0a19ac70bfc65', + '15c88c561f7e4c4cdd6fb4e32c35e593db09a8a4', + '1d729d8a4bbed9f3e9bec0cf1e958980569b0681', + '514df20b9d2cce22725d5305a8ba019547188736', + '199eba05b6ecccab919e26a0cb7dacd544f25700', + 'ff9dddaef1f0c7938d7a4a170abef24c70e4cec7', + '164845c52a9407f3406494f87523f2956c2b7936', + '3a3af9d672ad2166737758f4e35ac6fd6f1235f9', + 'ee09d6c4ac3fbfc99635875d18f2aa98037d2602', + 'd746ac8d782f94d12d176c7a591f5bf8365bef3d', + '520de75a0373643c14168536940e596ff8ece24c', + 'e715c457b4a3e51214b62f49f05303bba4ee5be9', + '1d31472f4ed71162268afb92a5bf9d60b130317d', + '9218bf25ba0d146a320ef3be7ebb85069cbe3353', + 'de503eb9fe4e68aa556abf94649dcd87ef42c985', + '9071c16e86e86cb94e5364b580522b3aca55cb4d', + '8d0770159e22943c37962b4d203fb85bf3057b3f', + '9456c69274d4d608971d4d92f6218185d0831b11', + 'a91d3667c0c1f5344d6b41115506c888ca0b90c9', + '9ccea33130f6e22bf0dec9448e0ecbbfa987ee42', + 'db35d0216ac55ef46420b5228263bb04655599a4', + '36a291fa2c43bc42b8b589d3fb7e7a121868870d', + '20b4b5ac6ddf68767e0da6765bcb0b389425d252', + 'd700ab31f4027a274b87288930c7a7d7fe0eae95', + '489b75de1aeb6fe94e3dd930a231b7587b66d08f', + '046f085572c0cd72127a3ae7e26b1f9881247840', + '90f94b559aa94d5354326a6c0516c8f681930b57', + '8f7cebbc8213cbf0a4cc5b80da080c1b42375983', + 'fce4a5526d6d541d9f971e5cd15d98376b6ff607', + 'd6350f9158825662b99e4b5e0442bcc94d39bc11', + 'e233d2b45b8287acabf43702f6d9b94f2cee3658', + '9626816275585ac3443e7cddd1272c8652c23f1d', + '56dbd77df6e7034fad4699736ce200cd74c45a2f', + '4884e30b93b3c4c123a83154516196095f9e831e', + '1516361918bfd02ddd460489f438e153c918521c', + 'f0985ae3a3d69ba4ae8696120d38f4dd9cd39fc4', + 'a1c8f84670da9a3371bc5832e86c8d32826b2f2e', + '143b738a1e054cc48c925fd3605b39bca3dd5971', + '952dbc5e95b87538f3aac71306651f179bc2e90a', + '7ea92a937f5755b40ac3d99ed37c53b40359b0a2', + 'e473f25d192d5cb180d3718ed8e0e8c4f5db8245', + '05f157d8e8aa4b700b18e244f9813e0bf9fdf85a', + '1487afc813124abbeb0629d2172be0f01ccec3bf', + '0bfc37e2db0b10da237195561dd37dfe7ecdf923', + '8e098d2042ad9b9074f52cc06b89d6d4db5231dd', + '5c15e604c4207f52c8cf58fe21e63164c230e257', + '020ebeb40642bfb4bc3d9f6d28c098afc0a47481', + '510c312730b03cb91ab24e25ec2937cd4aaad767', + 'f6c6531bfadd0535894ae67be0eaa274d7ec7feb', + '25f384bd95e218f6ac37fcaca99ed40f36760d8c', + '70d0495ea46072bead82429fb405d60438036524', + 'fd7c4e2ef9f9ab457d9a15bf2fbbc6bebf0fe971', + 'aeb882df790ac1c25697954b2bf5cbb3a4ed06f9', + '31b9c54042b6cc1d1a388af1463e40baa9b37e7c', + '92c0f2f3239f1f61496997bd2cdc197ec51bd423', + 'c425ffbcc0c1ae0e0be7435f26f341f5ed4016c7', + '4a48d3f5c2058c9172c1a267beac6dac0b664d29', + '01e25f93b2e2b6d3ab6253619ee9ac66cc6568cc', + '079b201da1b30115767f4eb1393ca397f94ac947', + 'e84d35cb7f1b7ec84207edcd53c6ff16340147fa', + '1b982d94d3c62813053c998c0af83a3b1c9c4db2', + 'ce59b0c52f73407a8bcf95c604803dd8c9c30986', + '93a1b6e71cbd6b650254db1bbd9700d66716090e', + '935aba04a2468e2c09e10c64c6deabdd107892d1', + '9c51c1a119137cd17ed5ae09daa80c1cab6ac01d', + '71dcbdcfcbb548b5b8a54ce04f6290abea07b491', + 'c18996ca488753f714d36d4654715927c1d7f9c2', + '376a17e734d827276b8dd3fdc44077aa000b0f5a', + 'ec7c11ddc00bb8c3ddba97805811cd408261778f', + '21cc6c7696e56d550664548768e84f0f1e40615d', + '32e8ffd44b23769472abe62635005bf13538a167', + 'cfde892411994074f8c3b3127c5c493924909434', + '820321da50156ec53ea9afbb59bdc298262c1d0a', + '583f6a828d1723237b958b7b9a9249137f5efa76', + '70d5c5b51e7c9705dbf50c1ca7af49e4c033022b', + '7d332c8adf25a2179e031be9c20bc346d20aee1d', + '13807367799a8592ecbc0ae4cab683a8e213a741', + '4262bceff4420f24349944b3d9a02fd331ca9f34', + 'f1b6977e5ca6c115de6361737743b33f3f072ee3', + '086d2bacf441cef45ff15b5afe163d0b03a9f7ea', + '32de523ba228dd3f3159eb5a6cc07b6fd51f4dc0', + '00d1bc8dc16672f7059f24c1cc097bd4fc62b846', + '7a88e0eabf60af5ac61240fe60f8f08fa3e48ab4', + '8671dfd2f34302c1a4dcb4dd7361568a0bb23eba', + '2d2c1a3dc98ca868d1f2bfe76b8a1bb820857c5a', + 'c51f09467930d70e6c2955093fd8094cc102152a', + 'da4b6dd82dce4b22785e2a9699969d0b008a7623', + 'c9282bbb89d3f9f5f1d972a02f96a5f0f0f40df8', + '893e32a92321e288e2d5d9d5d0d06d274cdc9e03', + '0ddd797e39c5fe706ed4ee62f96becb792aee03a', + '2675ef3adf52ebf8a44ff5da4306c293dfa6f901', + '764cd0ccbe170699c7ea616d8172d621dde290fd', + '412bb061e08c29d46b84dbf0f07a82abb0887ec5', + 'f076bfc286216998c89ddb2c3e7926efaa2e961a', + 'aad3aeb7fdd9f04b0ffd1460252a50b7a84c6421', + '31b1710553d85d656a80e641c1091efc56a41258', + '1ed8d6c4385666f1f6f0d9aff2c468409674b318', + 'd12e201ba3f47c74e40e774ee48065fb0abf5ace', + '0f146009c7cf3f321af93dbc64c07459202904b7', + '2df2d0a3e95c6094d3a4b14cd313e95c407aff29', + '0e552bb2627f2ae7a0c7a780f3d59c3232789de2', + 'e15556732b56d86ddd459d704a69eeb3efe5ff85', + '358536c8512d0e7dbb479862ec3ad48fc129f16a', + '6b616b05e849a3578e2eeadf978f7a898ab4969f', + '6844d720c70fad79218f91661a7177b67b79a8d4', + 'de48c1fd2f803a4187a507d8de7b6606ba9a42b7', + '593b9b7e8f41f89188f9c4e9e71750f4b767e72b', + '3772507e49303f6db071f6361494deaafcbbf4cb', + '36147238d4f6a15cca48aa4b173496af41c79b43', + '2011df2d2ba878bee3edbdec893c1996816f49ab', + 'a96b79f19bf199153dd46932138530803bdc2a67', + 'a8910051dbbd27e9e2209d099984e94b96740328', + 'dfc74021a0743d5bbfc09fcb73970a6b280bb1d3', + 'd0dec51ee295fae711466a6642749217b6e48032', + '0e6d460ad5589ac6be39a93944ec08a699f89222', + '66d0098355a01201c8b390bc7a573d8ef99ad425', + 'cb770b3580d7e118e29c0a996d4f9840d9180efb', + 'dcd080312e011c799fe21ac67d56ee2bf84e6486', + '9b83833ba4b3432ddebb22c46061c811c04b3561', + '1742d08487674d3d63766de72fe48af6407f1560', + 'c73409178a35717a9a735aea942945fca53604fc', + 'da9cfea873671b7bacbe79ec331fc6073f50e1a2', + '222ebc0427471470cc3d6bbefd3f35dc32a9f388', + 'b21b72c1fb29f6dcb866cf7d148428d885ad42ea', + 'a77d47871d1b29b7aee4d1e4a646b06253475fe3', + 'af0f5d9e055d07c8308da7f6726562420ff0bb82', + '8f371083ec59446c7e481b13d70dc1411ecd73b9', + '2840e7087b8d57c860b8b6b3ba646b60ce293991', + 'b2bfb283db6af9f6d2c7b0daf27cbe5470b09913', + '748896c0e2d1388fb1dead2b7ee0f59a96e8af81', + 'cdd6dfd70b2e7984744f71cb7e9451fbf8bdd263', + '617886394bee35c359766fb4d9ae889b8fd39079', + '77912e1d53cec04f2343a754dd3ccb1853c5ea66', + '244521dec0e946eca601a520a324610add18350f', +]; + +export const GAMING = { + title: __('Gaming'), + route: '/$/gaming', + icon: ICONS.GAMING, + link: `/$/${PAGES.DISCOVER}?${CS.CLAIM_TYPE}=${CS.CLAIM_STREAM}&${CS.CHANNEL_IDS_KEY}=${GAMING_CHANNEL_IDS.join( + ',' + )}`, + options: { + orderBy: ['release_time'], + pageSize: 12, + channelIds: GAMING_CHANNEL_IDS, + limitClaimsPerChannel: 3, + releaseTime: `>${Math.floor(moment().subtract(1, 'months').startOf('week').unix())}`, + }, +}; + +export const COMMUNITY_CHANNEL_IDS = [ + '90b566f5aca9c9a3b23b56cf6d75c07493737bc9', + '1aa69a21a8d7e7bab3f9366aba52936e3ddc5330', + '1cdb5d0bdcb484907d0a2fea4efdfe0153838642', + '55f552c153a6922798ce9f6d429b69c87c4c992a', + 'b516294f541a18ce00b71a60b2c82ad2f87ff78d', + 'ca43e7e24420ff5276694b8251643efd97271be1', + '297abfc0e8d63be217952ef20206a447de677d84', + '89985db232ec2a9a31dbd985196de817da223fe6', + '187bf3616318b4bfb85223fc40724c307696f0c6', + 'c7d2d5150a331e1696d95abb9a7b59d837c4e5a1', + 'e8b0d5e34558b8a852374fd40af1c0150a65504b', + 'ebdee96e9a17c9e5fe7627cc644eb75bd068a6ec', + 'e50f82e2236274c54af762a9c2b897646477ef62', + '797a528c49b6535560f7fd8222b121b0223287c8', + '935e7ed2c8b2a184ba2f39167f0201a74910235b', + 'a2e1bb1fed32c6a6290b679785dd31ca5c59cb5f', + 'c64f446ba359272f36c5b4abe02109d0a25bbbef', + '26b498d808f8ed9955caaf7e27cef31b20b2c87a', + '58b9503ee85cf5bb5268b4fd75644ea17b6c0d5d', + 'df961194a798cc76306b9290701130c592530fb6', + '0831bef6095a57ec440f626aac2a650a20282945', + '7109221d4047efb7e94b1d55c781757702a66f32', + 'f456460846ee417b9d8d333a5d71a5bd7867cc61', + 'ea1888b5758a23ff3c62b9a3fe07badb3e403cde', + '3fe68ad3da93065e35c37b14fbeef88b4b7785ed', + '4fa230f864cc4cd9c7d9962c042c49f35e913ffe', + '74e380497449d9eb13de9bc4038676097e4730fe', + 'c113df372c5bf801e6afebb700ce01347b211911', + 'e328468c130c232dcd282538b187e03dcfdbc13f', + 'e228ccf0ee188ef41372a8d7abdf9ce1c3408442', + 'c3f55aa9cb1d57828a468c7a6d02df42627a9524', + '08f31fe3fa6caa14799d7a7d1de8713553f5e8ee', + '5dfe76321bde01412ccad93a5a4ff48240c56bd6', + '32b91e45b29ca8d3af9ca9f9580601c53bd88974', + 'b22b497df412cd904c3be94e237a1f4693250ba8', + '5db02b3127911ac154fe951871c81c20d3902498', + 'f9711aef0efe74352c4315a2e2f9aba74d5c0ff5', + '4ad942982e43326c7700b1b6443049b3cfd82161', + 'c64f446ba359272f36c5b4abe02109d0a25bbbef', + '50d9c04b064b52249ceed889c55fff8db3dedb78', + 'a1c8f84670da9a3371bc5832e86c8d32826b2f2e', + '5c4370bfff3070458df198f6ba60c6eb1244c014', + 'b032695b52a78e0f5251b8d7f2f32183a5985d19', + 'a6a3b8eb73f184949add50257e1d1ad2fe2d8425', + '15f986a262fc6eff5774050c94d174c0533d505d', + '8e9ef4a69ef17507d1a3649573999a61e97f262c', + '2beb4ed8985dcc5b11334722abb024af1556415e', + 'b12e255e9f84d8b4ed86343b27676dccbc8b6d8b', + '50ebba2b06908f93d7963b1c6826cc0fd6104477', + '3c8b9829b664279c1ee285cb383c6d753a60c6c3', + '06980eeb4d2d1bc26ba2763177f1a71124d7dd78', + 'fd1aee1d4858ec2ef6ccc3e60504c76e9d774386', + 'f32f020e2885d763627a0c71dae86c7c33e1f693', + '58326307ddf6e9da5c4c09684f3885aad594a1c1', + 'be757c3bff18e553b9692930a7c1c85962cd69d9', + '273a2fa759f1a9f56b078633ea2f08fc2406002a', + '0739af4338a3e9c2307c4170107b30c0af1e1a1f', + 'a0c3cb01bc135a1135fcf710dd2b5f9c5d6cb2b7', + '5f22b6daf7204d73cf79d3ff0b46fc4fe237c7f7', + 'a72f265d045b18979d6a5ff785888f895b36cfd1', + '2e4c63a39e28e8e2bcac74debece9f7893fc3fe5', + '3583f5a570af6870504eea5a5f7afad6e1508508', + '6f0e439410756702b74876625cfffe2392bce31e', + '6b85c13a1b69740f548508ed8e50d757e7cf7b7e', + 'f399d873e0c37cf24de9569b5f22bbb30a5c6709', + 'e9267c855fce214463eff0b4fe9d6aa82bb66dd3', + 'b8a7f336f1aa1a6f459eb0dca1073cdeaf32527a', + 'ba79c80788a9e1751e49ad401f5692d86f73a2db', + 'ffdc62ac2f7549398d3aca9d2119e83d80d588d5', + 'ca1fd651c9d14bf2e5088bb2aa0146ee7aeb2ae0', + 'faed2b028a9b5a712d5180eaa6fd2aa619f941bc', + '87ef9ba36019f7f3bf217cf47511645893b13f2e', + '83725c7ee23bd4a8ca28a4fab0e313409def1dc7', + '0c00037101e2d9a14a7713ec057a49e794d26f35', + '52b08a58c4cbf86bb98e55685b6e778bb111e6fe', + '80f78c4b8591390758b9e6303eaf9087180444ad', + 'ac415179241e0cd8a14ed71175b759254d381137', + '38d5458f6e34d4b1e8fa1357408d08070e6a914c', + '88e2a1fe83f1efe3c07ef89b49d650645607553a', + '8903ed7a5937fffeedacc1ada02a8a391e877b11', + '968aadb8205becc89ecf808f82c3736f1d8ac8cd', + '851f7d55176669b219e1cbb2ebf76badaaf0665d', + '7243e2e5a6ef8a110f07d4f3b633c20c904e6527', + '056399cdf0860f95422f854ba95c1759f1d19564', + 'ab2d2fd8180b5568b6fbbf7d4dbce12335211e03', + 'c5724e280283cd985186af9a62494aae377daabd', + '9a5dfcb1a4b29c3a1598392d039744b9938b5a26', + '46be492ee0f56db11e005991c537c867a8682f77', + '4b602d7a3e268abb45951f623a109d2a131ab0ba', + '69611f33c5c77c00482b17d0be60b2919f7d96da', + '29193e9240a71a735639c66ee954e68414f11236', + '311a7f1387207afac9bcc513ae11e9f89399adf3', + 'a2aab4245eed5e00f6571e32ec822d93307e491c', + 'cfabf9da70f1d7ffa54c1a8f9ae4076512381104', + '44c49bbab8a3e9999f3ba9dee0186288b1d960a7', + '43f1605fb19313b7eb160ce346b22e2401f21149', + 'c3dd0196908978d9b82485e1debc5a3c03ca3c31', + '89c4cf244099918b1d3ed413df27d4216e97b499', + '5f1cac62e73072aed515557f1a608936a75b53b5', + 'e2d0317848b749498a13bf87874e0e8505041287', + '28a351f8fa72ae951f2e06abd9214dfae8d4ac83', + '0c978becd7fdcf88c24a78b9ce10b2d30e8a14d0', + '825aa21c8c0bda4ded3e69a69238763c8cfcc13b', + '0b3873a94928b67215f0b85d18a9bcb9283d91c8', + '64d370321db76980ca4e566654d09584c6b6cd70', + 'fee415182e20af42122bea8d1682dc6a4d99a0d6', + 'e3ecd1865a45a7b120c491a7e8bc7d5b43aae029', + 'f54fe46c7ae4b5a668073458bedff2d2ab3457e9', + '116d17f196e19681d00d19803d2674cd740391dc', + '9615932281a64a7888074d28b4fa3dc1d95027e2', + '020f649cca9ade46d4593441a97a86f2aaffb029', + '872150e55792c96fe337ff569b88e62b1c824f0c', + '0f8737fb29eca2d026b611c56ded69bed2f7897a', + 'd58b6a17d81b681a84e1194a218874ba11ce4fed', + '30ffa4c263d34ca38f6eb0e18925e872a3a32498', + 'd42f185080b262cbd45d55415692646aed999f76', + '9f376e4ad52ed33779647aca6fcb5b0a12e6c133', + '0a4e4d2994c5bf08f28aa8020ccc24e3ff2a2888', + '657a0b90a024535f7dd35ba927901f98a3ee7271', + '716b6d16d5b9b0c89f9bf9288bd9471bf5924082', + 'a9a4cf41533be5bce1d0440aeac0630e9f3d3730', + '43c099ed473395c40007da7628730d812a882628', + '4fd6950858377dc247952b6c94065273c8fd083e', + '3860625465ceb3098c2b7ab9e8ce567a288b5f4e', + '693d8aa643c30d4afb1a5e712ec57ac4ae699b26', + '718be0a9623a66a8c58dd5d9fd94aa214ad3e5cd', + 'c9f8ad37369bbd3c89322b1cbab0dd8f8b8b0925', + 'e29e2ced2f8b829f4a056b593ca673575ffada33', + 'fc824b22a178e7337c12a9b597c54e6678e42a6a', + 'f40f4a4546dabc9c47d9c75d0e5c0a9ba8581bec', + 'ba19d7e59726d73bba441460ed1345c57230cfa9', + '638f9e7b024efc24a14c161f8ccf4bacbcfda10b', + '61c93b69f7611337c3eae39ddbbc25acfa568112', + '44492321a13a0087c12394d4fb48c208ca6d4b27', + '2b606fa484378821f63b503c2bc4ba1a53d671f4', + 'c8a18f3d0c900e169c847df8390cac9993868475', + 'fa645836a9b694dc525289598cec9d7bc84eb968', + '261d1fb370fc73910642efddc3955a839d6cf674', + '38a83de67a246c72cd793104073968d7440e3509', + '1e2ba4bfa1a1812b71bffd7ae40d4ce3a61edb4a', + '1576023fb1869655ebdebd9e5b45dc4b06adbb91', + '4c4c9e44dd32e618ce56c7ca2e2e2b53e8027779', + '433882d9593c8b807b40bdd367afed545b6f5840', + '1dd1f89c9fec0450b8f446d88c8ca7eae806c54e', +]; + +export const COMMUNITY = { + title: __('Nice People'), + route: '/$/community', + icon: ICONS.COMMUNITY, + link: `/$/${PAGES.DISCOVER}?${CS.CLAIM_TYPE}=${CS.CLAIM_STREAM}&${CS.CHANNEL_IDS_KEY}=${COMMUNITY_CHANNEL_IDS.join( + ',' + )}`, + options: { + orderBy: ['release_time'], + pageSize: 16, + channelIds: COMMUNITY_CHANNEL_IDS, + limitClaimsPerChannel: 3, + releaseTime: `>${Math.floor(moment().subtract(1, 'months').startOf('week').unix())}`, + }, +}; + +export const TECHNOLOGY_CHANNEL_IDS = [ + 'fdc3b71d6e99fe305863ac72721637d2ce49d1ad', + '8cbef9a7778b528a6183b4bb25bb748bf016b7ca', + '70d6386888708ce5559ca225120b2801f6e052bd', + '3e465c0163d8ab5635edb49e6f8f3933fa9cf42a', + '78d20123fdf5fbcfa2b2a5b71875a3e7e37a8d41', + '12f1f69fe070a79d171c5964e5a1053b26cb6df6', + '55f552c153a6922798ce9f6d429b69c87c4c992a', + '4f0686070ce0ec410ffa10bd46682f54b8d6d94c', + 'f33657a2fcbab2dc3ce555d5d6728f8758af7bc7', + '2f229d3ac26aa655c5123c29f1f7352403279ca3', + '8539673ff55e10a7ef2859d16194ad92c4d3a412', + '5af39f818f668d8c00943c9326c5201c4fe3c423', + '7b23cca3f49059f005e812be03931c81272eaac4', + '70645fd323c8730d7fab5528e4fa5883ecebe78a', + 'fba22d346111304c39b51ffc2740238a1449e5fd', + '3e465c0163d8ab5635edb49e6f8f3933fa9cf42a', + 'd9535951222dd7a1ff7f763872cb0df44f7962bf', + '3818d442f75be9c3685b6ad58e5ceb8569ade5ee', + '87b2669c65c60a36aa408f0177517a192db194a7', + '48c7ea8bc2c4adba09bf21a29689e3b8c2967522', + '2a6194792beac5130641e932b5ac6e5a99b5ca4f', + '6e29e20a77e1a6181e60ca19b0f83e8223416aa8', + '918be99daff84a69e1458cfabfda219f2a05271b', + '0afddbd02b7068c89d0bce77a0481875c159115f', + 'cda82633c939eb0d605c148277669cfe53cf2b72', + 'd2d3ac174a107b846f497be701e232539c4511f1', + 'a52425228572850f40651d2f8fe965a7d1f7d003', + 'feb61536c007cdf4faeeaab4876cb397feaf6b51', + '2305db36455aa0d18571015b9e9bd0950262aa0f', + 'a58a006307d0d579792dc677c27f2b6b0422b362', + 'fff58293070966ba11c7a978bc895320e80beab3', + '243b6f18093ff97c861d0568c7d3379606201a4b', + 'a9d289718f3f14e3d1fa8da7a7fcfdb6f40ae2d7', + '5af39f818f668d8c00943c9326c5201c4fe3c423', + '26c9b54d7e47dc8f7dc847821b26fce3009ee1a0', + 'fddb293b297417d753d0175be69a11e59b22ad57', + 'd95fff35a8bb853b9d80c93d7c0dee0b92beab3c', + '6a4fa1a68b92336e64006a4310cb160b07854329', + '6453f3d359787856c98f58dd13da44db282904de', + 'd0b97ba2a5eb024f4cc1d972b1c52896f37c32ed', + '70645fd323c8730d7fab5528e4fa5883ecebe78a', + 'ff9dddaef1f0c7938d7a4a170abef24c70e4cec7', + '6569758308f12a66001e28f5e6056cb84334e69c', + '5fbfcf517d3df749bd032a44c1946b2baa738ecb', + '74333143a3dcc001a5602aa524583fc75a013d75', + '0d4e104ffc0ff0a6c8701e67cf13760f4e0335a8', + '7b1c72ba903af4aecdc2595397a9cb91bb7f188d', + '6c412e4afc8258ab65d83900b46289d68abc3872', + 'fb364ef587872515f545a5b4b3182b58073f230f', + '589276465a23c589801d874f484cc39f307d7ec7', + 'ba79c80788a9e1751e49ad401f5692d86f73a2db', + '5b7c7a202201033d99e1be2930d290c127c0f4fe', + '7f9187dcb2a144c4d71cbab6756e3b1136db18b2', + 'a9d289718f3f14e3d1fa8da7a7fcfdb6f40ae2d7', + 'c5cd9b63e2ba0abc191feae48238f464baecb147', + '70d0495ea46072bead82429fb405d60438036524', + 'feb61536c007cdf4faeeaab4876cb397feaf6b51', + '0e2b5b4cf59e859860000ff123dc12a317ad416b', + '9a311e766fcbc69bd9f37fd068843a1a8b1aeb02', + 'c18996ca488753f714d36d4654715927c1d7f9c2', + '7a8954b2c09cb835f4b90be69fd4a5fc4f1b5f04', + '218bf13edaf0add8e60d88ab6a9d4584d7e0588a', + '6ce715e99c42b57eaa6303babbfc49386eeb1f61', + '3b807b82be6fadc0db4a057955766cea230839b9', + 'e8f68563d242f6ac9784dcbc41dd86c28a9391d6', + 'b0e489f986c345aef23c4a48d91cbcf5a6fdb9ac', + '4e17d248adc0128afe969c2e1327e10afd9cb921', + '56e86eb938c0b93beccde0fbaaead65755139a10', + '68044a0cf5ed7534872af5149d4e0c43a9a1d06a', + '8914f8e31ae94b9d9c2011b10b43d72283beae4f', + '5fc52291980268b82413ca4c0ace1b8d749f3ffb', + 'b9288432bd089c6f332145aab08a56eec155f307', + '4967034d0978c239b6e0bd4b1fea04d918c13a10', + 'edf63b41a82a93bad1d53b159af2e7e1fe119a5e', + '7d22a93f22e97ea2f2492ea290d044468067636d', + '5327b233d7128e8d806266f2f486a4e48ed325c1', + '5ca8477d50ac027e7cafc307139a58b34d01d658', + '63af489a47df203f0f7b95b88a9cffc6900d3929', + '5d9ea5ea1e333256ba3f18fce533b8cb26abc06a', + '61c4e8636704f2f38bbe88b1f30ef0d74d6c0f49', + '4a334a7388b6996b4148a33947f4bdbe324dce95', + '43fa9aec16c55f537e395f27b7185c0d812dd89a', + '2332c0df0bd5e046db04fe7e3e79f756d35a1523', + '1312bc5e063ba9a14b406b531a7fec1e55b3afaf', + '02bb55c11ab338ebeafcb6a9d24f99a3909f231a', + 'aa5544b6778d3620d57d8dcd3229c6c59354857a', + '35045f3a701c49be2d0494f08f90943f3d7c2edb', + '5c2667e322c6e56dc0c4097988bc778e677aa730', + '47c6a778ea4836b0987ccc4ce27b26d5f886ec1d', + '9f93bce4cfa3a73bebcded959684baf578c9d0c9', + '0adce5aabea4e6f8384a85d831397feefc9b403b', + '25feb42a7c5351597aa084210a59f348e9467ee9', + '51ea9ea2804269cb8e2a5951406a853aa5743913', + '10cba1b5805f62e8e49ce37c8d614cec7c3c3299', + '43a052ea087e5cd2d662005e2dedaaab816e9b26', + '3ce7a61f1171a99b00c123b9ed57d55e56baf119', + 'ff1dae8d9504ee6f5212ccb1b88d0f8d403f3d8e', + 'a30c5c8cb8faf78b7ad82118e8fd7039901a5a32', + '42594e750ad68e599703fbc6199788e8cabf98c0', + 'd840185c7b98eafe676ce0c6fc9128259335c8e7', + '67649f8e3edb907d455a1cf08f3e71a6da3c1205', + '364f077b4e9685aa2f25fbd424f8e1026e73c374', + 'c9f5527c1c802924e552715901fe52af3f2d4ccc', + 'b46144501bdcdcaae536b4a2d30250398225d0a5', + '8d497e7e96c789364c56aea7a35827d2dc1eea65', +]; + +export const TECHNOLOGY = { + title: __('Tech'), + route: '/$/tech', + icon: ICONS.TECH, + link: `/$/${PAGES.DISCOVER}?${CS.CLAIM_TYPE}=${CS.CLAIM_STREAM}&${CS.CHANNEL_IDS_KEY}=${TECHNOLOGY_CHANNEL_IDS.join( + ',' + )}`, + options: { + orderBy: ['release_time'], + pageSize: 12, + channelIds: TECHNOLOGY_CHANNEL_IDS, + limitClaimsPerChannel: 3, + releaseTime: `>${Math.floor(moment().subtract(1, 'months').startOf('week').unix())}`, + }, +}; + +export const SCIENCE_CHANNEL_IDS = [ + '47c6a778ea4836b0987ccc4ce27b26d5f886ec1d', + '1bd0adfcf1c75bafc1ba3fc9b65a1a0470df6a91', + '7e1a7afadc8734b33a3e219f5668470715fb063d', + 'fb364ef587872515f545a5b4b3182b58073f230f', + 'c5cd9b63e2ba0abc191feae48238f464baecb147', + 'ba79c80788a9e1751e49ad401f5692d86f73a2db', + '589276465a23c589801d874f484cc39f307d7ec7', + 'fddb293b297417d753d0175be69a11e59b22ad57', + '5fbfcf517d3df749bd032a44c1946b2baa738ecb', + '43fa9aec16c55f537e395f27b7185c0d812dd89a', + '35045f3a701c49be2d0494f08f90943f3d7c2edb', + '55f552c153a6922798ce9f6d429b69c87c4c992a', + '87b2669c65c60a36aa408f0177517a192db194a7', + 'b79c5dee207f6429d677d65999aed96449e02092', + '5fc52291980268b82413ca4c0ace1b8d749f3ffb', + '07e4546674268fc0222b2ca22d31d0549dc217ee', + '545c86494bd5f7d9aeade8e58342e2a7ecf2f803', + 'de0fcd76d525b1db36f24523e75c28b542e92fa2', + '74333143a3dcc001a5602aa524583fc75a013d75', + '4967034d0978c239b6e0bd4b1fea04d918c13a10', + 'f54cc6a6a214ea183db11c47d7f5dc464e5bc9ef', + '4dbbe5e945ced9756327160b78c807007c2e9d72', + 'a52425228572850f40651d2f8fe965a7d1f7d003', + 'fa5b58aeba19dee98eb5c78cbc8c1d30f99acb8b', + '0d4e104ffc0ff0a6c8701e67cf13760f4e0335a8', + '6e83f36dfc16e44d8f48cd27d698ca49a6cd1402', + 'ef5eba855aabebe9292bfc10fa9b0884337ab52c', + 'c3cf3780c73279f8a20b764f2c7edea1cf380055', + '0e8d245734aab8c6825b6529a47d4cacfb3a53a8', + '918be99daff84a69e1458cfabfda219f2a05271b', + 'f82b1ddf6353454b9ba07d8c9cd758e9d4a6c148', + '46948b772a8d4eadeedbf2eadf0f6f37332cd7b8', + 'd0b97ba2a5eb024f4cc1d972b1c52896f37c32ed', + 'd4cf14c542ade693a79de689d24ec29ad73aee93', + '1feef57a100df13c84b2c03e2683498287e6781a', + '4fd4b60a7f00778ebbd150029164302fe84b7e56', + 'bd70f930e75b5886c3b66ace2d0ca31262d43a6f', + 'fe938863cb867c4e369d270bcfb062bb8281db2d', + '9826a0c0a781ce1beed3067202f8677a2740e3ba', + 'dd42c26d24c17ea326df2e4e4cb1f0e243f878a7', + '5327b233d7128e8d806266f2f486a4e48ed325c1', + 'b9288432bd089c6f332145aab08a56eec155f307', + '26c9b54d7e47dc8f7dc847821b26fce3009ee1a0', + '1df464dbb302ced815c61431a5548a273e6de8e1', + '2b6e925856bf5903be02ad1ea68469f084cd3b40', + '243b6f18093ff97c861d0568c7d3379606201a4b', + '5298af1ba35f126013e5d10217a7316f5c909e46', + '6768e311f5da5f286da963ff63026d88d215b747', + '8d45230d1c4e1e56dd3821bfbbe7d2af0369d8ed', + 'b1c26a3b6d4ce2b86ad011b2dd4d2bf8fa6c4d10', + 'b00669ef11a3d05d81d5e733674cb6234055cffd', + '264ad327b0927908b929f752ac96efe89f9450fa', + 'd6d17103b4aadd46c47236431eb7a96427ef98d7', + '9ed727bfe93f0b740bd46efcbbc86e839b77f17e', +]; + +export const SCIENCE = { + title: __('Lab'), + route: '/$/lab', + icon: ICONS.SCIENCE, + options: { + orderBy: ['release_time'], + pageSize: 12, + channelIds: SCIENCE_CHANNEL_IDS, + limitClaimsPerChannel: 3, + releaseTime: `>${Math.floor(moment().subtract(1, 'months').startOf('week').unix())}`, + }, +}; + +export const NEWS_CHANNEL_IDS = [ + '9614a4fcf9d91e4588eb512165e9c0475f857555', + '70e56234217f30317c0e67fd0eede6e82b74aea0', + '760da3ba3dd85830a843beaaed543a89b7a367e7', + 'c9da929d12afe6066acc89eb044b552f0d63782a', + 'ab524c5a1902d7a0f072ebc4d093a0e500704202', + '21aab81cf6b7f3eac2a5d934d35328560ba6fc9f', + '9b8a09c41c834f0d629cea4a083f86e4645feb0d', + '84edf7e474aba8a285d42a2ac1792801c5a2ca40', + '69b3c0cae5d30be16423b931c4552ed050a244b0', + '29d63cc4b23073bb5143b15bfa7872bbce073a34', + 'c1d55ae7b8a67e7a26d1511a462203173122e61d', + '5a7d88e0f510cdb2355bc4752bf530875d741491', + 'c101bac49ec048acca169fd6090e70f7488645b1', + '3e4240ee54f465db9e41435628ed8a5895c9a654', + '8b1c54250e1eb865f657d1b3d553d541a49ee4d8', + '276112ac14f42c7c9e05cf0a063be91b46905859', + 'd34376986bc857846993ff0aa750875bf7cf1b4a', + '840a5f8f0c5b7d1b87312f9915f7cd7a9283d572', + '2556ed1cab9d17f2a9392030a9ad7f5d138f11bd', + '19f251ac6d8f2990839173d932a47b1da62da484', + 'ddb27a205f0c5d17df73277367b6ef8256e0ed01', + 'e325ffd3e6b78f95f96a0e1fe4609539f62d0fe7', + '5462a0ced61fc3f86225908608872f0fda2cbc32', + 'c4b5c6d71ac9597b69c5559ca0f03691f58370a9', + '0475ed551e9513cbf81d2bec27488b9f5ea78d9a', + '8954add966e59c9cba98a143a3387f788a36d7be', + '79162cdb9d5ae8d7502089a38bdaaf81f902bf0c', + 'b57fb7641efdeb7af52bf96abb280d84c45587cc', + '833fa9985192d2a185806cad08d4dc9910b1b4ef', + '5e7a90800637e828ef5a58ec747a68840a4038d8', + '1576023fb1869655ebdebd9e5b45dc4b06adbb91', +]; + +export const NEWS = { + title: __('News'), + route: '/$/news', + icon: ICONS.NEWS, + link: `/$/${PAGES.DISCOVER}?${CS.CLAIM_TYPE}=${CS.CLAIM_STREAM}&${CS.CHANNEL_IDS_KEY}=${NEWS_CHANNEL_IDS.join(',')}`, + options: { + orderBy: ['release_time'], + pageSize: 8, + channelIds: NEWS_CHANNEL_IDS, + limitClaimsPerChannel: 3, + releaseTime: `>${Math.floor(moment().subtract(1, 'months').startOf('week').unix())}`, + }, +}; + +export const FINCANCE_CHANNEL_IDS = [ + '29dd91896150d5383a5daef66247b9eb2523673f', + 'ac471128a5ed05b80365170b29997d860afa33b7', + '4284dc016523121128f4ffa45b983c24cc9136a3', + '74067192483939e846e1a8dd7b4bf1678ca5b0c5', + 'de7eda0eaaac4b29968af67d2d4b4ede54251699', + 'bfaafff1703523f4b3bcc9135d873fbbf5c9f138', + 'f0cb90bbe9ba6cf958a3fc2261a6743997e13551', + '1c9434d6111e27189fe023bb02a4b3e434209a62', + '7b6f7517f6b816827d076fa0eaad550aa315a4e7', + 'a938670c73275d9c6f1b70daf0bb1a5414e88c0b', + 'e50beec197c7d1cd2f9e6ce0f4176fee9d4949b9', + '26a76095b3add8301cc15641b5c5bbb3029f6e06', + 'f3c286bf1d9c440a479d5cea3e59fca67f4cc571', + 'a6bb2c7cfc4633f53941713bd0e6fe62c7646a6d', + 'ff80e24f41a2d706c70df9779542cba4715216c9', + '7a9c2e888ae46f26e8c3be98a0e38da1743f473c', + '4ee7cfaf1fc50a6df858ed0b99c278d633bccca9', + '4de2b2d04c7734a863f217951f66e265294f2c24', + '82679841636273c8b73abd7927b1d49769f146c9', + 'bd02ed31604feac8665f8694a10c95a7690d3088', + 'f08b8f02d8031a1ff114840857e7c40ebf50d1e9', + '680f16c5a8d0108239108cfa96505d40601ae7a2', + '9f298dbb29674fe4959b0aadb7d8d88a69331892', + 'a181bdf7ced0a7c9159906c27f71f80309944bfa', + '8e5c01528ba74261ee8b1410214eacd12c27fdc8', + 'd300bbae741c7cd8f90ae964698f24e2b4251635', + 'b96d57fbb37ef76cb9a3a9d4a6dbfa4f427b5108', + '0fc0fa43e7d5c95e701add3e71358b979a5f4f9d', + '8e83a89570b0b24b28d540c88594adc3a19d1483', + '11836afd765f135d7ce51b66d2af6b30aafa687a', + 'd5606663658481f3452cf6ba8eabf77451d0ce07', + 'ebc4214424cfa683a7046e1f794fea1e44788d84', + '0edad9e2b95e178ace67dddcd3c01085930b296f', + '29cc7f6081268eaa5b3f2946e0cd0b952a94812c', + 'c38f46508c77fc375898ef97de979e18c3ea82f0', + '828174a6adcdeee74de5211db1d006716aa54d07', + '3247ca511495e06cc5e4868ba6c3dfb5d0f10008', + '4da85b12244839d6368b9290f1619ff9514ab2a8', + '50ad846a4b1543b847bf3fdafb7b45f6b2f5844c', + '9ca6e62b04b6355ee15fb6a00588358f3847e37a', + '3134864016d0be0b831dbe9a3048242d00a42475', + 'ad4dca5a634a89bd5410c009665e9daaa444c7b3', + 'd7ea64522a3b7fccb182cd275fc8556d512a720f', + '579563946c1123a67f6dd417c2ed19d24c135a80', + '20ba0b4afe9ca31d7fb37742519a987fad31fb12', + '53d679982abe3f17ea2691b37fc757518d0417bf', + '9d09d9e9545bd4de0a55625afa43cd8ca123d10d', + '40c36948f0da072dcba3e4833e90f71e16de78be', + '84342ae85d216d5ffc0ef149a123aae649d5c253', + '19a07e69b84ffa9db9324e237ed28fd8ec33f9c5', + '7a095af7b427efdaf2577ef264c72741c760fc31', + 'b48863a2f343c3d1869cf02691862f1cee3ac2dd', + '060940e41973d4f7f16d72a2733138e931c35f41', + 'af9547659bec3fd214c7ddc9f0c7fc86bf5adfff', + 'c5b0b17838df2f6c31162f64d55f60f34ae8bfc6', + 'b325961c50c986f2022313220e5b98da9b0004bc', + 'fb7209b5061de8776bfe1df0795a8a2588ef4108', + '0a1d9a8240df94ac365e49e4311c44d38b819dcb', + 'b1923f8c6a01f69c6980b193a2d8d2c47a354328', + 'a403ce7eff82b75a530dffd211ddc69847be4425', + '7a95519d4beba3b7657713fb020f180af807d309', + 'a0692fd6261e2c77827321705056838fb49fc951', + '8972a1bd06de5186e5e89292b05aac8aaa817791', + 'e73639dee45f76c8ca8275d29792d64b4a4525f4', + '04784caee866e077d46ad9f34a14cc84a289b80c', + '96ede5667bc4533ace8cfcbde4f33aa9fe1ae5f5', + 'bca584685bd0fb5760f46e6a060a1b2c68c99b46', + 'd208b2677c169a4d90b4c97250dde031da6d3c10', + 'd6e2ff2e46822d5ad9a9df89549f7ea5a6bf5255', + 'e06849202121aa4ceac73da1b581a552197e5661', + '726fde854edc58a0d385aad398bf416a0316d748', + 'c62ee910262e0a126181dc454b0556a174bfb120', + '87ef9ba36019f7f3bf217cf47511645893b13f2e', + '699b0ad4913a31b3315b6f1c722685dfaff426a8', + 'cda9c4e92f19d6fe0764524a2012056e06ca2055', + 'a21c363963e130dc77cd62bbde39e745206654c0', + '77ac5ad623a63fd526b8c67f5fceb95ccbfdcbb1', + '9576be30de21b3b755828314d6ccbbaa3334f43a', + '1e86953852705f11b8f01ed62eb3d4cfa3443597', + '97f52bb1d107c32527326650fce8b5a652707227', + 'c9a3cf2234af0888b6be256adc13613d76e74fe2', + '097591ffe010e7b9b1641b967f9f94e66c683acf', + '9b6d9cc2783d1586763370231e7fac4b3b97ec70', + 'd000b2fec8d46d9a7cb9a12ee3cf598d11b24918', + '6977c53ca432fd49f5d441a08da01930eb74401d', + '183638482bda8aca67a57f577c927c0649062c9e', + 'ca1727de1ccaa2de2fb74fefdfcf3d630f3cae12', + '3fda836a92faaceedfe398225fb9b2ee2ed1f01a', + 'c6571998fb5cef27fde1fd5831882a6c6816cadb', + '4474b52aeb12e69607aa34656d1d7a351e8a09d0', +]; + +export const FINANCE = { + title: __('Finance 2.0'), + icon: ICONS.FINANCE, + route: '/$/finance', + link: `/$/${PAGES.DISCOVER}?${CS.CLAIM_TYPE}=${CS.CLAIM_STREAM}&${CS.CHANNEL_IDS_KEY}=${FINCANCE_CHANNEL_IDS.join( + ',' + )}`, + options: { + orderBy: ['release_time'], + pageSize: 8, + channelIds: FINCANCE_CHANNEL_IDS, + limitClaimsPerChannel: 3, + releaseTime: `>${Math.floor(moment().subtract(1, 'months').startOf('week').unix())}`, + }, +}; + +const WILD_WEST = { + title: 'Wild West', + link: `/$/${PAGES.WILD_WEST}`, + icon: ICONS.WILD_WEST, }; export default function GetHomePageRowData( @@ -32,104 +1255,6 @@ export default function GetHomePageRowData( let rowData: Array = []; const individualTagDataItems: Array = []; - const YOUTUBER_CHANNEL_IDS = [ - 'fb364ef587872515f545a5b4b3182b58073f230f', - '589276465a23c589801d874f484cc39f307d7ec7', - 'ba79c80788a9e1751e49ad401f5692d86f73a2db', - 'b6e207c5f8c58e7c8362cd05a1501bf2f5b694f2', - 'c5724e280283cd985186af9a62494aae377daabd', - '243b6f18093ff97c861d0568c7d3379606201a4b', - '5b7c7a202201033d99e1be2930d290c127c0f4fe', - 'c9da929d12afe6066acc89eb044b552f0d63782a', - '89985db232ec2a9a31dbd985196de817da223fe6', - '187bf3616318b4bfb85223fc40724c307696f0c6', - 'aa3db8d2145340e26597b88fbb6d0e7ff09786be', - 'a9d289718f3f14e3d1fa8da7a7fcfdb6f40ae2d7', - '9a5dfcb1a4b29c3a1598392d039744b9938b5a26', - '0b998b98a2b9a88d9519739f99f2c74c95e3fc22', - '46be492ee0f56db11e005991c537c867a8682f77', - 'c5cd9b63e2ba0abc191feae48238f464baecb147', - '4b602d7a3e268abb45951f623a109d2a131ab0ba', - 'd25ae97a1516f5700fc717152b885f33da47f12b', - '8f4fecfc836ea33798ee3e5cef56926fa54e2cf9', - '8671dfd2f34302c1a4dcb4dd7361568a0bb23eba', - 'b9288432bd089c6f332145aab08a56eec155f307', - '87b13b074936b1f42a7c6758c7c2995f58c602e7', - '25f384bd95e218f6ac37fcaca99ed40f36760d8c', - '02c020b2fab7dd1fbd175c3b22947688c0a219e5', - '57dbc8fdc4d062e2824d8550861b380203539099', - '4e17d248adc0128afe969c2e1327e10afd9cb921', - '760da3ba3dd85830a843beaaed543a89b7a367e7', - '5a1b164d0a2e7adf1db08d7363ea1cb06c30cd74', - 'c9da929d12afe6066acc89eb044b552f0d63782a', - '113515e893b8186595595e594ecc410bae50c026', - '5fbfcf517d3df749bd032a44c1946b2baa738ecb', - '74333143a3dcc001a5602aa524583fc75a013d75', - '0d4e104ffc0ff0a6c8701e67cf13760f4e0335a8', - 'b924ac36b7499591f7929d9c4903de79b07b1cb9', - '13edd7e7e2fbaf845699cf2f8f0b1c095bacb05f', - '7b1c72ba903af4aecdc2595397a9cb91bb7f188d', - '6c0bf1fed2705d675da950a94e4af004ec975a06', - 'f33657a2fcbab2dc3ce555d5d6728f8758af7bc7', - '26c9b54d7e47dc8f7dc847821b26fce3009ee1a0', - '1516361918bfd02ddd460489f438e153c918521c', - 'd468989b4668bce7452fc3434a6dc7ba7d799378', - 'a1c8f84670da9a3371bc5832e86c8d32826b2f2e', - '70e56234217f30317c0e67fd0eede6e82b74aea0', - '7a88e0eabf60af5ac61240fe60f8f08fa3e48ab4', - '2f229d3ac26aa655c5123c29f1f7352403279ca3', - '7ea92a937f5755b40ac3d99ed37c53b40359b0a2', - '96ede5667bc4533ace8cfcbde4f33aa9fe1ae5f5', - '5097b175c4c58c431424ce3b60901de6ae650127', - '32de523ba228dd3f3159eb5a6cc07b6fd51f4dc0', - 'cdb6fe516afe08618b91a754f92412e7f98a8a62', - '1e9f582c2df798228e8583fe1101fee551487d4b', - 'b032695b52a78e0f5251b8d7f2f32183a5985d19', - 'c042155dfcb5c813345248bff18a62d0f585718e', - '294f5c164da5ac9735658b2d58d8fee6745dfc45', - '07e4546674268fc0222b2ca22d31d0549dc217ee', - '1487afc813124abbeb0629d2172be0f01ccec3bf', - 'ac471128a5ed05b80365170b29997d860afa33b7', - 'c101bac49ec048acca169fd6090e70f7488645b1', - 'c9282bbb89d3f9f5f1d972a02f96a5f0f0f40df8', - '9576be30de21b3b755828314d6ccbbaa3334f43a', - 'b12e255e9f84d8b4ed86343b27676dccbc8b6d8b', - '50ebba2b06908f93d7963b1c6826cc0fd6104477', - '84342ae85d216d5ffc0ef149a123aae649d5c253', - '80f78c4b8591390758b9e6303eaf9087180444ad', - '086d2bacf441cef45ff15b5afe163d0b03a9f7ea', - '5af39f818f668d8c00943c9326c5201c4fe3c423', - '057053dfb657aaa98553e2c544b06e1a2371557e', - 'fd1aee1d4858ec2ef6ccc3e60504c76e9d774386', - '930fc43ca7bae20d4706543e97175d1872b0671f', - 'e715c457b4a3e51214b62f49f05303bba4ee5be9', - 'ebf5bc6842638cefcf66904522ac96231ea7a9d8', - '1f9bb08bfa2259629f4aaa9ed40f97e9a41b6fa1', - 'ac415179241e0cd8a14ed71175b759254d381137', - '8e098d2042ad9b9074f52cc06b89d6d4db5231dd', - '149c4686ff0792b8d68dac1f17b6273a85628d34', - '199eba05b6ecccab919e26a0cb7dacd544f25700', - '6569758308f12a66001e28f5e6056cb84334e69c', - 'e50f82e2236274c54af762a9c2b897646477ef62', - '7e1a7afadc8734b33a3e219f5668470715fb063d', - 'ff80e24f41a2d706c70df9779542cba4715216c9', - 'e8f68563d242f6ac9784dcbc41dd86c28a9391d6', - ]; - - const YOUTUBE_CREATOR_ROW = { - title: __('CableTube Escape Artists'), - link: `/$/${PAGES.DISCOVER}?${CS.CLAIM_TYPE}=${CS.CLAIM_STREAM}&${CS.CHANNEL_IDS_KEY}=${YOUTUBER_CHANNEL_IDS.join( - ',' - )}`, - options: { - claimType: ['stream'], - orderBy: ['release_time'], - pageSize: getPageSize(12), - channelIds: YOUTUBER_CHANNEL_IDS, - limitClaimsPerChannel: 1, - releaseTime: `>${Math.floor(moment().subtract(1, 'months').startOf('week').unix())}`, - }, - }; if (followedTags.length) { followedTags.forEach((tag: Tag) => { @@ -153,6 +1278,7 @@ export default function GetHomePageRowData( options: { streamTypes: null, orderBy: ['release_time'], + streamTypes: CS.FILE_TYPES, releaseTime: subscribedChannels.length > 20 ? `>${Math.floor(moment().subtract(6, 'months').startOf('week').unix())}` @@ -165,93 +1291,26 @@ export default function GetHomePageRowData( }, }; - const TOP_CONTENT_TODAY = { - title: __('Top Content from Today'), - link: `/$/${PAGES.DISCOVER}?${CS.ORDER_BY_KEY}=${CS.ORDER_BY_TOP}&${CS.FRESH_KEY}=${CS.FRESH_DAY}`, - options: { - pageSize: getPageSize(showPersonalizedChannels || showPersonalizedTags ? 4 : 8), - orderBy: ['effective_amount'], - claimType: ['stream'], - limitClaimsPerChannel: 2, - releaseTime: `>${Math.floor(moment().subtract(1, 'day').startOf('day').unix())}`, - }, - }; - - const TOP_CHANNELS = { - title: __('Top Channels On LBRY'), - link: `/$/${PAGES.DISCOVER}?claim_type=channel&${CS.ORDER_BY_KEY}=${CS.ORDER_BY_TOP}&${CS.FRESH_KEY}=${CS.FRESH_ALL}`, - options: { - orderBy: ['effective_amount'], - claimType: ['channel'], - }, - }; - - // const TRENDING_CLASSICS = { - // title: __('Trending Classics'), - // link: `/$/${PAGES.DISCOVER}?${CS.ORDER_BY_KEY}=${CS.ORDER_BY_TRENDING}&${CS.FRESH_KEY}=${CS.FRESH_WEEK}`, - // options: { - // pageSize: getPageSize(4), - // claimType: ['stream'], - // limitClaimsPerChannel: 1, - // releaseTime: `<${Math.floor( - // moment() - // .subtract(6, 'month') - // .startOf('day') - // .unix() - // )}`, - // }, - // }; - - // const TRENDING_ON_LBRY = { - // title: __('Trending On LBRY'), - // link: `/$/${PAGES.DISCOVER}`, - // options: { - // pageSize: showPersonalizedChannels || showPersonalizedTags ? 4 : 8, - // }, - // }; - - const TRENDING_FOR_TAGS = { - title: __('Trending For Your Tags'), - link: `/$/${PAGES.TAGS_FOLLOWING}`, - icon: ICONS.TAG, - - options: { - pageSize: getPageSize(4), - tags: followedTags.map((tag) => tag.name), - claimType: ['stream'], - limitClaimsPerChannel: 2, - }, - }; - - const LATEST_FROM_LBRY = { - title: __('Latest From @lbry'), - link: `/@lbry:3f`, - options: { - orderBy: ['release_time'], - pageSize: getPageSize(4), - channelIds: ['3fda836a92faaceedfe398225fb9b2ee2ed1f01a'], - }, - }; - + // rowData.push(PRIMARY_CONTENT); if (showPersonalizedChannels) rowData.push(RECENT_FROM_FOLLOWING); - if (showPersonalizedTags && !showIndividualTags) rowData.push(TRENDING_FOR_TAGS); - if (showPersonalizedTags && showIndividualTags) { - individualTagDataItems.forEach((item: RowDataItem) => { - rowData.push(item); - }); - } - - if (!authenticated) { - rowData.push(YOUTUBE_CREATOR_ROW); - } - - rowData.push(TOP_CONTENT_TODAY); - - // rowData.push(TRENDING_ON_LBRY); - - rowData.push(LATEST_FROM_LBRY); - - if (!showPersonalizedChannels) rowData.push(TOP_CHANNELS); + rowData.push(ENLIGHTENMENT); + // rowData.push(PRIMARY_CONTENT_2); + rowData.push(GAMING); + rowData.push(COMMUNITY); + rowData.push(SCIENCE); + rowData.push(TECHNOLOGY); return rowData; } + +export const EXTRA_SIDEBAR_LINKS = [ + ENLIGHTENMENT, + GAMING, + SCIENCE, + TECHNOLOGY, + NEWS, + FINANCE, + COMMUNITY, + WILD_WEST, + RABBIT_HOLE, +]; diff --git a/static/app-strings.json b/static/app-strings.json index 989024c3c..d068438c6 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -879,7 +879,6 @@ "Tag selection": "Tag selection", "Select some tags to help us show you interesting things.": "Select some tags to help us show you interesting things.", "You are currently following %followingCount% tags": "You are currently following %followingCount% tags", - "You are currently following %followingCount% tag": "You are currently following %followingCount% tag", "Back": "Back", "Experimental Transcoding": "Experimental Transcoding", "A Folder containing FFmpeg": "A Folder containing FFmpeg", @@ -1459,6 +1458,7 @@ "Never fear though, there are tons of ways to earn %lbc%. You can earn or purchase %lbc%, or you can have your friends send you some.": "Never fear though, there are tons of ways to earn %lbc%. You can earn or purchase %lbc%, or you can have your friends send you some.", "gaming, comedy, educational": "gaming, comedy, educational", "A channel is required to comment on %SITE_NAME%": "A channel is required to comment on %SITE_NAME%", + "A channel is required to comment on lbry.tv": "A channel is required to comment on lbry.tv", "A welcome bonus and thank you for your contribution to content freedom.": "A welcome bonus and thank you for your contribution to content freedom.", "You earned %lbc% new user reward.": "You earned %lbc% new user reward.", "Just press play on something. Anything at all. Yep, even that one. Everybody's doing it.": "Just press play on something. Anything at all. Yep, even that one. Everybody's doing it.", diff --git a/static/img/favicon.png b/static/img/favicon.png index 4570d22484629120b2e5e96a43145ecd78a4c7e6..20e725d6e0b1b34e6f710d653af3f0f210b6e697 100644 GIT binary patch literal 3009 zcmV;y3qJITP)ITFxT0pg08;5hfK1(kk8#lp-btDBdEL2%RG(@)4?YyoO*f{&R(& zk+H{~H}l@i*v|c=6;c-LnfH0W_xtmH@Am|>uzbB3=mp>*|NTgQR{o7f;sDa*=Vt)% zzP(VimET!tK>%I=Bjl$?qpykshyvIE5bfIwrT-7)ECe5bTjZw^5&`f#fQZp>1Oq{M z0o(^LF890UVHeCpE{M)Ph)(;N|5r?=kl*}>leKM>GFcvvwhZ8fQA?X(0Elq_59OAl zuCW1hja^39*Z>5ZRrYgBnJjWIV>p^$=LIGX;91{ZXt^VS5D-BCml{5d&5G{H5m@|J z>okE@N|`JU?ku3Nv&-wzKLME03yh%C(i9{{x+#e6$?H_wU;q>lCtybFrA*KeL@$7+ zayG)^AB6RZj|+%eDEp&xC?-?9Uv0Vf%hM@A5YlY}JgL%lM z*=);iC2(+Of!pVq+zy;ydH}(8E?xZm-wE^I{}yR!AVe#I00MF^_QP+#D$D2(*$2vIg)KH+`^=$q|I`dmS6Sc);}U>Z za^90t82POPju+oj4Qlt~2&^+_Lz%+PF7`*~nBT7_bPpE)U?XqrwjcD@j4+id4!h7b zHbC{ctS)Od7^w>~Swz9#hgqSBdcXjH?tfjUoZ;)t@k4$yapp4wn^iRw^RP>)OU?vE z)B^_XfRr*>Rm+sLJ$YL*%P*?~qRuT>4Mo%%h7y(Mm>{h4%GAa?YC-0=5@9k{+5sWn zR9NYknB4u8gZP1Kq+Sh0blPEZJ5&XO3=$?|#vcfYGv26*a4$Qk2a#{2{*lSJn}^kB z5egqpZP*(!cKm>l2>ca|Yuiea-%KzqKP+jTQs$`IC4NQ5keh}C!LXgmsP^h-X^ppL zayt}xOy=RAczw5rj3GM^k|+$Y=7Cy8XqO?uW@XY43D-S9#!@{HqGn;%L7+{6^UnNA zO$750-K=K`CQF%YqjwI=EnRXN@|1_&DE@~I2(359;%?JA7?!(Nx!JCo6iZMQ5VF%Z zuIF+>yMIn=x2#Wms z0uh~d*xpSmhIklQX*%01{=w7QtyYj?GKI{wStWlmQCnUlwPW~Diw7+xQ;KS>%tJ2N z-c93VZ5xH1FUW5tApX@3(P@Wy_$N(^Bh<>#{JPRVd5ChQq_l<*>;FcJhi$Sa-4Vi2 z;c}z8)~nWr+}AFz^s!@MlrmWy23FMm`F%;FP9n&0EoV@tikz*Jk@4#2y;?&wJql2< zBb_Ek^Xok7zI;+ZZfX7SJPOuYNph<(9L=xs_^4ZFfK(lt(b({HjvXoN>>~SbZk43I z%Cc3_5U(CD!E?{tXcz}~7I?plw;ITZUN6%m6WTT&)wc&rT1>1F-8G~W+}ndY3tBlR z-s(u*qveZK>axx~x~ckPRI9+?dWkvTUiASSm1J)wJsm4tpz zB3nw@JvqW$iP28Na@tB$AeHJ5>x{1>;t3^ke(8Z>!K~QGaR2bzuN}PyE+;*qd(@|f zH3edFJGj&*b%I#@gNi#&a0O!V56V{keQ#oNJ79}V>o!5fY8Xl@23e(D_St!qm?{FI zCyY`ii`;4q`=fKnT${zgFAHs4#uCqKOg?5M-Oc{e*PA@m$ACtwss0QHBPI< zg;J^X1{&@d7LzF)&95W38f*G{ws+HQlNZylIa*XKeo4o*dgyF0g3Ps9Sr`CtIJJUy z5y569jm)?^KXFm)@BPgCQ%}~mkr|v-)FvapnP{uJEtA`!#WMR@M7aSMH?8>gU`cgV zMm88}t1_YP$q}aJ0+Je%?w^YD)C!haUQDLyn#Q!c@YIsNy--vn{Q{Yw@|%gaIpo8kzTotl zjOuLf?=(xv{^*=;%Sk)g5=O&*I`*eP(*0ABMoUm`HHL#<7H}9?(KSxUZzi~DV&>W` z(*0A|ADzQtV1>K(F~%dOt5fYM+_31hkBd$_1e+D5OcsR?yM_j9YRj}dn=VCI&Wr>tZT%N3Lb31rray!%}M_-(I&e}+k zXDWr4@MwTZpbDsp(%YCyF1whBADTpS46X3@>YT9nAAETeqQ&vzxq ziyO>KSGny6wQ>I>b&XP^x~!R&N=@9ntoe78yK1v1HWefrCC6A22q7131sJ?4326?S z@^G=s*ZavD_h_R_#zdtA^%m%S zW;eab6d zQyoZ|-2EtJvMBwTMc3E>_a#b+_r$BQfqBRU^RTP-^Csjj5R*M0(zh3ie7zV5fkSs| z)>}N)8+2toR+M(XYp5kNzUp*JsBbSMn^C9j{XWAI!B+~njXE5v)KJqlex`YE(v&k! z>m*SDA!>G8jXkLxZ7{M3&dA+I^FJ=70oyY~XkiNapCjd9pxPV4h(-(Gj4K14J z`q^`Xj2*ZFAyDD~CX~8>Mv59EU3D1?t4t`p+feZxR3yTrg2K6oOqCozSDp^3x{QSt zhT=F*)h%sGpcpA9Yul=pD-KJXDj2GPv>hW#xS`s+Dkf8E zp)kQ<22us(N+Xxp2$wUzm0+&xQm9>N09ROHZ~;=~eO-|X9(mqPNDJfJ#1a?pjIzom zPGE4^`qun{dtOx|@}80M>%M6N+e&A=%4Gn>WU3s^Tg;(@pP#kn1@|>zd?;Ue(OV7< zwLL>vZfLx&X8@Q+IZ?>H-c``*iHWv61?eZRMKb~eKmb4p09UQh1xOVbFMyz6vwE#h ze9V!1F_}Vc^$+A$V|s)e@>zeLdMZOF|%LG!Td(z!=B6%{BKc6M>H_JLgPqPy4j ziGWzvfC=y77CH&CvT zO1H`w2xxI3OPdGfhR+@n+jtZVeC3q!XGjz`x0?J9XWS#V)wK`*00000NkvXXu0mjf DkY}81 literal 1349 zcmV-L1-kl)P)2o>J5A-I_{SCaJT$iftQ>K3!_@o=42^af;o$q5C{Z9fk3by@Sga9ggHgW z?Pw2oLMQOFPFmmR_xr|ApF!M=SxB5CC&jDR;HzXQ$y%%=vlcGG?ePTsfxtlE3-KZQ z?|lgX9u|`*@cLbQ_bFgazDt>ghV44wa=9^V+P;I*wd(L~iqvE;QHq%o5)~ce)qi>c zUy6_4O9>tj-_@x*goTIu`wkz8ojP;T;;i1VksD#Ngp{jWpYKzrBWJ0yOrO61l`1G9 zR+?`ti+3vEc`6F_ADkq zCTn!~*zt(LW5cjp zS07HEKEv+`8CfQrj~O{l{(^KJFo>}52!u%SS%=m4?Vsb&XV`EI$4{MN_x=O?9@x5b zmrB}}JJ+zTS3qZu%A zG#LvQBZua}n5omP4VgG=7M=R_r&*^i^cXw@bsLui%w4h+!ycW!LEHAE%3HvO2{wRE zoIcH+V#%u2l&n#k6uI-!vTJwt9Jrj#f|aW9j3ICb_cExL9inbK|Jdg1aFcrOgC)B3J+{{bY( znw>9_B)5rbpCQC^1Z2YW1&a_rb2gfF?rIsh%0M=Dn<`~iN85bnmB^?luEc~Hv&dS! zl*Hy^(3r8DkdH1xdqHI=b7`gw89Uy7gND&^;8APCA-neNw=b<`B+ZeV<`Q!7$WbmL zIyRQ|TejNg+JL$AyQ1_PF_H~iw^FfwBjRMpOsy8J*tUDOr4_^BQL(Yu`SKRH?=<=`+znA`cusVq<(1@Pqisovz~-#3T|j z`|z=2O7$o!i!CKO^zLgd#zm-(7?eu2*8pw5jO0|kSFBr){(lh2B|d#Gw`5N788M~T z>sxkQW#~D0s2P>G7uK@N?MAR*W?~C2gN`67IyxwH16~&&xZit1yTIdOdhPO!r_P*J z@B#dyV3v_mHS5^zn6({NHl=$LkjVb`d*77W1s@bsscqMqAKLZmZAN42oVn;Tzq+Z8 ziPdy-ijF&_J=`^cj0(8fYOm)xzz3q^UT6=$KmQl-PZIDOp0oZ0!X4`600000NkvXX Hu0mjfZEdl* diff --git a/static/img/lbry-favicon.png b/static/img/lbry-favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..4570d22484629120b2e5e96a43145ecd78a4c7e6 GIT binary patch literal 1349 zcmV-L1-kl)P)2o>J5A-I_{SCaJT$iftQ>K3!_@o=42^af;o$q5C{Z9fk3by@Sga9ggHgW z?Pw2oLMQOFPFmmR_xr|ApF!M=SxB5CC&jDR;HzXQ$y%%=vlcGG?ePTsfxtlE3-KZQ z?|lgX9u|`*@cLbQ_bFgazDt>ghV44wa=9^V+P;I*wd(L~iqvE;QHq%o5)~ce)qi>c zUy6_4O9>tj-_@x*goTIu`wkz8ojP;T;;i1VksD#Ngp{jWpYKzrBWJ0yOrO61l`1G9 zR+?`ti+3vEc`6F_ADkq zCTn!~*zt(LW5cjp zS07HEKEv+`8CfQrj~O{l{(^KJFo>}52!u%SS%=m4?Vsb&XV`EI$4{MN_x=O?9@x5b zmrB}}JJ+zTS3qZu%A zG#LvQBZua}n5omP4VgG=7M=R_r&*^i^cXw@bsLui%w4h+!ycW!LEHAE%3HvO2{wRE zoIcH+V#%u2l&n#k6uI-!vTJwt9Jrj#f|aW9j3ICb_cExL9inbK|Jdg1aFcrOgC)B3J+{{bY( znw>9_B)5rbpCQC^1Z2YW1&a_rb2gfF?rIsh%0M=Dn<`~iN85bnmB^?luEc~Hv&dS! zl*Hy^(3r8DkdH1xdqHI=b7`gw89Uy7gND&^;8APCA-neNw=b<`B+ZeV<`Q!7$WbmL zIyRQ|TejNg+JL$AyQ1_PF_H~iw^FfwBjRMpOsy8J*tUDOr4_^BQL(Yu`SKRH?=<=`+znA`cusVq<(1@Pqisovz~-#3T|j z`|z=2O7$o!i!CKO^zLgd#zm-(7?eu2*8pw5jO0|kSFBr){(lh2B|d#Gw`5N788M~T z>sxkQW#~D0s2P>G7uK@N?MAR*W?~C2gN`67IyxwH16~&&xZit1yTIdOdhPO!r_P*J z@B#dyV3v_mHS5^zn6({NHl=$LkjVb`d*77W1s@bsscqMqAKLZmZAN42oVn;Tzq+Z8 ziPdy-ijF&_J=`^cj0(8fYOm)xzz3q^UT6=$KmQl-PZIDOp0oZ0!X4`600000NkvXX Hu0mjfZEdl* literal 0 HcmV?d00001 diff --git a/ui/analytics.js b/ui/analytics.js index 7b3762c4d..ca144e47d 100644 --- a/ui/analytics.js +++ b/ui/analytics.js @@ -38,6 +38,9 @@ type Analytics = { playerLoadedEvent: (?boolean) => void, playerStartedEvent: (?boolean) => void, videoStartEvent: (string, number) => void, + adsFetchedEvent: () => void, + adsReceivedEvent: (any) => void, + adsErrorEvent: (any) => void, videoBufferEvent: ( StreamClaim, { @@ -50,9 +53,6 @@ type Analytics = { readyState: number, } ) => void, - adsFetchedEvent: () => void, - adsReceivedEvent: (any) => void, - adsErrorEvent: (any) => void, emailProvidedEvent: () => void, emailVerifiedEvent: () => void, rewardEligibleEvent: () => void, diff --git a/ui/component/channelContent/view.jsx b/ui/component/channelContent/view.jsx index 2ff48cb50..f90df9db2 100644 --- a/ui/component/channelContent/view.jsx +++ b/ui/component/channelContent/view.jsx @@ -136,14 +136,15 @@ function ChannelContent(props: Props) { {!channelIsMine && claimsInChannel > 0 && } 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 f@_v8wD{ju8WBMawFKup^e literal 0 HcmV?d00001 diff --git a/ui/component/channelThumbnail/view.jsx b/ui/component/channelThumbnail/view.jsx index fa89e839f..07d2cbe46 100644 --- a/ui/component/channelThumbnail/view.jsx +++ b/ui/component/channelThumbnail/view.jsx @@ -2,7 +2,7 @@ import React from 'react'; import { parseURI } from 'lbry-redux'; import classnames from 'classnames'; -import Gerbil from './gerbil.png'; +import Spaceman from './spaceman.png'; import Transparent from './transparent_1x1.png'; import FreezeframeWrapper from 'component/fileThumbnail/FreezeframeWrapper'; import ChannelStakedIndicator from 'component/channelStakedIndicator'; @@ -100,7 +100,7 @@ function ChannelThumbnail(props: Props) { ref={thumbnailRef} alt={__('Channel profile picture')} className="channel-thumbnail__default" - data-src={!thumbError && url ? url : Gerbil} + data-src={!thumbError && url ? url : Spaceman} src={Transparent} onError={() => setThumbError(true)} // if thumb fails (including due to https replace, show gerbil. /> @@ -114,7 +114,7 @@ function ChannelThumbnail(props: Props) { ref={thumbnailRef} alt={__('Channel profile picture')} className="channel-thumbnail__custom" - data-src={!thumbError && url ? url : Gerbil} + data-src={!thumbError && url ? url : Spaceman} src={Transparent} onError={() => setThumbError(true)} // if thumb fails (including due to https replace, show gerbil. /> diff --git a/ui/component/claimList/view.jsx b/ui/component/claimList/view.jsx index 6d1ed3a5c..308c42b87 100644 --- a/ui/component/claimList/view.jsx +++ b/ui/component/claimList/view.jsx @@ -45,6 +45,7 @@ type Props = { livestreamMap?: { [string]: any }, searchOptions?: any, collectionId?: string, + hideLivestreamClaims?: boolean, }; export default function ClaimList(props: Props) { @@ -76,6 +77,7 @@ export default function ClaimList(props: Props) { livestreamMap, searchOptions, collectionId, + hideLivestreamClaims, } = props; const [currentSort, setCurrentSort] = usePersistedState(persistedStorageKey, SORT_NEW); @@ -135,6 +137,7 @@ export default function ClaimList(props: Props) { properties={renderProperties} live={resolveLive(index)} collectionId={collectionId} + hideLivestreamClaims={hideLivestreamClaims} /> ))} {!timedOut && urisLength === 0 && !loading &&
{empty || noResultMsg}
} @@ -195,6 +198,7 @@ export default function ClaimList(props: Props) { showUserBlocked={showHiddenByUser} showHiddenByUser={showHiddenByUser} collectionId={collectionId} + hideLivestreamClaims={hideLivestreamClaims} customShouldHide={(claim: StreamClaim) => { // Hack to hide spee.ch thumbnail publishes // If it meets these requirements, it was probably uploaded here: diff --git a/ui/component/claimListDiscover/view.jsx b/ui/component/claimListDiscover/view.jsx index e76334dd3..3b4db9de2 100644 --- a/ui/component/claimListDiscover/view.jsx +++ b/ui/component/claimListDiscover/view.jsx @@ -72,6 +72,9 @@ type Props = { liveLivestreamsFirst?: boolean, livestreamMap?: { [string]: any }, hasSource?: boolean, + limitClaimsPerChannel?: number, + releaseTime?: string, + hideLivestreamClaims?: boolean, isChannel?: boolean, empty?: string, }; @@ -103,8 +106,8 @@ function ClaimListDiscover(props: Props) { claimType, pageSize, defaultClaimType, - streamType, - defaultStreamType, + streamType = CS.FILE_VIDEO, + defaultStreamType = CS.FILE_VIDEO, freshness, defaultFreshness = CS.FRESH_WEEK, renderProperties, @@ -123,12 +126,15 @@ function ClaimListDiscover(props: Props) { forceShowReposts = false, languageSetting, searchInLanguage, + limitClaimsPerChannel, + releaseTime, scrollAnchor, showHiddenByUser = false, liveLivestreamsFirst, livestreamMap, hasSource, isChannel = false, + hideLivestreamClaims, empty, } = props; const didNavigateForward = history.action === 'PUSH'; @@ -168,12 +174,12 @@ function ClaimListDiscover(props: Props) { const durationParam = urlParams.get(CS.DURATION_KEY) || null; const channelIdsInUrl = urlParams.get(CS.CHANNEL_IDS_KEY); const channelIdsParam = channelIdsInUrl ? channelIdsInUrl.split(',') : channelIds; - const feeAmountParam = urlParams.get('fee_amount') || feeAmount; + const feeAmountParam = urlParams.get('fee_amount') || feeAmount || CS.FEE_AMOUNT_ONLY_FREE; const originalPageSize = pageSize || CS.PAGE_SIZE; const dynamicPageSize = isLargeScreen ? Math.ceil(originalPageSize * (3 / 2)) : originalPageSize; const historyAction = history.action; - let orderParam = orderBy || urlParams.get(CS.ORDER_BY_KEY) || defaultOrderBy; + let orderParam = orderBy || urlParams.get(CS.ORDER_BY_KEY) || defaultOrderBy || orderParamEntry; if (!orderParam) { if (historyAction === 'POP') { @@ -217,6 +223,7 @@ function ClaimListDiscover(props: Props) { fee_amount?: string, has_source?: boolean, has_no_source?: boolean, + limit_claims_per_channel?: number, } = { page_size: dynamicPageSize, page, @@ -239,6 +246,10 @@ function ClaimListDiscover(props: Props) { options.has_source = true; } + if (limitClaimsPerChannel) { + options.limit_claims_per_channel = limitClaimsPerChannel; + } + if (feeAmountParam && claimType !== CS.CLAIM_CHANNEL) { options.fee_amount = feeAmountParam; } @@ -268,7 +279,10 @@ function ClaimListDiscover(props: Props) { options.reposted_claim_id = repostedClaimId; } - if (claimType !== CS.CLAIM_CHANNEL) { + // IF release time, set it, else set fallback release times using the hack below. + if (releaseTime) { + options.release_time = releaseTime; + } else if (claimType !== CS.CLAIM_CHANNEL) { if (orderParam === CS.ORDER_BY_TOP && freshnessParam !== CS.FRESH_ALL) { options.release_time = `>${Math.floor(moment().subtract(1, freshnessParam).startOf('hour').unix())}`; } else if (orderParam === CS.ORDER_BY_NEW || orderParam === CS.ORDER_BY_TRENDING) { @@ -346,9 +360,25 @@ function ClaimListDiscover(props: Props) { const hasMatureTags = tagsParam && tagsParam.split(',').some((t) => MATURE_TAGS.includes(t)); const claimSearchCacheQuery = createNormalizedClaimSearchKey(options); - const claimSearchResult = claimSearchByQuery[claimSearchCacheQuery]; + let claimSearchResult = claimSearchByQuery[claimSearchCacheQuery]; const claimSearchResultLastPageReached = claimSearchByQueryLastPageReached[claimSearchCacheQuery]; + // uncomment to fix an item on a page + // const fixUri = 'lbry://@corbettreport#0/lbryodysee#5'; + // if ( + // orderParam === CS.ORDER_BY_NEW && + // claimSearchResult && + // claimSearchResult.length > 2 && + // window.location.pathname === '/$/rabbithole' + // ) { + // if (claimSearchResult.indexOf(fixUri) !== -1) { + // claimSearchResult.splice(claimSearchResult.indexOf(fixUri), 1); + // } else { + // claimSearchResult.pop(); + // } + // claimSearchResult.splice(2, 0, fixUri); + // } + const [prevOptions, setPrevOptions] = React.useState(null); if (!isJustScrollingToNewPage(prevOptions, options)) { @@ -472,7 +502,7 @@ function ClaimListDiscover(props: Props) { claimType={claimType} streamType={streamType} defaultStreamType={defaultStreamType} - feeAmount={feeAmount} + // feeAmount={feeAmount} orderBy={orderBy} defaultOrderBy={defaultOrderBy} hideAdvancedFilter={hideAdvancedFilter} @@ -512,6 +542,7 @@ function ClaimListDiscover(props: Props) { liveLivestreamsFirst={liveLivestreamsFirst} livestreamMap={livestreamMap} searchOptions={options} + hideLivestreamClaims={hideLivestreamClaims} empty={empty} /> {loading && ( @@ -546,6 +577,7 @@ function ClaimListDiscover(props: Props) { liveLivestreamsFirst={liveLivestreamsFirst} livestreamMap={livestreamMap} searchOptions={options} + hideLivestreamClaims={hideLivestreamClaims} empty={empty} /> {loading && diff --git a/ui/component/claimPreview/view.jsx b/ui/component/claimPreview/view.jsx index cb0d6feae..81c3b69d6 100644 --- a/ui/component/claimPreview/view.jsx +++ b/ui/component/claimPreview/view.jsx @@ -33,7 +33,7 @@ const AbandonedChannelPreview = React.lazy(() => type Props = { uri: string, - claim: ?Claim, // maybe? + claim: ?Claim, obscureNsfw: boolean, showUserBlocked: boolean, claimIsMine: boolean, diff --git a/ui/component/claimPreviewTile/view.jsx b/ui/component/claimPreviewTile/view.jsx index 5903e6f1b..f3be5877a 100644 --- a/ui/component/claimPreviewTile/view.jsx +++ b/ui/component/claimPreviewTile/view.jsx @@ -44,6 +44,8 @@ type Props = { properties?: (Claim) => void, live?: boolean, collectionId?: string, + hideLivestreamClaims?: boolean, + isLivestream: boolean, }; function ClaimPreviewTile(props: Props) { @@ -66,6 +68,8 @@ function ClaimPreviewTile(props: Props) { showHiddenByUser, properties, live, + hideLivestreamClaims, + isLivestream, collectionId, } = props; const isRepost = claim && claim.repost_channel_url; @@ -149,7 +153,7 @@ function ClaimPreviewTile(props: Props) { shouldHide = blockedChannelUris.some((blockedUri) => blockedUri === claim.permanent_url); } - if (shouldHide) { + if (shouldHide || (isLivestream && hideLivestreamClaims)) { return null; } @@ -213,7 +217,6 @@ function ClaimPreviewTile(props: Props) { )} - {/* CHECK CLAIM MENU LIST PARAMS (IS REPOST?) */} diff --git a/ui/component/claimTilesDiscover/view.jsx b/ui/component/claimTilesDiscover/view.jsx index fa5224ef2..a82809708 100644 --- a/ui/component/claimTilesDiscover/view.jsx +++ b/ui/component/claimTilesDiscover/view.jsx @@ -37,7 +37,7 @@ export function prioritizeActiveLivestreams( // for that channel actually point to the same source). // 2. 'liveChannelIds' needs to be pruned after being accounted for, // otherwise all livestream-claims will be "live" (we'll only take the - // latest one as "live"). + // latest one as "live" ). return ( claim && claim.value_type === 'stream' && @@ -145,14 +145,14 @@ function ClaimTilesDiscover(props: Props) { mutedUris, liveLivestreamsFirst, livestreamMap, - // pin, + pin, prefixUris, } = props; const { location } = useHistory(); const urlParams = new URLSearchParams(location.search); const feeAmountInUrl = urlParams.get('fee_amount'); - const feeAmountParam = feeAmountInUrl || feeAmount; + const feeAmountParam = feeAmountInUrl || feeAmount || CS.FEE_AMOUNT_ONLY_FREE; const mutedAndBlockedChannelIds = Array.from(new Set(mutedUris.concat(blockedUris).map((uri) => uri.split('#')[1]))); const liveUris = []; @@ -239,8 +239,8 @@ function ClaimTilesDiscover(props: Props) { let uris = (prefixUris || []).concat(claimSearchByQuery[mainSearchKey] || []); const isLoading = fetchingClaimSearchByQuery[mainSearchKey]; - - if (liveLivestreamsFirst && livestreamMap) { + // && !isLoading isn't on master, doesn't seem to affect the functionality, don't recall why it was added. + if (liveLivestreamsFirst && livestreamMap && !isLoading) { prioritizeActiveLivestreams(uris, liveUris, livestreamMap, claimsByUri, claimSearchByQuery, options); } @@ -284,10 +284,27 @@ function ClaimTilesDiscover(props: Props) { return undefined; }; + const modifiedUris = uris ? uris.slice() : []; + const fixUris = [ + 'lbry://@JungleSurvival#f/incredible-secret-millionaire#a', + 'lbry://@JamesJulierArt#0/ipad-painting-tutorial-lava-flow-art-in#8', + ]; + + if (pin && modifiedUris && modifiedUris.length > 2 && window.location.pathname === '/') { + fixUris.forEach((fixUri) => { + if (modifiedUris.indexOf(fixUri) !== -1) { + modifiedUris.splice(modifiedUris.indexOf(fixUri), 1); + } else { + modifiedUris.pop(); + } + }); + modifiedUris.splice(2, 0, ...fixUris); + } + return (
    - {uris && uris.length - ? uris.map((uri, index) => ( + {modifiedUris && modifiedUris.length + ? modifiedUris.map((uri, index) => ( )) : new Array(pageSize).fill(1).map((x, i) => )} diff --git a/ui/component/commentCreate/view.jsx b/ui/component/commentCreate/view.jsx index aa5443cbc..50be60dda 100644 --- a/ui/component/commentCreate/view.jsx +++ b/ui/component/commentCreate/view.jsx @@ -33,7 +33,10 @@ type Props = { isReply: boolean, activeChannel: string, activeChannelClaim: ?ChannelClaim, - livestream?: boolean, + bottom: boolean, + onSubmit: (string, string) => void, + livestream: boolean, + embed?: boolean, toast: (string) => void, claimIsMine: boolean, sendTip: ({}, (any) => void, (any) => void) => void, @@ -53,7 +56,10 @@ export function CommentCreate(props: Props) { isReply, parentId, activeChannelClaim, + onSubmit, + bottom, livestream, + embed, toast, claimIsMine, sendTip, @@ -91,7 +97,7 @@ export function CommentCreate(props: Props) { function altEnterListener(e: SyntheticKeyboardEvent<*>) { const KEYCODE_ENTER = 13; - if ((e.ctrlKey || e.metaKey) && e.keyCode === KEYCODE_ENTER) { + if ((livestream || e.ctrlKey || e.metaKey) && e.keyCode === KEYCODE_ENTER) { e.preventDefault(); buttonref.current.click(); } @@ -169,6 +175,10 @@ export function CommentCreate(props: Props) { setCommentFailure(false); justCommented.push(res.comment_id); + if (onSubmit) { + onSubmit(commentValue, activeChannelClaim.name); + } + if (onDoneReplying) { onDoneReplying(); } @@ -193,6 +203,11 @@ export function CommentCreate(props: Props) {
    { + if (embed) { + window.open(`https://odysee.com/$/${PAGES.AUTH}?redirect=/$/${PAGES.LIVESTREAM}`); + return; + } + const pathPlusRedirect = `/$/${PAGES.CHANNEL_NEW}?redirect=${pathname}`; if (livestream) { window.open(pathPlusRedirect); @@ -246,6 +261,7 @@ export function CommentCreate(props: Props) { className={classnames('comment__create', { 'comment__create--reply': isReply, 'comment__create--nested-reply': isNested, + 'comment__create--bottom': bottom, })} > , doToast: ({ message: string }) => void, clearPlayingUri: () => void, + hideRepost?: boolean, isLivestreamClaim: boolean, reactionsDisabled: boolean, download: (string) => void, @@ -48,6 +49,7 @@ function FileActions(props: Props) { myChannels, clearPlayingUri, doToast, + hideRepost, isLivestreamClaim, reactionsDisabled, download, @@ -113,24 +115,26 @@ function FileActions(props: Props) { const lhsSection = ( <> - {ENABLE_FILE_REACTIONS && !reactionsDisabled && } + {ENABLE_FILE_REACTIONS && !reactionsDisabled && } -
    diff --git a/ui/component/fileViewCount/view.jsx b/ui/component/fileViewCount/view.jsx index 9881b3f4d..8a40c0fd7 100644 --- a/ui/component/fileViewCount/view.jsx +++ b/ui/component/fileViewCount/view.jsx @@ -37,12 +37,12 @@ function FileViewCount(props: Props) { return ( - {isLive && + {livestream && __('%viewer_count% currently %viewer_state%', { viewer_count: activeViewers === undefined ? '...' : activeViewers, viewer_state: isLive ? __('watching') : __('waiting'), })} - {!isLive && + {!livestream && activeViewers === undefined && (viewCount !== 1 ? __('%view_count% views', { view_count: formattedViewCount }) : __('1 view'))} {!SIMPLE_SITE && } diff --git a/ui/component/fileViewerEmbeddedTitle/view.jsx b/ui/component/fileViewerEmbeddedTitle/view.jsx index e97b56e73..da5f00df0 100644 --- a/ui/component/fileViewerEmbeddedTitle/view.jsx +++ b/ui/component/fileViewerEmbeddedTitle/view.jsx @@ -5,7 +5,8 @@ import FilePrice from 'component/filePrice'; import { formatLbryUrlForWeb } from 'util/url'; import { withRouter } from 'react-router'; import { URL } from 'config'; -import * as ICONS from 'constants/icons'; +import OdyseeLogo from 'component/header/odysee_logo.png'; +import OdyseeLogoWithText from 'component/header/odysee_white.png'; type Props = { uri: string, @@ -36,7 +37,10 @@ function FileViewerEmbeddedTitle(props: Props) { {...contentLinkProps} />
    - {isInApp && }
    diff --git a/ui/component/header/view.jsx b/ui/component/header/view.jsx index 09c354d5f..40bbd7a3a 100644 --- a/ui/component/header/view.jsx +++ b/ui/component/header/view.jsx @@ -1,5 +1,5 @@ // @flow -import { LOGO_TITLE, ENABLE_NO_SOURCE_CLAIMS, CHANNEL_STAKED_LEVEL_LIVESTREAM } from 'config'; +import { ENABLE_NO_SOURCE_CLAIMS, CHANNEL_STAKED_LEVEL_LIVESTREAM } from 'config'; import * as ICONS from 'constants/icons'; import { SETTINGS } from 'lbry-redux'; import * as PAGES from 'constants/pages'; @@ -19,6 +19,8 @@ import ChannelThumbnail from 'component/channelThumbnail'; import { remote } from 'electron'; import { IS_MAC } from 'component/app/view'; // @endif +import OdyseeLogoWithWhiteText from './odysee_white.png'; +import OdyseeLogoWithText from './odysee.png'; type Props = { user: ?User, @@ -87,8 +89,8 @@ const Header = (props: Props) => { sidebarOpen, setSidebarOpen, isAbsoluteSideNavHidden, - user, hideCancel, + user, activeChannelClaim, activeChannelStakedLevel, } = props; @@ -100,7 +102,7 @@ const Header = (props: Props) => { const isPwdResetPage = history.location.pathname.includes(PAGES.AUTH_PASSWORD_RESET); const hasBackout = Boolean(backout); const { backLabel, backNavDefault, title: backTitle, simpleTitle: simpleBackTitle } = backout || {}; - const notificationsEnabled = (user && user.experimental_ui) || false; + // const notificationsEnabled = (user && user.experimental_ui) || false; const livestreamEnabled = Boolean( ENABLE_NO_SOURCE_CLAIMS && user && @@ -246,19 +248,12 @@ const Header = (props: Props) => { icon={ICONS.MENU} onClick={() => setSidebarOpen(!sidebarOpen)} > - {isAbsoluteSideNavHidden && isMobile && notificationsEnabled && } + {isAbsoluteSideNavHidden && isMobile && }     )} {!authHeader && (
    @@ -285,7 +285,7 @@ const Header = (props: Props) => { {__('New Channel')} + history.push(`/$/${PAGES.YOUTUBE_SYNC}`)}> + + {__('Sync YouTube Channel')} + {livestreamEnabled && ( history.push(`/$/${PAGES.LIVESTREAM}`)}> diff --git a/ui/component/livestreamComments/view.jsx b/ui/component/livestreamComments/view.jsx index 6b3f18feb..7eda9563d 100644 --- a/ui/component/livestreamComments/view.jsx +++ b/ui/component/livestreamComments/view.jsx @@ -158,7 +158,7 @@ export default function LivestreamComments(props: Props) {
    )}
    - {viewMode === VIEW_MODE_CHAT && superChatsTotalAmount > 0 && ( + {viewMode === VIEW_MODE_CHAT && superChatsTotalAmount > 0 && superChats && (
    {superChats.map((superChat: Comment) => ( diff --git a/ui/component/livestreamFeed/index.js b/ui/component/livestreamFeed/index.js new file mode 100644 index 000000000..46923101e --- /dev/null +++ b/ui/component/livestreamFeed/index.js @@ -0,0 +1,9 @@ +import { connect } from 'react-redux'; +import { makeSelectClaimForUri } from 'lbry-redux'; +import LivestreamFeed from './view'; + +const select = (state, props) => ({ + claim: makeSelectClaimForUri(props.uri)(state), +}); + +export default connect(select)(LivestreamFeed); diff --git a/ui/component/livestreamFeed/view.jsx b/ui/component/livestreamFeed/view.jsx new file mode 100644 index 000000000..116a1ae6a --- /dev/null +++ b/ui/component/livestreamFeed/view.jsx @@ -0,0 +1,38 @@ +// @flow +import { BITWAVE_USERNAME, BITWAVE_EMBED_URL } from 'constants/livestream'; +import React from 'react'; +import FileTitleSection from 'component/fileTitleSection'; +import LivestreamComments from 'component/livestreamComments'; + +type Props = { + uri: string, + claim: ?StreamClaim, + activeViewers: number, +}; + +export default function LivestreamFeed(props: Props) { + const { claim, uri, activeViewers } = props; + + if (!claim) { + return null; + } + + return ( + <> +
    +
    +
    +