worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1286 from akihikodaki/master

Browse source 
Allow to use domain whose prefix is not misskey
This commit is contained in:
syuilo 2018-03-25 23:12:29 +09:00 committed by GitHub
parent 687cd56cc1 a633f184ab
commit a23790a1e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gulpfile.ts
View file

@ -124,6 +124,7 @@ gulp.task('build:client:script', () =>
.pipe(replace('VERSION', JSON.stringify(version))) .pipe(replace('VERSION', JSON.stringify(version)))
.pipe(replace('API', JSON.stringify(config.api_url))) .pipe(replace('API', JSON.stringify(config.api_url)))
.pipe(replace('ENV', JSON.stringify(env))) .pipe(replace('ENV', JSON.stringify(env)))
.pipe(replace('HOST', JSON.stringify(config.host)))
.pipe(isProduction ? uglify({ .pipe(isProduction ? uglify({
toplevel: true toplevel: true
} as any) : gutil.noop()) } as any) : gutil.noop())

4
src/web/app/boot.js
View file

@ -27,9 +27,7 @@
// misskey.alice => misskey // misskey.alice => misskey
// misskey.strawberry.pasta => misskey // misskey.strawberry.pasta => misskey
// dev.misskey.arisu.tachibana => dev // dev.misskey.arisu.tachibana => dev
let app = url.host == 'localhost' let app = url.host === HOST ? 'misskey' : url.host.substr(0, -HOST.length);
? 'misskey'
: url.host.split('.')[0];
// Detect the user language // Detect the user language
// Note: The default language is English // Note: The default language is English