diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-09-30 09:40:00 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-30 09:40:00 +0900 |
| commit | 0e6cd577cc1e880f53492c3cb8b15f273e412897 (patch) | |
| tree | 43f1605f4350a595c480b9f2927a6a0cc3f8d63b /packages/frontend/src/scripts | |
| parent | Merge pull request #11920 from misskey-dev/develop (diff) | |
| parent | feat: AiScriptでホストのアドレスを参照できる定数 (#11924) (diff) | |
| download | misskey-0e6cd577cc1e880f53492c3cb8b15f273e412897.tar.gz misskey-0e6cd577cc1e880f53492c3cb8b15f273e412897.tar.bz2 misskey-0e6cd577cc1e880f53492c3cb8b15f273e412897.zip | |
Merge pull request #11926 from misskey-dev/develop
* fix(backend): Redisに古いMisskeyバージョンのキャッシュが残っている場合の問題を修正
* Update CHANGELOG.md
* enhance(front)end: improve moderation log
* enhance: ノートの翻訳機能の利用可否をロールで設定可能に
Resolve #11923
* 2023.9.3
* 後方互換性の強化
* Update CHANGELOG.md
* fix test
* [ci skip] New Crowdin updates (#11922)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (Korean)
* New translations ja-jp.yml (Chinese Traditional)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (German)
* New translations ja-jp.yml (English)
* New translations ja-jp.yml (Thai)
* New translations ja-jp.yml (Chinese Simplified)
* New translations ja-jp.yml (Chinese Simplified)
* feat: AiScriptでホストのアドレスを参照できる定数 (#11924)
* add HOST_URL
* Update CHANGELOG.md
* tweak
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---------
Co-authored-by: FineArchs <133759614+FineArchs@users.noreply.github.com>
Diffstat (limited to 'packages/frontend/src/scripts')
| -rw-r--r-- | packages/frontend/src/scripts/aiscript/api.ts | 3 | ||||
| -rw-r--r-- | packages/frontend/src/scripts/get-note-menu.ts | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/packages/frontend/src/scripts/aiscript/api.ts b/packages/frontend/src/scripts/aiscript/api.ts index f049a51b93..032853f7ad 100644 --- a/packages/frontend/src/scripts/aiscript/api.ts +++ b/packages/frontend/src/scripts/aiscript/api.ts @@ -8,7 +8,7 @@ import * as os from '@/os.js'; import { $i } from '@/account.js'; import { miLocalStorage } from '@/local-storage.js'; import { customEmojis } from '@/custom-emojis.js'; -import { lang } from '@/config.js'; +import { url, lang } from '@/config.js'; export function createAiScriptEnv(opts) { return { @@ -17,6 +17,7 @@ export function createAiScriptEnv(opts) { USER_USERNAME: $i ? values.STR($i.username) : values.NULL, CUSTOM_EMOJIS: utils.jsToVal(customEmojis.value), LOCALE: values.STR(lang), + SERVER_URL: values.STR(url), 'Mk:dialog': values.FN_NATIVE(async ([title, text, type]) => { await os.alert({ type: type ? type.value : 'info', diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts index 45fb622069..62d9aab91b 100644 --- a/packages/frontend/src/scripts/get-note-menu.ts +++ b/packages/frontend/src/scripts/get-note-menu.ts @@ -288,7 +288,7 @@ export function getNoteMenu(props: { text: i18n.ts.share, action: share, }, - instance.translatorAvailable ? { + $i && $i.policies.canUseTranslator && instance.translatorAvailable ? { icon: 'ti ti-language-hiragana', text: i18n.ts.translate, action: translate, |