From 33146ffa5e91192d8efed96f68100d29a47f18ea Mon Sep 17 00:00:00 2001 From: Francis Dinh Date: Fri, 26 Aug 2022 00:31:17 -0400 Subject: [PATCH] Fix paths for twemoji and font-awesome --- gulpfile.js | 4 ++-- packages/backend/src/server/web/index.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 90f8ebaab..12ddcaddb 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -16,11 +16,11 @@ gulp.task('copy:backend:views', () => ); gulp.task('copy:client:fonts', () => - gulp.src('./packages/client/node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_client_dist_/fonts/')) + gulp.src('./node_modules/three/examples/fonts/**/*').pipe(gulp.dest('./built/_client_dist_/fonts/')) ); gulp.task('copy:client:fontawesome', () => - gulp.src('./packages/client/node_modules/@fortawesome/fontawesome-free/**/*').pipe(gulp.dest('./built/_client_dist_/fontawesome/')) + gulp.src('./node_modules/@fortawesome/fontawesome-free/**/*').pipe(gulp.dest('./built/_client_dist_/fontawesome/')) ); gulp.task('copy:client:locales', cb => { diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts index cf404f6bb..611d13ca4 100644 --- a/packages/backend/src/server/web/index.ts +++ b/packages/backend/src/server/web/index.ts @@ -136,7 +136,7 @@ router.get('/twemoji/(.*)', async ctx => { ctx.set('Content-Security-Policy', 'default-src \'none\'; style-src \'unsafe-inline\''); await send(ctx as any, path, { - root: `${_dirname}/../../../node_modules/@discordapp/twemoji/dist/svg/`, + root: `${_dirname}/../../../../../node_modules/@discordapp/twemoji/dist/svg/`, maxage: 30 * DAY, }); }); @@ -150,7 +150,7 @@ router.get('/twemoji-badge/(.*)', async ctx => { } const mask = await sharp( - `${_dirname}/../../../node_modules/@discordapp/twemoji/dist/svg/${path.replace('.png', '')}.svg`, + `${_dirname}/../../../../../node_modules/@discordapp/twemoji/dist/svg/${path.replace('.png', '')}.svg`, { density: 1000 }, ) .resize(488, 488)