From 300a84f3c4ca41b938ad72d1675178ac610b9a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Tue, 3 May 2022 16:51:26 +0900 Subject: [PATCH 01/44] emojigen wip --- locales/ja-NY.yml | 8 ++ packages/client/src/pages/admin/emojigen.vue | 123 +++++++++++++++++++ packages/client/src/pages/admin/emojis.vue | 15 ++- packages/client/src/pages/admin/index.vue | 9 +- 4 files changed, 150 insertions(+), 5 deletions(-) create mode 100644 packages/client/src/pages/admin/emojigen.vue diff --git a/locales/ja-NY.yml b/locales/ja-NY.yml index 546270ad8..41be997b4 100644 --- a/locales/ja-NY.yml +++ b/locales/ja-NY.yml @@ -827,6 +827,14 @@ leaveGroupConfirm: "「{name}」から抜けるにゃ？" useDrawerReactionPickerForMobile: "モバイルデバイスのときドロワーで表示" welcomeBackWithName: "おかえりにゃさいにゃ、{name}さん！" clickToFinishEmailVerification: "[{ok}]を押して、メールアドレスの確認を完了してくださいにゃ。" +emojiGen: "絵文字を生成" +emojiAlign: "文字揃え" +emojiSizeSetting: "サイズ調整" +emojiSizeFixed: "文字サイズを固定する" +emojiStretch: "自動で伸縮しない" +emojiGenerate: "生成" +emojiColor: "カラーコード" +emojiApproval: "絵文字を登録" _emailUnavailable: used: "既に使用されているにゃ" diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue new file mode 100644 index 000000000..2287d869c --- /dev/null +++ b/packages/client/src/pages/admin/emojigen.vue @@ -0,0 +1,123 @@ + + + diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue index a080ee9c2..732fe7d7c 100644 --- a/packages/client/src/pages/admin/emojis.vue +++ b/packages/client/src/pages/admin/emojis.vue @@ -202,7 +202,16 @@ const menu = (ev: MouseEvent) => { }); }); } - }], ev.currentTarget ?? ev.target); + },{ + icon: 'fas fa-recycle', + text: i18n.ts.emojigen, + action: async + + } + + + + ], ev.currentTarget ?? ev.target); }; const setCategoryBulk = async () => { @@ -298,13 +307,13 @@ defineExpose({ .empty { margin: var(--margin); } - + .ldhfsamy { display: grid; grid-template-columns: repeat(auto-fill, minmax(190px, 1fr)); grid-gap: 12px; margin: var(--margin) 0; - + > .emoji { display: flex; align-items: center; diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue index 6b11650f4..d9fb4f4ed 100644 --- a/packages/client/src/pages/admin/index.vue +++ b/packages/client/src/pages/admin/index.vue @@ -2,7 +2,7 @@
- +
@@ -61,10 +63,8 @@ import { defineComponent } from 'vue'; import FormSwitch from '@/components/form/switch.vue'; import FormInput from '@/components/form/input.vue'; import FormTextarea from '@/components/form/textarea.vue'; -import FormInfo from '@/components/ui/info.vue'; import FormRadios from '@/components/form/radios.vue'; import FormSection from '@/components/form/section.vue'; -import FormSplit from '@/components/form/split.vue'; import FormButton from '@/components/ui/button.vue'; import * as os from '@/os'; import * as symbols from '@/symbols'; @@ -76,7 +76,6 @@ export default defineComponent({ FormTextarea, FormRadios, FormSection, - FormSplit, FormSwitch, FormButton }, @@ -86,15 +85,9 @@ export default defineComponent({ data() { return { [symbols.PAGE_INFO]: { - title: this.$ts.general, - icon: 'fas fa-cog', + title: this.$ts.emojiGen, + icon: 'fas fa-laugh', bg: 'var(--bg)', - actions: [{ - asFullButton: true, - icon: 'fas fa-check', - text: this.$ts.save, - handler: this.save, - }], }, emojiName: null, text: null, From 3a896e220ae0f06d7c29bf4b3c39980ae1e55707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Wed, 4 May 2022 22:52:35 +0900 Subject: [PATCH 04/44] emojigen wip3 --- packages/client/src/pages/admin/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue index d9fb4f4ed..63aef304f 100644 --- a/packages/client/src/pages/admin/index.vue +++ b/packages/client/src/pages/admin/index.vue @@ -219,6 +219,7 @@ export default defineComponent({ case 'overview': return defineAsyncComponent(() => import('./overview.vue')); case 'users': return defineAsyncComponent(() => import('./users.vue')); case 'emojis': return defineAsyncComponent(() => import('./emojis.vue')); + case 'emojigen': return defineAsyncComponent(() => import('./emojigen.vue')); case 'federation': return defineAsyncComponent(() => import('../federation.vue')); case 'queue': return defineAsyncComponent(() => import('./queue.vue')); case 'files': return defineAsyncComponent(() => import('./files.vue')); From 7a2c54cbd90f02b27a0156d62368677a49ca405a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Wed, 4 May 2022 23:09:30 +0900 Subject: [PATCH 05/44] emojigen wip4 --- packages/client/src/pages/admin/emojigen.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index 9b4a2a75f..193743ee1 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -12,9 +12,9 @@ - - - + + + From 4d1b6b1c245a0e3b3df2bbd772322c5440b69024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Wed, 4 May 2022 23:24:17 +0900 Subject: [PATCH 06/44] emojigen wip5 --- packages/client/src/pages/admin/emojigen.vue | 34 ++++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index 193743ee1..c5d387ca5 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -69,6 +69,11 @@ import FormButton from '@/components/ui/button.vue'; import * as os from '@/os'; import * as symbols from '@/symbols'; import { fetchInstance } from '@/instance'; +import {string} from "postcss-selector-parser"; +import { selectFiles } from '@/scripts/select-file'; +import {i18n} from "@/i18n"; +import {stream} from "@/stream"; +import {defaultStore} from "@/store"; export default defineComponent({ components: { @@ -96,7 +101,7 @@ export default defineComponent({ emojiStretch: false, font: 'notosans-mono-bold', emojiColor: '38BA91', - emojiUrl: null, + emojiUrl: '', } }, @@ -105,17 +110,34 @@ export default defineComponent({ }, emojiGenerate() { - //https://emoji-gen.ninja/result?text=%E7%B5%B5%E6%96%87%0A%E5%AD%97%E3%80%82&color=EC71A1FF&back_color=00000000&font=notosans-mono-bold&size_fixed=false&align=center&stretch=true&public_fg=true&locale=ja + //https://emoji-gen.ninja/result?text=%E7%B5%B5%E6%96%87%0A%E5%AD%97%E3%80%82&color=EC71A1FF&back_color=00000000&font=notosans-mono-bold&size_fixed=false&align=center&stretch=true&public_fg=true&locale=ja + + const apiUrl = `https://emoji-gen.ninja/result?` + let query = {"text": this.text, "color": this.emojiColor + "FF", "back_color": "00000000", "font": this.font, "size_fixed": this.emojiSizeFixed, "align": this.emojiAlign, "stretch": this.emojiStretch, "public_fg": "false", "locale": "ja"} + + this.emojiUrl = apiUrl + '?' + Object.entries(query).map((e) => `${e[0]}=${e[1]}`).join('='); - const apiUrl = `https://emoji-gen.ninja/result?` - let query = {"text": this.text, "color": this.emojiColor + "FF", "back_color": "00000000", "font": this.font, "size_fixed": this.emojiSizeFixed, "align": this.emojiAlign, "stretch": this.emojiStretch, "public_fg": "false", "locale": "ja"} }, emojiApproval() { + const marker = Math.random().toString(); - } + os.api('drive/files/upload-from-url', { + url: this.emojiUrl, + folderId: defaultStore.state.uploadFolder, + marker + }); + + os.alert({ + title: i18n.ts.uploadFromUrlRequested, + text: i18n.ts.uploadFromUrlMayTakeTime + }); + }, + }, } -}); +); + + From c7e1bdf701ebd9ddadf2b2e4044331a4dec4f1e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Wed, 4 May 2022 23:30:27 +0900 Subject: [PATCH 07/44] emojigen wip6 --- packages/client/src/pages/admin/emojigen.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index c5d387ca5..6931a51ba 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -48,8 +48,9 @@ {{ $ts.emojiGenerate }} - + +

{{ emojiUrl }}

 {{ $ts.emojiApproval }} From 8db5ec291990fcd75d4d8c80c5757c1c98005e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Wed, 4 May 2022 23:34:25 +0900 Subject: [PATCH 08/44] emojigen wip7 --- packages/client/src/pages/admin/emojigen.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index 6931a51ba..d5bd0dfbd 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -113,10 +113,10 @@ export default defineComponent({ emojiGenerate() { //https://emoji-gen.ninja/result?text=%E7%B5%B5%E6%96%87%0A%E5%AD%97%E3%80%82&color=EC71A1FF&back_color=00000000&font=notosans-mono-bold&size_fixed=false&align=center&stretch=true&public_fg=true&locale=ja - const apiUrl = `https://emoji-gen.ninja/result?` + const apiUrl = `https://emoji-gen.ninja/result` let query = {"text": this.text, "color": this.emojiColor + "FF", "back_color": "00000000", "font": this.font, "size_fixed": this.emojiSizeFixed, "align": this.emojiAlign, "stretch": this.emojiStretch, "public_fg": "false", "locale": "ja"} - this.emojiUrl = apiUrl + '?' + Object.entries(query).map((e) => `${e[0]}=${e[1]}`).join('='); + this.emojiUrl = apiUrl + '?' + Object.entries(query).map((e) => `${e[0]}=${e[1]}`).join('&'); From 15a1f1e5851e567b531619d32d329c0d5071b9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Wed, 4 May 2022 23:38:11 +0900 Subject: [PATCH 09/44] emojigen wip8 --- packages/client/src/pages/admin/emojigen.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index d5bd0dfbd..468e898fe 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -113,7 +113,7 @@ export default defineComponent({ emojiGenerate() { //https://emoji-gen.ninja/result?text=%E7%B5%B5%E6%96%87%0A%E5%AD%97%E3%80%82&color=EC71A1FF&back_color=00000000&font=notosans-mono-bold&size_fixed=false&align=center&stretch=true&public_fg=true&locale=ja - const apiUrl = `https://emoji-gen.ninja/result` + const apiUrl = `https://emoji-gen.ninja/emoji` let query = {"text": this.text, "color": this.emojiColor + "FF", "back_color": "00000000", "font": this.font, "size_fixed": this.emojiSizeFixed, "align": this.emojiAlign, "stretch": this.emojiStretch, "public_fg": "false", "locale": "ja"} this.emojiUrl = apiUrl + '?' + Object.entries(query).map((e) => `${e[0]}=${e[1]}`).join('&'); From 8b3e7bf04cdd3b58dd949e120104bb5c07fd82f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Wed, 4 May 2022 23:45:12 +0900 Subject: [PATCH 10/44] emojigen wip9 --- packages/client/src/pages/admin/emojigen.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index 468e898fe..96602515f 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -96,7 +96,7 @@ export default defineComponent({ bg: 'var(--bg)', }, emojiName: null, - text: null, + text: '', emojiAlign: 'center', emojiSizeFixed: false, emojiStretch: false, @@ -114,7 +114,7 @@ export default defineComponent({ //https://emoji-gen.ninja/result?text=%E7%B5%B5%E6%96%87%0A%E5%AD%97%E3%80%82&color=EC71A1FF&back_color=00000000&font=notosans-mono-bold&size_fixed=false&align=center&stretch=true&public_fg=true&locale=ja const apiUrl = `https://emoji-gen.ninja/emoji` - let query = {"text": this.text, "color": this.emojiColor + "FF", "back_color": "00000000", "font": this.font, "size_fixed": this.emojiSizeFixed, "align": this.emojiAlign, "stretch": this.emojiStretch, "public_fg": "false", "locale": "ja"} + let query = {"text": encodeURI(this.text), "color": this.emojiColor + "FF", "back_color": "00000000", "font": this.font, "size_fixed": this.emojiSizeFixed, "align": this.emojiAlign, "stretch": this.emojiStretch, "public_fg": "false", "locale": "ja"} this.emojiUrl = apiUrl + '?' + Object.entries(query).map((e) => `${e[0]}=${e[1]}`).join('&'); From 5e3554d6932a45bebc8d7caa9e0f71e021ceff4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Thu, 5 May 2022 00:38:03 +0900 Subject: [PATCH 11/44] emojigen wip10 --- packages/client/src/pages/admin/emojigen.vue | 37 +++++++++----------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index 96602515f..a83f36c8b 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -60,7 +60,7 @@ From d59a072de7123ebce94105f83b788304b23a88c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Thu, 5 May 2022 16:31:44 +0900 Subject: [PATCH 12/44] emojigen wip11 --- packages/client/src/pages/admin/emojigen.vue | 37 +++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index a83f36c8b..dba874693 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -70,6 +70,7 @@ import FormButton from '@/components/ui/button.vue'; import * as os from '@/os'; import * as symbols from '@/symbols'; import {defaultStore} from "@/store"; +import {stream} from "@/stream"; export default defineComponent({ components: { @@ -118,20 +119,38 @@ export default defineComponent({ }, emojiApproval() { - const chooseFileFromPc = async () => { + const emojiUpload = async () => { + const marker = Math.random().toString(); // TODO: UUIDとか使う - const response = await fetch(this.emojiUrl).then(res => res.blob()) + const connection = stream.useChannel('main'); + connection.on('urlUploadFinished', data => { + if (data.marker === marker) { + emojiAdd(data.file.id); + connection.dispose(); + } + }); + + await os.api('drive/files/upload-from-url', { + url: this.emojiUrl, + folderId: defaultStore.state.uploadFolder, + marker + }); + + const emojiAdd = async (fileId) => { + await os.api('drive/files/update', { + fileId, + name: this.emojiName + '.png', + }); + await os.api('admin/emoji/add', { + fileId, + }) + } - const file = new File([response], `${this.emojiName}.png`); - return await os.upload(file, defaultStore.state.uploadFolder, undefined,); }; + (async () => { - const fileId = await chooseFileFromPc().then(res => res.id); - await os.api('admin/emoji/add', { - fileId, - name: this.emojiName, - }) + await emojiUpload(); })(); }, }, From b54e63f835b38c6f573c11e79874f683fc28b65a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Thu, 5 May 2022 16:55:34 +0900 Subject: [PATCH 13/44] emojigen wip12 --- packages/client/src/pages/admin/emojigen.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index dba874693..bc3508d31 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -150,6 +150,7 @@ export default defineComponent({ (async () => { + await this.emojiApproval(); await emojiUpload(); })(); }, From 5dad50767ef39c26596a01aacfae64861e4a17f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Thu, 5 May 2022 17:02:11 +0900 Subject: [PATCH 14/44] emojigen wip13 --- packages/client/src/pages/admin/emojigen.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index bc3508d31..73480c311 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -118,7 +118,7 @@ export default defineComponent({ }, - emojiApproval() { + emojiApproval: function () { const emojiUpload = async () => { const marker = Math.random().toString(); // TODO: UUIDとか使う @@ -149,9 +149,17 @@ export default defineComponent({ }; + const edit = (emoji) => { + os.popup(import('./emoji-edit-dialog.vue'), { + emoji: emoji + }); + }; + + (async () => { await this.emojiApproval(); await emojiUpload(); + edit(this.emojiName); })(); }, }, From 3e96cc2b6b3052283f631a2e12f10d6f5113a6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Thu, 5 May 2022 18:08:09 +0900 Subject: [PATCH 15/44] emojigen wip14 --- packages/client/src/pages/admin/emojigen.vue | 48 ++++++++++++++++++-- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index 73480c311..06cb8706d 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -38,6 +38,18 @@ + + +
+
+ +
+
+ + + @@ -72,6 +84,7 @@ import * as symbols from '@/symbols'; import {defaultStore} from "@/store"; import {stream} from "@/stream"; + export default defineComponent({ components: { FormInput, @@ -99,6 +112,7 @@ export default defineComponent({ font: 'notosans-mono-bold', emojiColor: '38BA91', emojiUrl: '', + accentColors: ['e36749', 'f29924', '98c934', '34c9a9', '34a1c9', '606df7', '8d34c9', 'e84d83'] } }, @@ -123,10 +137,16 @@ export default defineComponent({ const marker = Math.random().toString(); // TODO: UUIDとか使う const connection = stream.useChannel('main'); + + connection.on('urlUploadFinished', data => { if (data.marker === marker) { - emojiAdd(data.file.id); + const emojiId = emojiAdd(data.file.id); connection.dispose(); + return emojiId; + } else { + connection.dispose(); + return null; } }); @@ -141,13 +161,30 @@ export default defineComponent({ fileId, name: this.emojiName + '.png', }); - await os.api('admin/emoji/add', { + return await os.api('admin/emoji/add', { fileId, }) } }; + const emoji = async (emojiId) => { + const sinceId = await os.api('admin/emoji/list', { + limit: 1, + untilId: emojiId + }) + + if (!sinceId) return null; + + const id = await os.api('admin/emoji/list', { + limit: 1, + sinceId: sinceId[0].id + }); + + if (!id) return null; + + return id[0]; + } const edit = (emoji) => { os.popup(import('./emoji-edit-dialog.vue'), { @@ -158,10 +195,13 @@ export default defineComponent({ (async () => { await this.emojiApproval(); - await emojiUpload(); - edit(this.emojiName); + edit(emoji(await emojiUpload())); })(); }, + + setAccentColor(color){ + this.emojiColor = color; + } }, }); From 6b9f0d800ec52043235023bcbe6b0d865968ad7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Thu, 5 May 2022 19:14:26 +0900 Subject: [PATCH 16/44] emojigen wip15 --- packages/client/src/pages/admin/emojigen.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index 06cb8706d..b07b0b624 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -195,7 +195,9 @@ export default defineComponent({ (async () => { await this.emojiApproval(); - edit(emoji(await emojiUpload())); + const emojiId = await emojiUpload(); + const emojiObj = await emoji(emojiId); + edit(emojiObj); })(); }, From 14990a1bd1f6d61274c9dbe7a53d74e2ea81502d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Thu, 5 May 2022 19:59:11 +0900 Subject: [PATCH 17/44] emojigen wip16 --- packages/client/src/pages/admin/emojigen.vue | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index b07b0b624..2e89966b4 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -133,20 +133,23 @@ export default defineComponent({ }, emojiApproval: function () { - const emojiUpload = async () => { + + // const returnKoke = () => new Promise(resolve => { + // setTimeout(() => { + // resolve("Koke") + // }, 5000) + // }) + + //const strKoke = await returnKoke() + + const emojiUpload = () => new Promise(async resolve => { const marker = Math.random().toString(); // TODO: UUIDとか使う const connection = stream.useChannel('main'); - - - connection.on('urlUploadFinished', data => { + connection.on('urlUploadFinished', async data => { if (data.marker === marker) { - const emojiId = emojiAdd(data.file.id); connection.dispose(); - return emojiId; - } else { - connection.dispose(); - return null; + resolve(await emojiAdd(data.file.id)); } }); @@ -164,6 +167,7 @@ export default defineComponent({ return await os.api('admin/emoji/add', { fileId, }) + } }; @@ -196,7 +200,7 @@ export default defineComponent({ (async () => { await this.emojiApproval(); const emojiId = await emojiUpload(); - const emojiObj = await emoji(emojiId); + const emojiObj = emoji(emojiId); edit(emojiObj); })(); }, From 85cc716781a234166cee3448ad166aeaa9cc0644 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Thu, 5 May 2022 20:00:00 +0900 Subject: [PATCH 18/44] =?UTF-8?q?Adzuki=E3=81=95=E3=82=93=E3=81=8C?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/client/src/pages/admin/emojigen.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index 2e89966b4..3a7009e62 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -170,7 +170,7 @@ export default defineComponent({ } - }; + }); const emoji = async (emojiId) => { const sinceId = await os.api('admin/emoji/list', { From a8337b0964948da4d623b279e60880fdccb70637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Thu, 5 May 2022 20:28:46 +0900 Subject: [PATCH 19/44] emojigen wip17 --- packages/client/src/pages/admin/emojigen.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index 3a7009e62..2f4accea7 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -148,8 +148,8 @@ export default defineComponent({ const connection = stream.useChannel('main'); connection.on('urlUploadFinished', async data => { if (data.marker === marker) { - connection.dispose(); resolve(await emojiAdd(data.file.id)); + connection.dispose(); } }); From c8331b5822b91afa821c795f2f8cc0a2661a08e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Thu, 5 May 2022 20:43:39 +0900 Subject: [PATCH 20/44] emojigen wip18 --- packages/client/src/pages/admin/emojigen.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index 2f4accea7..a7a3dc40e 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -159,16 +159,16 @@ export default defineComponent({ marker }); - const emojiAdd = async (fileId) => { + const emojiAdd = (fileId) => new Promise(async resolve => { await os.api('drive/files/update', { fileId, name: this.emojiName + '.png', }); - return await os.api('admin/emoji/add', { + resolve( await os.api('admin/emoji/add', { fileId, - }) + })); - } + }) }); From 970f373cae25a60b2edce36eb56011dc11ed6909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Thu, 5 May 2022 21:40:11 +0900 Subject: [PATCH 21/44] =?UTF-8?q?emojigen=20wip19(=E3=81=82=E3=81=BB?= =?UTF-8?q?=E3=81=99=E3=81=8E=E3=82=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/client/src/pages/admin/emojigen.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index a7a3dc40e..5708a298f 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -142,6 +142,8 @@ export default defineComponent({ //const strKoke = await returnKoke() + + const emojiUpload = () => new Promise(async resolve => { const marker = Math.random().toString(); // TODO: UUIDとか使う @@ -198,7 +200,7 @@ export default defineComponent({ (async () => { - await this.emojiApproval(); + await this.emojiGenerate() const emojiId = await emojiUpload(); const emojiObj = emoji(emojiId); edit(emojiObj); From 98f412a1723f2767ecdb734193975bede0665e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Thu, 5 May 2022 22:24:05 +0900 Subject: [PATCH 22/44] emojigen wip20 --- packages/client/src/pages/admin/emojigen.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index 5708a298f..a988786db 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -150,7 +150,7 @@ export default defineComponent({ const connection = stream.useChannel('main'); connection.on('urlUploadFinished', async data => { if (data.marker === marker) { - resolve(await emojiAdd(data.file.id)); + resolve(await emojiAdd(data.file.id.toString())); connection.dispose(); } }); @@ -184,7 +184,7 @@ export default defineComponent({ const id = await os.api('admin/emoji/list', { limit: 1, - sinceId: sinceId[0].id + sinceId: sinceId[0].id.toString() }); if (!id) return null; @@ -202,7 +202,9 @@ export default defineComponent({ (async () => { await this.emojiGenerate() const emojiId = await emojiUpload(); + console.log(emojiId); const emojiObj = emoji(emojiId); + console.log(emojiObj); edit(emojiObj); })(); }, From 025dc3d6f901702ceccc6e45a7a14717caebbe1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Thu, 5 May 2022 22:59:27 +0900 Subject: [PATCH 23/44] emojigen wip21 --- packages/client/src/pages/admin/emojigen.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index a988786db..b835bc389 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -150,7 +150,7 @@ export default defineComponent({ const connection = stream.useChannel('main'); connection.on('urlUploadFinished', async data => { if (data.marker === marker) { - resolve(await emojiAdd(data.file.id.toString())); + resolve(await emojiAdd(data.file.id)); connection.dispose(); } }); @@ -177,7 +177,7 @@ export default defineComponent({ const emoji = async (emojiId) => { const sinceId = await os.api('admin/emoji/list', { limit: 1, - untilId: emojiId + untilId: emojiId.id }) if (!sinceId) return null; From 7d62342477189a8d0040e1ff6b6cec8dfded6c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Fri, 6 May 2022 00:11:11 +0900 Subject: [PATCH 24/44] =?UTF-8?q?Adzuki=E3=81=95=E3=82=93=E3=81=8C?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/client/src/pages/admin/emojigen.vue | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index b835bc389..1a643ad3c 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -150,7 +150,8 @@ export default defineComponent({ const connection = stream.useChannel('main'); connection.on('urlUploadFinished', async data => { if (data.marker === marker) { - resolve(await emojiAdd(data.file.id)); + const fileId = await emojiAdd(data.file.id); + resolve(fileId); connection.dispose(); } }); @@ -161,15 +162,18 @@ export default defineComponent({ marker }); - const emojiAdd = (fileId) => new Promise(async resolve => { + //リネーム→登録→登録されたIDを返す + const emojiAdd = (fileId) => new Promise | null>(async resolve => { await os.api('drive/files/update', { fileId, name: this.emojiName + '.png', }); - resolve( await os.api('admin/emoji/add', { - fileId, - })); + const response = await os.api('admin/emoji/add', { + fileId, + }) + + resolve(response); }) }); From 744310dc4e665ecf63de372b81861a489585a20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Fri, 6 May 2022 00:13:12 +0900 Subject: [PATCH 25/44] emojigen wip22 --- packages/client/src/pages/admin/emojigen.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index 1a643ad3c..76098004e 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -143,10 +143,11 @@ export default defineComponent({ //const strKoke = await returnKoke() - + //emojiUploadでは、絵文字をdrive/files/upload-from-urlでアップロードしたあと、emojiAddでリネーム、登録をして、emojiAddの戻り値(絵文字のid)を返す const emojiUpload = () => new Promise(async resolve => { const marker = Math.random().toString(); // TODO: UUIDとか使う + //先にコネクションを貼って監視する const connection = stream.useChannel('main'); connection.on('urlUploadFinished', async data => { if (data.marker === marker) { @@ -178,6 +179,7 @@ export default defineComponent({ }); + //emoji関数 admin/emoji/listでは、idによる検索ができないため、自分のidをuntilIdに入れて1つ前のidを取得してからそれをsinceIdに指定して、絵文字情報をlist→objectで取得する const emoji = async (emojiId) => { const sinceId = await os.api('admin/emoji/list', { limit: 1, @@ -188,7 +190,7 @@ export default defineComponent({ const id = await os.api('admin/emoji/list', { limit: 1, - sinceId: sinceId[0].id.toString() + sinceId: sinceId[0].id }); if (!id) return null; @@ -196,6 +198,7 @@ export default defineComponent({ return id[0]; } + //edit関数には、emojiのobjectを渡す const edit = (emoji) => { os.popup(import('./emoji-edit-dialog.vue'), { emoji: emoji @@ -205,9 +208,9 @@ export default defineComponent({ (async () => { await this.emojiGenerate() - const emojiId = await emojiUpload(); + const emojiId = await emojiUpload();//emojiIdはファイルID emojiUploadはファイルIDを返す console.log(emojiId); - const emojiObj = emoji(emojiId); + const emojiObj = emoji(emojiId);//emojiObjはemojiオブジェクト emoji関数はemojiIdを引数に受け取りemojiオブジェクトを返す console.log(emojiObj); edit(emojiObj); })(); From 04c7dcd20102fe910a8d66dc66b1c6791dca97d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Fri, 6 May 2022 03:43:04 +0900 Subject: [PATCH 26/44] emojigen wip23 --- packages/client/src/pages/admin/emojigen.vue | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index 76098004e..e3e0e4132 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -180,23 +180,29 @@ export default defineComponent({ }); //emoji関数 admin/emoji/listでは、idによる検索ができないため、自分のidをuntilIdに入れて1つ前のidを取得してからそれをsinceIdに指定して、絵文字情報をlist→objectで取得する - const emoji = async (emojiId) => { + const emoji = (emojiId) => new Promise(async resolve => { const sinceId = await os.api('admin/emoji/list', { limit: 1, untilId: emojiId.id }) - if (!sinceId) return null; + if (!sinceId) { + resolve(null); + return; + } const id = await os.api('admin/emoji/list', { limit: 1, sinceId: sinceId[0].id }); - if (!id) return null; + if (!id) { + resolve(null); + return; + } - return id[0]; - } + resolve(id[0]); + }); //edit関数には、emojiのobjectを渡す const edit = (emoji) => { @@ -209,7 +215,7 @@ export default defineComponent({ (async () => { await this.emojiGenerate() const emojiId = await emojiUpload();//emojiIdはファイルID emojiUploadはファイルIDを返す - console.log(emojiId); + //console.log(emojiId.id); const emojiObj = emoji(emojiId);//emojiObjはemojiオブジェクト emoji関数はemojiIdを引数に受け取りemojiオブジェクトを返す console.log(emojiObj); edit(emojiObj); From 522e1481466a7f4b2ef4ee8fede24b237109fb64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Fri, 6 May 2022 04:19:23 +0900 Subject: [PATCH 27/44] emojigen wip25 --- packages/client/src/pages/admin/emojigen.vue | 131 +++++++++---------- 1 file changed, 59 insertions(+), 72 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index e3e0e4132..e0b9980b3 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -1,73 +1,70 @@ @@ -79,6 +76,7 @@ import FormTextarea from '@/components/form/textarea.vue'; import FormRadios from '@/components/form/radios.vue'; import FormSection from '@/components/form/section.vue'; import FormButton from '@/components/ui/button.vue'; +import FormFolder from '@/components/form/folder.vue'; import * as os from '@/os'; import * as symbols from '@/symbols'; import {defaultStore} from "@/store"; @@ -92,7 +90,8 @@ export default defineComponent({ FormRadios, FormSection, FormSwitch, - FormButton + FormButton, + FormFolder }, emits: ['info'], @@ -134,15 +133,6 @@ export default defineComponent({ emojiApproval: function () { - // const returnKoke = () => new Promise(resolve => { - // setTimeout(() => { - // resolve("Koke") - // }, 5000) - // }) - - //const strKoke = await returnKoke() - - //emojiUploadでは、絵文字をdrive/files/upload-from-urlでアップロードしたあと、emojiAddでリネーム、登録をして、emojiAddの戻り値(絵文字のid)を返す const emojiUpload = () => new Promise(async resolve => { const marker = Math.random().toString(); // TODO: UUIDとか使う @@ -176,11 +166,10 @@ export default defineComponent({ resolve(response); }) - }); //emoji関数 admin/emoji/listでは、idによる検索ができないため、自分のidをuntilIdに入れて1つ前のidを取得してからそれをsinceIdに指定して、絵文字情報をlist→objectで取得する - const emoji = (emojiId) => new Promise(async resolve => { + const emoji = (emojiId) => new Promise | null>(async resolve => { const sinceId = await os.api('admin/emoji/list', { limit: 1, untilId: emojiId.id @@ -215,9 +204,7 @@ export default defineComponent({ (async () => { await this.emojiGenerate() const emojiId = await emojiUpload();//emojiIdはファイルID emojiUploadはファイルIDを返す - //console.log(emojiId.id); - const emojiObj = emoji(emojiId);//emojiObjはemojiオブジェクト emoji関数はemojiIdを引数に受け取りemojiオブジェクトを返す - console.log(emojiObj); + const emojiObj = await emoji(emojiId);//emojiObjはemojiオブジェクト emoji関数はemojiIdを引数に受け取りemojiオブジェクトを返す edit(emojiObj); })(); }, From e051b7719d36283fde0a69b4c12d3ddc19410169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Fri, 6 May 2022 04:30:48 +0900 Subject: [PATCH 28/44] emojigen wip26 --- packages/client/src/pages/admin/emojigen.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index e0b9980b3..cd8a8749e 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -111,7 +111,7 @@ export default defineComponent({ font: 'notosans-mono-bold', emojiColor: '38BA91', emojiUrl: '', - accentColors: ['e36749', 'f29924', '98c934', '34c9a9', '34a1c9', '606df7', '8d34c9', 'e84d83'] + accentColors: ['#e36749', '#f29924', '#98c934', '#34c9a9', '#34a1c9', '#606df7', '#8d34c9', '#e84d83'] } }, @@ -210,7 +210,7 @@ export default defineComponent({ }, setAccentColor(color){ - this.emojiColor = color; + this.emojiColor = color.replace('#', ''); } }, }); From 5d23cf8c585fb8d81c78af74ebafc57e3a52b695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Fri, 6 May 2022 04:43:32 +0900 Subject: [PATCH 29/44] emojigen wip27 --- packages/client/src/pages/admin/emojigen.vue | 55 ++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index cd8a8749e..f22ab2792 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -217,3 +217,58 @@ export default defineComponent({ + + + From 17af085befb50d51ee62d11b9beb08d9378691ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=93=E3=81=91=E3=81=A3=E3=81=A1?= Date: Fri, 6 May 2022 17:34:41 +0900 Subject: [PATCH 30/44] emojigen wip28 --- packages/client/src/pages/admin/emojigen.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/admin/emojigen.vue b/packages/client/src/pages/admin/emojigen.vue index f22ab2792..9a5d3939d 100644 --- a/packages/client/src/pages/admin/emojigen.vue +++ b/packages/client/src/pages/admin/emojigen.vue @@ -1,6 +1,6 @@