oscar-surf/misskey
oscar-surf/misskey
0
0
Fork 0
Code Issues Activity

fix(frontend): fix lint (#15906)

Browse source 
(cherry picked from commit f8b0863b8edf18dac9188a93a52c4d149eabb0e9)

* fix(frontend): attempt to fix lint

* fix lint
This commit is contained in:
かっこかり 2025-04-29 15:54:57 +09:00 • committed by あわわわとーにゅ
parent 695bbf02ca
commit 80b4272c57
No known key found for this signature in database
GPG key ID: 6AFBBF529601C1DB
2 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

38
packages/frontend/src/scripts/collapsed.ts
View file

@ -6,16 +6,30 @@
import * as Misskey from 'misskey-js'; import * as Misskey from 'misskey-js';
export function shouldCollapsed(note: Misskey.entities.Note, urls: string[]): boolean { export function shouldCollapsed(note: Misskey.entities.Note, urls: string[]): boolean {
const collapsed = note.cw == null && note.text != null && ( if (note.cw != null) {
(note.text.includes('$[x2')) || return false;
(note.text.includes('$[x3')) || }
(note.text.includes('$[x4')) ||
(note.text.includes('$[scale')) || if (note.text != null) {
(note.text.split('\n').length > 9) || if (
(note.text.length > 500) || note.text.includes('$[x2') ||
(note.files.length >= 5) || note.text.includes('$[x3') ||
(urls.length >= 4) note.text.includes('$[x4') ||
); note.text.includes('$[scale') ||
note.text.split('\n').length > 9 ||
return collapsed; note.text.length > 500
) {
return true;
}
}
if (urls.length >= 4) {
return true;
}
if (note.files != null && note.files.length >= 5) {
return true;
}
return false;
} }

2
packages/frontend/src/scripts/url.ts
View file

@ -40,7 +40,7 @@ export function maybeMakeRelative(urlStr: string, baseStr: string): string {
return urlObj.pathname + urlObj.search + urlObj.hash; return urlObj.pathname + urlObj.search + urlObj.hash;
} }
return urlStr; return urlStr;
} catch (e) { } catch {
return ''; return '';
} }
} }