diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2025-04-29 15:54:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-29 15:54:57 +0900 |
| commit | f8b0863b8edf18dac9188a93a52c4d149eabb0e9 (patch) | |
| tree | 7da7ea887b261f608ee308617dd4499a3c62596d | |
| parent | Update CHANGELOG.md (diff) | |
| download | misskey-f8b0863b8edf18dac9188a93a52c4d149eabb0e9.tar.gz misskey-f8b0863b8edf18dac9188a93a52c4d149eabb0e9.tar.bz2 misskey-f8b0863b8edf18dac9188a93a52c4d149eabb0e9.zip | |
fix(frontend): fix lint (#15906)
* fix(frontend): attempt to fix lint
* fix lint
| -rw-r--r-- | packages/frontend-shared/js/collapsed.ts | 37 | ||||
| -rw-r--r-- | packages/frontend-shared/js/url.ts | 2 |
2 files changed, 26 insertions, 13 deletions
diff --git a/packages/frontend-shared/js/collapsed.ts b/packages/frontend-shared/js/collapsed.ts index af1f88cb73..aa24c43bcb 100644 --- a/packages/frontend-shared/js/collapsed.ts +++ b/packages/frontend-shared/js/collapsed.ts @@ -6,17 +6,30 @@ import * as Misskey from 'misskey-js'; export function shouldCollapsed(note: Misskey.entities.Note, urls: string[]): boolean { - const collapsed = note.cw == null && ( - (note.text != null && ( - (note.text.includes('$[x2')) || - (note.text.includes('$[x3')) || - (note.text.includes('$[x4')) || - (note.text.includes('$[scale')) || - (note.text.split('\n').length > 9) || - (note.text.length > 500) || - (urls.length >= 4) - )) || (note.files != null && note.files.length >= 5) - ); + if (note.cw != null) { + return false; + } - return collapsed; + if (note.text != null) { + if ( + note.text.includes('$[x2') || + note.text.includes('$[x3') || + note.text.includes('$[x4') || + note.text.includes('$[scale') || + note.text.split('\n').length > 9 || + note.text.length > 500 + ) { + return true; + } + } + + if (urls.length >= 4) { + return true; + } + + if (note.files != null && note.files.length >= 5) { + return true; + } + + return false; } diff --git a/packages/frontend-shared/js/url.ts b/packages/frontend-shared/js/url.ts index e4f9ca513d..1f3550d951 100644 --- a/packages/frontend-shared/js/url.ts +++ b/packages/frontend-shared/js/url.ts @@ -39,7 +39,7 @@ export function maybeMakeRelative(urlStr: string, baseStr: string): string { return urlObj.pathname + urlObj.search + urlObj.hash; } return urlStr; - } catch (e) { + } catch { return ''; } } |