From 3238f44867c1e64a8471bf8284bec198ed8a4a03 Mon Sep 17 00:00:00 2001 From: xmflsct Date: Tue, 14 Mar 2023 23:48:35 +0100 Subject: [PATCH 01/24] Fix crash --- src/components/Timeline/Shared/Card/Neodb.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Timeline/Shared/Card/Neodb.tsx b/src/components/Timeline/Shared/Card/Neodb.tsx index f412746b..69fe2018 100644 --- a/src/components/Timeline/Shared/Card/Neodb.tsx +++ b/src/components/Timeline/Shared/Card/Neodb.tsx @@ -20,6 +20,8 @@ export const CardNeodb: React.FC = ({ card }) => { if (!segments || !(segments[0] === 'movie' || segments[0] === 'book' || segments[0] === 'tv')) return null + const [headingLines, setHeadingLines] = useState(3) + const { data } = useNeodbQuery({ path: `${segments[0]}/${segments[1]}` }) if (!data) return null @@ -36,8 +38,6 @@ export const CardNeodb: React.FC = ({ card }) => { } const contentProps = { style: { flex: 1, gap: StyleConstants.Spacing.S } } - const [headingLines, setHeadingLines] = useState(3) - const itemImage = data.cover_image_url ? ( Date: Sat, 18 Mar 2023 23:03:25 +0100 Subject: [PATCH 02/24] Fix #717 --- ios/tooot/Info.plist | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ios/tooot/Info.plist b/ios/tooot/Info.plist index a70dccd6..a7f281e3 100644 --- a/ios/tooot/Info.plist +++ b/ios/tooot/Info.plist @@ -35,6 +35,7 @@ tooot-share tooot + https diff --git a/package.json b/package.json index 1a919d89..999402da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tooot", - "version": "4.9.2", + "version": "4.9.3", "description": "tooot for Mastodon", "author": "xmflsct ", "license": "GPL-3.0-or-later", From 0d8fdf5740ee8746fc022a4ac73ed18f5912032d Mon Sep 17 00:00:00 2001 From: xmflsct Date: Sat, 18 Mar 2023 23:18:09 +0100 Subject: [PATCH 03/24] Fix #723 --- src/screens/Tabs/Me/Preferences/Filter.tsx | 20 ++++++++----------- .../Shared/Account/Information/Actions.tsx | 7 ++++--- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/screens/Tabs/Me/Preferences/Filter.tsx b/src/screens/Tabs/Me/Preferences/Filter.tsx index cf98bee7..d01d6ca5 100644 --- a/src/screens/Tabs/Me/Preferences/Filter.tsx +++ b/src/screens/Tabs/Me/Preferences/Filter.tsx @@ -176,18 +176,14 @@ const TabMePreferencesFilter: React.FC< ...(parseInt(expiration) && { expires_in: parseInt(expiration) }), - ...(keywords.filter(keyword => keyword.length).length - ? { - keywords_attributes: keywords - .filter(keyword => keyword.length) - .map(keyword => ({ keyword, whole_word: true })) - } - : params.filter.keywords.length && { - keywords_attributes: params.filter.keywords.map(keyword => ({ - ...keyword, - _destroy: true - })) - }) + keywords_attributes: keywords.map((keyword, index) => + !!params.filter.keywords[index] + ? { + id: params.filter.keywords[index].id, + ...(keyword.length ? { keyword, whole_word: true } : { _destroy: true }) + } + : { keyword, whole_word: true } + ) } }) .then(() => { diff --git a/src/screens/Tabs/Shared/Account/Information/Actions.tsx b/src/screens/Tabs/Shared/Account/Information/Actions.tsx index a9948d9d..c312059b 100644 --- a/src/screens/Tabs/Shared/Account/Information/Actions.tsx +++ b/src/screens/Tabs/Shared/Account/Information/Actions.tsx @@ -37,9 +37,10 @@ const AccountInformationActions: React.FC = () => { return (