diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-19 18:33:59 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-08-19 18:33:59 +0900 |
| commit | e9f34a0f091476bf8ddcf4752d4fb767108de2e3 (patch) | |
| tree | 1cd83b0263807e0ba1df81a086dc9a35d105790e /src | |
| parent | refactor: refactoring imports (diff) | |
| parent | Remove unused packages (#7661) (diff) | |
| download | sharkey-e9f34a0f091476bf8ddcf4752d4fb767108de2e3.tar.gz sharkey-e9f34a0f091476bf8ddcf4752d4fb767108de2e3.tar.bz2 sharkey-e9f34a0f091476bf8ddcf4752d4fb767108de2e3.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/@types/is-root.d.ts | 7 | ||||
| -rw-r--r-- | src/boot/master.ts | 6 | ||||
| -rw-r--r-- | src/docs/ja-JP/general/faq.md | 3 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/@types/is-root.d.ts b/src/@types/is-root.d.ts deleted file mode 100644 index 3905a16c8d..0000000000 --- a/src/@types/is-root.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -declare module 'is-root' { - function isRoot(): boolean; - - namespace isRoot {} // Hack - - export = isRoot; -} diff --git a/src/boot/master.ts b/src/boot/master.ts index 93ef9a458b..98da016f44 100644 --- a/src/boot/master.ts +++ b/src/boot/master.ts @@ -2,7 +2,6 @@ import * as os from 'os'; import * as cluster from 'cluster'; import * as chalk from 'chalk'; import * as portscanner from 'portscanner'; -import * as isRoot from 'is-root'; import { getConnection } from 'typeorm'; import Logger from '@/services/logger.js'; @@ -39,6 +38,11 @@ function greet() { bootLogger.info(`Misskey v${meta.version}`, null, true); } +function isRoot() { + // maybe process.getuid will be undefined under not POSIX environment (e.g. Windows) + return process.getuid != null && process.getuid() === 0; +} + /** * Init master process */ diff --git a/src/docs/ja-JP/general/faq.md b/src/docs/ja-JP/general/faq.md index f163aad125..60cd5fad8c 100644 --- a/src/docs/ja-JP/general/faq.md +++ b/src/docs/ja-JP/general/faq.md @@ -28,3 +28,6 @@ MFMには、そのURLのプレビューを無効にする構文があります ## Botを開発したい Misskey APIを利用してBotの開発が可能です。[こちら](../advanced/develop-bot)をご確認ください。 + +## ノートの翻訳機能はどのサービスを使用していますか？ +[DeepL](https://www.deepl.com/)を使用しています。 |