Compare commits

...
Author SHA1 Message Date
zeppi 7da8be67fe v0.52.6-alpha.2 2022-03-12 22:10:47 -05:00
zeppi 538aa3b42f workflow try continue-on-error 2022-03-12 22:06:57 -05:00
zeppi fd02bb00b3 increase yarn timeout 2022-03-12 22:06:57 -05:00
zeppi d5c79495ab v0.52.6-alpha.1 2022-03-12 15:55:47 -05:00
zeppi 702a3f8eb8 changelog 2022-03-11 12:57:29 -05:00
infinite-persistence 35276d5879 Fix comment count not incremented when it was previously 0 (#7510)
It was causing the nudge to add a comment to still appear after one has just entered a comment.

Ticket: Odysee 928
2022-03-11 01:07:41 -05:00
zeppi a7e70e4d21 bump electron to 15.4.0 2022-03-08 22:09:27 -05:00
zeppi 6560ab6c7b bump electron to 15.3.7 2022-03-08 22:09:27 -05:00
Franco Montenegro 66bdd3fc87 Small refactor to get the last used collection. 2022-03-08 12:30:39 -05:00
Franco Montenegro c843991378 Update last used collection when a collection is pending or published. 2022-03-08 12:30:39 -05:00
Franco Montenegro aa008d8a61 Small fix for last used collection when it's a published collection. 2022-03-08 12:30:39 -05:00
Franco Montenegro ca1d0e71b7 Add last used collection to right click menu. 2022-03-08 12:30:39 -05:00
zeppi 2ddf0a2cbd add medium duration video filter 2022-03-07 18:46:28 -05:00
zeppi 64e48c1eef update flow 2022-03-07 17:07:42 -05:00
zeppi 10381ef06a Revert "Bump shelljs from 0.8.3 to 0.8.5"
This reverts commit 33e5318a29.
2022-03-07 16:43:12 -05:00
13 changed files with 501 additions and 410 deletions

No files matched your search

+2 -2
View File
@@ -26,7 +26,7 @@ jobs:
- macos-latest
- windows-latest
runs-on: ${{ matrix.os }}
continue-on-error: true
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2-beta
@@ -47,7 +47,7 @@ jobs:
- name: Build
run: |
yarn global add cross-env
yarn
yarn install --network-timeout 600000
yarn build
env:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
+14
View File
@@ -5,6 +5,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased for Desktop]
### Added
- Discover page medium duration filter ([#7506](https://github.com/lbryio/lbry-desktop/pull/7506))
- Keep last used collection for Add To ([#7491](https://github.com/lbryio/lbry-desktop/pull/7491))
- Disk space functionality on mac / windows ([#7500](https://github.com/lbryio/lbry-desktop/pull/7500))
### Changed
- Some upgrade modal improvements ([#7488](https://github.com/lbryio/lbry-desktop/pull/7488))
### Fixed
- Failed comment count increment ([#7510](https://github.com/lbryio/lbry-desktop/pull/7510))
- App crash playing media on older windows versions by updating electron ([#7509](https://github.com/lbryio/lbry-desktop/pull/7509))
- Local build failures on mac ([#7497](https://github.com/lbryio/lbry-desktop/pull/7497))
- Language change now rerenders whole app ([#7504](https://github.com/lbryio/lbry-desktop/pull/7504))
## [0.52.5] - [2022-02-25]
### Fixed
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "lbry",
"version": "0.52.5",
"version": "0.52.6-alpha.2",
"description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
"keywords": [
"lbry"
@@ -126,7 +126,7 @@
"dom-scroll-into-view": "^1.2.1",
"dotenv-defaults": "^2.0.1",
"dotenv-webpack": "^1.8.0",
"electron": "15.3.2",
"electron": "15.4.0",
"electron-builder": "^22.10.5",
"electron-devtools-installer": "^3.1.1",
"electron-is-dev": "^0.3.0",
@@ -149,7 +149,7 @@
"eslint-plugin-standard": "^4.0.1",
"file-loader": "^4.2.0",
"flow-bin": "^0.97.0",
"flow-typed": "^2.3.0",
"flow-typed": "^3.7.0",
"formik": "^0.10.4",
"hast-util-sanitize": "^3.0.2",
"history": "^4.9.0",
+2
View File
@@ -2291,5 +2291,7 @@
"Choose View Hosting Limit": "Choose View Hosting Limit",
"View Hosting Limit (GB)": "View Hosting Limit (GB)",
"%free% of %total% available": "%free% of %total% available",
"Short (< 4 min)": "Short (< 4 min)",
"Medium (4 - 20 min)": "Medium (4 - 20 min)",
"--end--": "--end--"
}
+3 -1
View File
@@ -253,7 +253,7 @@ function ClaimListDiscover(props: Props) {
release_time?: string,
claim_type?: string | Array<string>,
name?: string,
duration?: string,
duration?: string | Array<string>,
reposted_claim_id?: string,
stream_types?: any,
fee_amount?: string,
@@ -345,6 +345,8 @@ function ClaimListDiscover(props: Props) {
options.duration = '<=240';
} else if (durationParam === CS.DURATION_LONG) {
options.duration = '>=1200';
} else if (durationParam === CS.DURATION_MEDIUM) {
options.duration = ['<=1200', '>=240'];
}
}
+2 -1
View File
@@ -424,7 +424,8 @@ function ClaimListHeader(props: Props) {
{CS.DURATION_TYPES.map((dur) => (
<option key={dur} value={dur}>
{/* i18fixme */}
{dur === CS.DURATION_SHORT && __('Short (< 4 minutes)')}
{dur === CS.DURATION_SHORT && __('Short (< 4 min)')}
{dur === CS.DURATION_MEDIUM && __('Medium (4 - 20 min)')}
{dur === CS.DURATION_LONG && __('Long (> 20 min)')}
{dur === CS.DURATION_ALL && __('Any')}
</option>
+12
View File
@@ -3,10 +3,12 @@ import { selectClaimForUri, selectClaimIsMine } from 'redux/selectors/claims';
import { doCollectionEdit, doFetchItemsInCollection } from 'redux/actions/collections';
import { doPrepareEdit } from 'redux/actions/publish';
import {
makeSelectCollectionForId,
makeSelectCollectionForIdHasClaimUrl,
makeSelectCollectionIsMine,
makeSelectEditedCollectionForId,
makeSelectUrlsForCollectionId,
selectLastUsedCollection,
} from 'redux/selectors/collections';
import { makeSelectFileInfoForUri } from 'redux/selectors/file_info';
import * as COLLECTIONS_CONSTS from 'constants/collections';
@@ -43,6 +45,8 @@ const select = (state, props) => {
const shuffleList = selectListShuffle(state);
const shuffle = shuffleList && shuffleList.collectionId === collectionId && shuffleList.newUrls;
const playNextUri = shuffle && shuffle[0];
const lastUsedCollectionId = selectLastUsedCollection(state);
const lastUsedCollection = makeSelectCollectionForId(lastUsedCollectionId)(state);
return {
claim,
@@ -70,6 +74,14 @@ const select = (state, props) => {
editedCollection: makeSelectEditedCollectionForId(collectionId)(state),
resolvedList: makeSelectUrlsForCollectionId(collectionId)(state),
playNextUri,
lastUsedCollection,
hasClaimInLastUsedCollection: makeSelectCollectionForIdHasClaimUrl(
lastUsedCollectionId,
contentPermanentUri
)(state),
lastUsedCollectionIsNotBuiltin:
lastUsedCollectionId !== COLLECTIONS_CONSTS.WATCH_LATER_ID &&
lastUsedCollectionId !== COLLECTIONS_CONSTS.FAVORITES_ID,
};
};
+22
View File
@@ -60,6 +60,9 @@ type Props = {
resolvedList: boolean,
fetchCollectionItems: (string) => void,
doToggleShuffleList: (string) => void,
lastUsedCollection: ?Collection,
hasClaimInLastUsedCollection: boolean,
lastUsedCollectionIsNotBuiltin: boolean,
};
function ClaimMenuList(props: Props) {
@@ -100,6 +103,9 @@ function ClaimMenuList(props: Props) {
resolvedList,
fetchCollectionItems,
doToggleShuffleList,
lastUsedCollection,
hasClaimInLastUsedCollection,
lastUsedCollectionIsNotBuiltin,
} = props;
const [doShuffle, setDoShuffle] = React.useState(false);
const incognitoClaim = contentChannelUri && !contentChannelUri.includes('@');
@@ -359,6 +365,22 @@ function ClaimMenuList(props: Props) {
{__('Add to Lists')}
</div>
</MenuItem>
{lastUsedCollection && lastUsedCollectionIsNotBuiltin && (
<MenuItem
className="comment__menu-option"
onSelect={() =>
handleAdd(hasClaimInLastUsedCollection, lastUsedCollection.name, lastUsedCollection.id)
}
>
<div className="menu__link">
{!hasClaimInLastUsedCollection && <Icon aria-hidden icon={ICONS.ADD} />}
{hasClaimInLastUsedCollection && <Icon aria-hidden icon={ICONS.DELETE} />}
{!hasClaimInLastUsedCollection &&
__('Add to %collection%', { collection: lastUsedCollection.name })}
{hasClaimInLastUsedCollection && __('In %collection%', { collection: lastUsedCollection.name })}
</div>
</MenuItem>
)}
<hr className="menu__separator" />
</>
)
+2 -1
View File
@@ -36,9 +36,10 @@ export const ORDER_BY_NEW_VALUE = ['release_time'];
export const ORDER_BY_TYPES = [ORDER_BY_TRENDING, ORDER_BY_NEW, ORDER_BY_TOP];
export const DURATION_SHORT = 'short';
export const DURATION_MEDIUM = 'medium';
export const DURATION_LONG = 'long';
export const DURATION_ALL = 'all';
export const DURATION_TYPES = [DURATION_ALL, DURATION_SHORT, DURATION_LONG];
export const DURATION_TYPES = [DURATION_ALL, DURATION_SHORT, DURATION_MEDIUM, DURATION_LONG];
export const SORT_BY = {
// key: Enumeration; can be anything as long as unique. Also used as URLParam.
+10
View File
@@ -26,6 +26,7 @@ const defaultState: CollectionState = {
},
resolved: {},
unpublished: {}, // sync
lastUsedCollection: undefined,
edited: {},
pending: {},
saved: [],
@@ -53,14 +54,17 @@ const collectionsReducer = handleActions(
return {
...state,
unpublished: newLists,
lastUsedCollection: params.id,
};
},
[ACTIONS.COLLECTION_DELETE]: (state, action) => {
const { lastUsedCollection } = state;
const { id, collectionKey } = action.data;
const { edited: editList, unpublished: unpublishedList, pending: pendingList } = state;
const newEditList = Object.assign({}, editList);
const newUnpublishedList = Object.assign({}, unpublishedList);
const isDeletingLastUsedCollection = lastUsedCollection === id;
const newPendingList = Object.assign({}, pendingList);
@@ -70,6 +74,7 @@ const collectionsReducer = handleActions(
return {
...state,
[collectionKey]: newList,
lastUsedCollection: isDeletingLastUsedCollection ? undefined : lastUsedCollection,
};
} else {
if (newEditList[id]) {
@@ -85,6 +90,7 @@ const collectionsReducer = handleActions(
edited: newEditList,
unpublished: newUnpublishedList,
pending: newPendingList,
lastUsedCollection: isDeletingLastUsedCollection ? undefined : lastUsedCollection,
};
},
@@ -112,6 +118,7 @@ const collectionsReducer = handleActions(
edited: newEditList,
unpublished: newUnpublishedList,
pending: newPendingList,
lastUsedCollection: claimId,
};
},
@@ -123,6 +130,7 @@ const collectionsReducer = handleActions(
return {
...state,
[collectionKey]: { ...lists, [id]: collection },
lastUsedCollection: id,
};
}
@@ -131,12 +139,14 @@ const collectionsReducer = handleActions(
return {
...state,
edited: { ...lists, [id]: collection },
lastUsedCollection: id,
};
}
const { unpublished: lists } = state;
return {
...state,
unpublished: { ...lists, [id]: collection },
lastUsedCollection: id,
};
},
+2 -2
View File
@@ -89,7 +89,7 @@ export default handleActions(
newCommentIds.unshift(comment.comment_id);
byId[claimId] = newCommentIds;
if (totalCommentsById[claimId]) {
if (totalCommentsById.hasOwnProperty(claimId)) {
totalCommentsById[claimId] += 1;
}
@@ -562,7 +562,7 @@ export default handleActions(
}
}
if (totalCommentsById[claimId]) {
if (totalCommentsById.hasOwnProperty(claimId)) {
totalCommentsById[claimId] = Math.max(0, totalCommentsById[claimId] - 1);
}
+2
View File
@@ -17,6 +17,8 @@ export const selectMyEditedCollections = createSelector(selectState, (state) =>
export const selectPendingCollections = createSelector(selectState, (state) => state.pending);
export const selectLastUsedCollection = createSelector(selectState, (state) => state.lastUsedCollection);
export const makeSelectEditedCollectionForId = (id: string) =>
createSelector(selectMyEditedCollections, (eLists) => eLists[id]);
+425 -400
View File
File diff suppressed because it is too large. Load diff