summaryrefslogtreecommitdiff
path: root/packages/frontend/src/pages/settings
diff options
context:
space:
mode:
authorかっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>2023-10-21 18:41:12 +0900
committerGitHub <noreply@github.com>2023-10-21 18:41:12 +0900
commitf51bca41c5f59f9ffce346a3ec32badaf1ccda31 (patch)
treeb5799527c2d3602da3592f7d6c1b65bb6ac8922c /packages/frontend/src/pages/settings
parentすべてのフォロー中の人のwithRepliesを変える機能 (#12049) (diff)
downloadmisskey-f51bca41c5f59f9ffce346a3ec32badaf1ccda31.tar.gz
misskey-f51bca41c5f59f9ffce346a3ec32badaf1ccda31.tar.bz2
misskey-f51bca41c5f59f9ffce346a3ec32badaf1ccda31.zip
Feat: 外部サイトからテーマ・プラグインのインストールができるように (#12034)
* Feat: 外部サイトからテーマ・プラグインのインストールができるように * Update Changelog * Change Changelog * Remove unnecessary imports * Update fetch-external-resources.ts * Update CHANGELOG.md * Update CHANGELOG.md
Diffstat (limited to 'packages/frontend/src/pages/settings')
-rw-r--r--packages/frontend/src/pages/settings/plugin.install.vue117
-rw-r--r--packages/frontend/src/pages/settings/theme.install.vue67
2 files changed, 35 insertions, 149 deletions
diff --git a/packages/frontend/src/pages/settings/plugin.install.vue b/packages/frontend/src/pages/settings/plugin.install.vue
index 47ebe9cfd6..693e02d0ed 100644
--- a/packages/frontend/src/pages/settings/plugin.install.vue
+++ b/packages/frontend/src/pages/settings/plugin.install.vue
@@ -18,130 +18,35 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<script lang="ts" setup>
-import { defineAsyncComponent, nextTick, ref } from 'vue';
-import { compareVersions } from 'compare-versions';
-import { Interpreter, Parser, utils } from '@syuilo/aiscript';
-import { v4 as uuid } from 'uuid';
+import { nextTick, ref } from 'vue';
import MkTextarea from '@/components/MkTextarea.vue';
import MkButton from '@/components/MkButton.vue';
import FormInfo from '@/components/MkInfo.vue';
import * as os from '@/os.js';
-import { ColdDeviceStorage } from '@/store.js';
+import { installPlugin } from '@/scripts/install-plugin.js';
import { unisonReload } from '@/scripts/unison-reload.js';
import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
-const parser = new Parser();
-const code = ref(null);
-
-function installPlugin({ id, meta, src, token }) {
- ColdDeviceStorage.set('plugins', ColdDeviceStorage.get('plugins').concat({
- ...meta,
- id,
- active: true,
- configData: {},
- token: token,
- src: src,
- }));
-}
-
-function isSupportedAiScriptVersion(version: string): boolean {
- try {
- return (compareVersions(version, '0.12.0') >= 0);
- } catch (err) {
- return false;
- }
-}
+const code = ref<string | null>(null);
async function install() {
- if (code.value == null) return;
+ if (!code.value) return;
- const lv = utils.getLangVersion(code.value);
- if (lv == null) {
- os.alert({
- type: 'error',
- text: 'No language version annotation found :(',
- });
- return;
- } else if (!isSupportedAiScriptVersion(lv)) {
- os.alert({
- type: 'error',
- text: `aiscript version '${lv}' is not supported :(`,
- });
- return;
- }
-
- let ast;
try {
- ast = parser.parse(code.value);
- } catch (err) {
- os.alert({
- type: 'error',
- text: 'Syntax error :(',
- });
- return;
- }
+ await installPlugin(code.value);
+ os.success();
- const meta = Interpreter.collectMetadata(ast);
- if (meta == null) {
- os.alert({
- type: 'error',
- text: 'No metadata found :(',
+ nextTick(() => {
+ unisonReload();
});
- return;
- }
-
- const metadata = meta.get(null);
- if (metadata == null) {
- os.alert({
- type: 'error',
- text: 'No metadata found :(',
- });
- return;
- }
-
- const { name, version, author, description, permissions, config } = metadata;
- if (name == null || version == null || author == null) {
+ } catch (err) {
os.alert({
type: 'error',
- text: 'Required property not found :(',
+ title: 'Install failed',
+ text: err.toString() ?? null,
});
- return;
}
-
- const token = permissions == null || permissions.length === 0 ? null : await new Promise((res, rej) => {
- os.popup(defineAsyncComponent(() => import('@/components/MkTokenGenerateWindow.vue')), {
- title: i18n.ts.tokenRequested,
- information: i18n.ts.pluginTokenRequestedDescription,
- initialName: name,
- initialPermissions: permissions,
- }, {
- done: async result => {
- const { name, permissions } = result;
- const { token } = await os.api('miauth/gen-token', {
- session: null,
- name: name,
- permission: permissions,
- });
- res(token);
- },
- }, 'closed');
- });
-
- installPlugin({
- id: uuid(),
- meta: {
- name, version, author, description, permissions, config,
- },
- token,
- src: code.value,
- });
-
- os.success();
-
- nextTick(() => {
- unisonReload();
- });
}
const headerActions = $computed(() => []);
diff --git a/packages/frontend/src/pages/settings/theme.install.vue b/packages/frontend/src/pages/settings/theme.install.vue
index 155ce9d9da..7fa7b23e44 100644
--- a/packages/frontend/src/pages/settings/theme.install.vue
+++ b/packages/frontend/src/pages/settings/theme.install.vue
@@ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkTextarea>
<div class="_buttons">
- <MkButton :disabled="installThemeCode == null" inline @click="() => preview(installThemeCode)"><i class="ti ti-eye"></i> {{ i18n.ts.preview }}</MkButton>
+ <MkButton :disabled="installThemeCode == null" inline @click="() => previewTheme(installThemeCode)"><i class="ti ti-eye"></i> {{ i18n.ts.preview }}</MkButton>
<MkButton :disabled="installThemeCode == null" primary inline @click="() => install(installThemeCode)"><i class="ti ti-check"></i> {{ i18n.ts.install }}</MkButton>
</div>
</div>
@@ -18,60 +18,41 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { } from 'vue';
-import JSON5 from 'json5';
import MkTextarea from '@/components/MkTextarea.vue';
import MkButton from '@/components/MkButton.vue';
-import { applyTheme, validateTheme } from '@/scripts/theme.js';
+import { parseThemeCode, previewTheme, installTheme } from '@/scripts/install-theme.js';
import * as os from '@/os.js';
-import { addTheme, getThemes } from '@/theme-store';
import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
let installThemeCode = $ref(null);
-function parseThemeCode(code: string) {
- let theme;
-
+async function install(code: string): Promise<void> {
try {
- theme = JSON5.parse(code);
- } catch (err) {
- os.alert({
- type: 'error',
- text: i18n.ts._theme.invalid,
- });
- return false;
- }
- if (!validateTheme(theme)) {
- os.alert({
- type: 'error',
- text: i18n.ts._theme.invalid,
- });
- return false;
- }
- if (getThemes().some(t => t.id === theme.id)) {
+ const theme = parseThemeCode(code);
+ await installTheme(code);
os.alert({
- type: 'info',
- text: i18n.ts._theme.alreadyInstalled,
+ type: 'success',
+ text: i18n.t('_theme.installed', { name: theme.name }),
});
- return false;
- }
-
- return theme;
-}
-
-function preview(code: string): void {
- const theme = parseThemeCode(code);
- if (theme) applyTheme(theme, false);
-}
+ } catch (err) {
+ switch (err.message.toLowerCase()) {
+ case 'this theme is already installed':
+ os.alert({
+ type: 'info',
+ text: i18n.ts._theme.alreadyInstalled,
+ });
+ break;
-async function install(code: string): Promise<void> {
- const theme = parseThemeCode(code);
- if (!theme) return;
- await addTheme(theme);
- os.alert({
- type: 'success',
- text: i18n.t('_theme.installed', { name: theme.name }),
- });
+ default:
+ os.alert({
+ type: 'error',
+ text: i18n.ts._theme.invalid,
+ });
+ break;
+ }
+ console.error(err);
+ }
}
const headerActions = $computed(() => []);