Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
This commit is contained in:
commit
5ccbeda86a
6 changed files with 16 additions and 2 deletions
|
@ -1,7 +1,7 @@
|
|||
// 与えられた拡張子とファイル名が一致しているかどうかを確認し、
|
||||
// 一致していない場合は拡張子を付与して返す
|
||||
export function correctFilename(filename: string, ext: string | null) {
|
||||
const dotExt = ext ? `.${ext}` : '.unknown';
|
||||
const dotExt = ext ? ext.startsWith('.') ? ext : `.${ext}` : '.unknown';
|
||||
if (filename.endsWith(dotExt)) {
|
||||
return filename;
|
||||
}
|
||||
|
|
|
@ -21,6 +21,9 @@ describe('misc:correct-filename', () => {
|
|||
test('with same ext', () => {
|
||||
expect(correctFilename('filename.jpg', 'jpg')).toBe('filename.jpg');
|
||||
});
|
||||
test('.ext', () => {
|
||||
expect(correctFilename('filename.jpg', '.jpg')).toBe('filename.jpg');
|
||||
});
|
||||
test('with different ext', () => {
|
||||
expect(correctFilename('filename.webp', 'jpg')).toBe('filename.webp.jpg');
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue