moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Typescript: Start fixing strictFunctionTypes errors

This commit is contained in:
Alex Gleason 2022-03-24 11:53:09 -05:00
parent 161cd3d1fc
commit 67471638c3
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/soapbox/reducers/accounts.ts
View File

@ -1,6 +1,7 @@
import { import {
Map as ImmutableMap, Map as ImmutableMap,
List as ImmutableList, List as ImmutableList,
OrderedSet as ImmutableOrderedSet,
fromJS, fromJS,
} from 'immutable'; } from 'immutable';
import { AnyAction } from 'redux'; import { AnyAction } from 'redux';
@ -82,8 +83,8 @@ const addTags = (
): State => { ): State => {
return state.withMutations(state => { return state.withMutations(state => {
accountIds.forEach(id => { accountIds.forEach(id => {
state.updateIn([id, 'pleroma', 'tags'], ImmutableList(), (v: ImmutableList<string>) => state.updateIn([id, 'pleroma', 'tags'], ImmutableList(), v =>
v.toOrderedSet().union(tags).toList(), ImmutableOrderedSet(fromJS(v)).union(tags).toList(),
); );
}); });
}); });
@ -96,8 +97,8 @@ const removeTags = (
): State => { ): State => {
return state.withMutations(state => { return state.withMutations(state => {
accountIds.forEach(id => { accountIds.forEach(id => {
state.updateIn([id, 'pleroma', 'tags'], ImmutableList(), (v: ImmutableList<string>) => state.updateIn([id, 'pleroma', 'tags'], ImmutableList(), v =>
v.toOrderedSet().subtract(tags).toList(), ImmutableOrderedSet(fromJS(v)).subtract(tags).toList(),
); );
}); });
}); });

8
app/soapbox/reducers/statuses.ts
View File

@ -136,7 +136,9 @@ const deleteStatus = (state: State, id: string, references: Array<string>) => {
const importPendingStatus = (state: State, { in_reply_to_id }: APIEntity) => { const importPendingStatus = (state: State, { in_reply_to_id }: APIEntity) => {
if (in_reply_to_id) { if (in_reply_to_id) {
return state.updateIn([in_reply_to_id, 'replies_count'], 0, (count: number) => count + 1); return state.updateIn([in_reply_to_id, 'replies_count'], 0, count => {
return typeof count === 'number' ? count + 1 : 0;
});
} else { } else {
return state; return state;
} }
@ -144,7 +146,9 @@ const importPendingStatus = (state: State, { in_reply_to_id }: APIEntity) => {
const deletePendingStatus = (state: State, { in_reply_to_id }: APIEntity) => { const deletePendingStatus = (state: State, { in_reply_to_id }: APIEntity) => {
if (in_reply_to_id) { if (in_reply_to_id) {
return state.updateIn([in_reply_to_id, 'replies_count'], 0, (count: number) => Math.max(0, count - 1)); return state.updateIn([in_reply_to_id, 'replies_count'], 0, count => {
return typeof count === 'number' ? Math.max(0, count - 1) : 0;
});
} else { } else {
return state; return state;
} }

2
tsconfig.json
View File

@ -5,7 +5,7 @@
"alwaysStrict": true, "alwaysStrict": true,
"strictNullChecks": false, "strictNullChecks": false,
"strictBindCallApply": true, "strictBindCallApply": true,
"strictFunctionTypes": false, "strictFunctionTypes": true,
"strictPropertyInitialization": false, "strictPropertyInitialization": false,
"noImplicitAny": true, "noImplicitAny": true,
"noImplicitThis": true, "noImplicitThis": true,