From 5a7f58e7b4aecd1f3292842bb02b100928b2ef42 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 22 Nov 2022 11:01:25 -0800 Subject: [PATCH 01/51] hanna's other fix lol --- package.json | 2 +- packages/client/src/components/MkNote.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 18d9782826..1d7512431e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.17", + "version": "12.119.0-calc.17.2", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 258eec5014..9ae883a4d4 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -613,7 +613,7 @@ function readPromo() { margin: 0 10px 8px 0; width: 46px; height: 46px; - top: calc(14px + var(--stickyTop, 0px)); + // top: calc(14px + var(--stickyTop, 0px)); } } } From ac0463feaa0063f1dbe4be37fdb834bb4e070d9f Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 22 Nov 2022 12:41:19 -0800 Subject: [PATCH 02/51] new links --- packages/client/src/pages/about-calckey.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue index 14cd22ad09..d84e3d8189 100644 --- a/packages/client/src/pages/about-calckey.vue +++ b/packages/client/src/pages/about-calckey.vue @@ -34,8 +34,8 @@
- - Syuilo (Misskey developer) + + Henki (error images artist)
From 150ee6144691bd9da81cc58196655940e4617624 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 22 Nov 2022 21:47:34 -0800 Subject: [PATCH 03/51] misc style fixes --- package.json | 2 +- packages/client/src/components/MkContainer.vue | 1 + packages/client/src/ui/_common_/common.vue | 4 ++-- packages/client/src/ui/universal.vue | 4 ++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 1d7512431e..4e3e06fcb8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.17.2", + "version": "12.119.0-calc.17.3", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkContainer.vue b/packages/client/src/components/MkContainer.vue index f1dce72841..02568c6ece 100644 --- a/packages/client/src/components/MkContainer.vue +++ b/packages/client/src/components/MkContainer.vue @@ -178,6 +178,7 @@ export default defineComponent({ > ::v-deep(i) { margin-right: 6px; + transform: translateY(0.1em); } &:empty { diff --git a/packages/client/src/ui/_common_/common.vue b/packages/client/src/ui/_common_/common.vue index 1ea59dd260..63eb22ad39 100644 --- a/packages/client/src/ui/_common_/common.vue +++ b/packages/client/src/ui/_common_/common.vue @@ -99,8 +99,8 @@ if ($i) { top: 0; left: 0; z-index: 2147483647; - color: #ff0; - background: rgba(0, 0, 0, 0.5); + color: #f6c177; + background: #6e6a86; padding: 4px 5px; font-size: 14px; pointer-events: none; diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index 8ba813ace4..9ffe4c23f2 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -377,6 +377,10 @@ const wallpaper = localStorage.getItem('wallpaper') != null; > .button-wrapper { + > i { + transform: translateY(0.05em); + } + &.on { background-color: var(--accentedBg); width: 100%; From 7844150ea269aa2a014613161b49c8705fb2eb93 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 22 Nov 2022 21:58:09 -0800 Subject: [PATCH 04/51] Slightly smaller avatars --- package.json | 2 +- packages/client/src/components/MkChannelPreview.vue | 9 +++++++-- packages/client/src/components/MkNote.vue | 4 ++-- packages/client/src/components/MkNoteDetailed.vue | 4 ++-- packages/client/src/pages/page.vue | 6 +++--- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 4e3e06fcb8..ae9bb2cb9f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.17.3", + "version": "12.119.0-calc.17.4", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkChannelPreview.vue b/packages/client/src/components/MkChannelPreview.vue index 26cff3b211..a970c9ae6d 100644 --- a/packages/client/src/components/MkChannelPreview.vue +++ b/packages/client/src/components/MkChannelPreview.vue @@ -81,9 +81,12 @@ const bannerStyle = computed(() => { top: 16px; left: 16px; padding: 12px 16px; - background: rgba(0, 0, 0, 0.7); + -webkit-backdrop-filter: var(--blur, blur(8px)); + backdrop-filter: var(--blur, blur(8px)); + background: rgba(0, 0, 0, 0.2); color: #fff; font-size: 1.2em; + border-radius: 999px; } > .status { @@ -93,7 +96,9 @@ const bannerStyle = computed(() => { right: 16px; padding: 8px 12px; font-size: 80%; - background: rgba(0, 0, 0, 0.7); + -webkit-backdrop-filter: var(--blur, blur(8px)); + backdrop-filter: var(--blur, blur(8px)); + background: rgba(0, 0, 0, 0.2); border-radius: 6px; color: #fff; } diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 9ae883a4d4..80441f34d9 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -431,8 +431,8 @@ function readPromo() { flex-shrink: 0; display: block; margin: 0 14px 8px 0; - width: 58px; - height: 58px; + width: 52px; + height: 52px; position: sticky; /* For some reason this breaks avatar positions on notes, commenting it for now */ diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue index 83d44f59f1..19feacec4e 100644 --- a/packages/client/src/components/MkNoteDetailed.vue +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -411,8 +411,8 @@ if (appearNote.replyId) { > .avatar { display: block; flex-shrink: 0; - width: 58px; - height: 58px; + width: 52px; + height: 52px; } > .body { diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue index 0557cbd425..4cc13cf7b4 100644 --- a/packages/client/src/pages/page.vue +++ b/packages/client/src/pages/page.vue @@ -249,7 +249,7 @@ definePageMetadata(computed(() => page ? { } > .content { - padding: 16px 0 0 0; + padding: 16px 0; } > .actions { @@ -290,8 +290,8 @@ definePageMetadata(computed(() => page ? { align-items: center; > .avatar { - width: 52px; - height: 52px; + width: 40px; + height: 40px; } > .name { From 6df058c9642a572e75434545034a50b68840baa9 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 22 Nov 2022 22:30:18 -0800 Subject: [PATCH 05/51] =?UTF-8?q?actually=20fix=20right=20part=20?= =?UTF-8?q?=F0=9F=A5=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- packages/client/src/pages/page.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ae9bb2cb9f..95de531665 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.17.4", + "version": "12.119.0-calc.17.5", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue index 4cc13cf7b4..2497db950e 100644 --- a/packages/client/src/pages/page.vue +++ b/packages/client/src/pages/page.vue @@ -256,7 +256,7 @@ definePageMetadata(computed(() => page ? { display: flex; align-items: center; margin-top: 16px; - padding: 16px 0 0 0; + padding: 16px 0; border-top: solid 0.5px var(--divider); > .like { From b0c6b2b7e11d2717de0a288491ec251ad02516ec Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 23 Nov 2022 16:22:15 -0800 Subject: [PATCH 06/51] fix #9140 --- package.json | 2 +- packages/client/src/components/MkModalPageWindow.vue | 2 +- packages/client/src/components/MkPageWindow.vue | 2 +- packages/client/src/ui/deck/column.vue | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 95de531665..9ea51419ab 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.17.5", + "version": "12.119.0-calc.17.6", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkModalPageWindow.vue b/packages/client/src/components/MkModalPageWindow.vue index b503e9161a..60ce03a2c2 100644 --- a/packages/client/src/components/MkModalPageWindow.vue +++ b/packages/client/src/components/MkModalPageWindow.vue @@ -2,7 +2,7 @@
- + diff --git a/packages/client/src/components/MkPageWindow.vue b/packages/client/src/components/MkPageWindow.vue index 585c918f8a..c7af0172e0 100644 --- a/packages/client/src/components/MkPageWindow.vue +++ b/packages/client/src/components/MkPageWindow.vue @@ -57,7 +57,7 @@ const buttonsLeft = $computed(() => { if (history.length > 1) { buttons.push({ - icon: 'ph--left-bold ph-lg', + icon: 'ph-caret-left-bold ph-lg', onClick: back, }); } diff --git a/packages/client/src/ui/deck/column.vue b/packages/client/src/ui/deck/column.vue index 558e05ee8f..69909bad21 100644 --- a/packages/client/src/ui/deck/column.vue +++ b/packages/client/src/ui/deck/column.vue @@ -133,25 +133,25 @@ function getMenu() { text: i18n.ts.move + '...', icon: 'ph-arrows-out-cardinal-bold ph-lg', children: [{ - icon: 'ph--left-bold ph-lg', + icon: 'ph-caret-left-bold ph-lg', text: i18n.ts._deck.swapLeft, action: () => { swapLeftColumn(props.column.id); }, }, { - icon: 'ph--right-bold ph-lg', + icon: 'ph-caret-right-bold ph-lg', text: i18n.ts._deck.swapRight, action: () => { swapRightColumn(props.column.id); }, }, props.isStacked ? { - icon: 'ph--up-bold ph-lg', + icon: 'ph-caret-up-bold ph-lg', text: i18n.ts._deck.swapUp, action: () => { swapUpColumn(props.column.id); }, } : undefined, props.isStacked ? { - icon: 'ph--down-bold ph-lg', + icon: 'ph-caret-down-bold ph-lg', text: i18n.ts._deck.swapDown, action: () => { swapDownColumn(props.column.id); From bec90a9cedd283a49c396a942625ac6f112a7d1c Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Thu, 24 Nov 2022 01:55:38 +0000 Subject: [PATCH 07/51] docs: another tip --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b4af8e16a4..8633547276 100644 --- a/README.md +++ b/README.md @@ -133,6 +133,7 @@ docker-compose up -d - When editing the config file, please don't fill out the settings at the bottom. They're designed *only* for managed hosting, not self hosting. Those settings are much better off being set in Calckey's control panel. - Port 3000 (used in the default config) might be already used on your server for something else. To find an open port for Calckey, run `for p in $(seq 3000 4000); do ss -tlnH | tr -s ' ' | cut -d" " -sf4 | grep -q "${p}$" || echo "${p}"; done | head -n 1` +- I'd recommend you use a S3 Bucket/CDN for Object Storage, especially if you use Docker. - I'd ***strongly*** recommend against using CloudFlare, but if you do, make sure to turn code minification off. - For push notifications, run `npx web-push generate-vapid-keys`, the put the public and private keys into Control Panel > General > ServiceWorker. - For translations, make a [DeepL](https://deepl.com) account and generate an API key, then put it into Control Panel > General > DeepL Translation. From 85b6d8be06f08e221c92f315e7a3098e5042ab3a Mon Sep 17 00:00:00 2001 From: yawhn Date: Thu, 24 Nov 2022 23:55:23 +0200 Subject: [PATCH 08/51] fix cursor in note thread --- packages/client/src/components/MkNote.vue | 3 ++- packages/client/src/components/MkNoteDetailed.vue | 3 +++ packages/client/src/components/MkNoteSub.vue | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 80441f34d9..597d20c5bf 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -426,7 +426,8 @@ function readPromo() { > .article { display: flex; padding: 28px 32px 18px; - + cursor: pointer; + > .avatar { flex-shrink: 0; display: block; diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue index 19feacec4e..233143ca67 100644 --- a/packages/client/src/components/MkNoteDetailed.vue +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -346,6 +346,8 @@ if (appearNote.replyId) { > .reply-to-more { opacity: 0.7; + cursor: pointer; + } > .renote { @@ -543,6 +545,7 @@ if (appearNote.replyId) { > .reply { border-top: solid 0.5px var(--divider); + cursor: pointer; } > .reply, .reply-to, .reply-to-more { diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue index c8041be421..c1943920df 100644 --- a/packages/client/src/components/MkNoteSub.vue +++ b/packages/client/src/components/MkNoteSub.vue @@ -65,6 +65,7 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item &.children { padding: 10px 0 0 16px; font-size: 1em; + cursor: auto; &.max-width_450px { padding: 10px 0 0 8px; @@ -86,9 +87,11 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item > .body { flex: 1; min-width: 0; - + cursor: pointer; + > .header { margin-bottom: 2px; + cursor: auto; } > .body { From 4b3006bead89a3446b47d4178f21aa192c5202e5 Mon Sep 17 00:00:00 2001 From: yawhn Date: Fri, 25 Nov 2022 13:46:10 +0200 Subject: [PATCH 09/51] hover text in note buttons --- packages/client/src/components/MkNote.vue | 6 +++--- packages/client/src/components/MkNoteDetailed.vue | 6 +++--- packages/client/src/components/MkQuoteButton.vue | 2 ++ packages/client/src/components/MkRenoteButton.vue | 1 + packages/client/src/components/MkStarButton.vue | 4 +++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 80441f34d9..52ac0d4128 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -71,21 +71,21 @@
- - -
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue index 19feacec4e..443f98de43 100644 --- a/packages/client/src/components/MkNoteDetailed.vue +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -81,21 +81,21 @@
- - - diff --git a/packages/client/src/components/MkQuoteButton.vue b/packages/client/src/components/MkQuoteButton.vue index d397cad024..6b08694eac 100644 --- a/packages/client/src/components/MkQuoteButton.vue +++ b/packages/client/src/components/MkQuoteButton.vue @@ -2,6 +2,7 @@ - - @@ -427,7 +427,7 @@ function readPromo() { display: flex; padding: 28px 32px 18px; cursor: pointer; - + > .avatar { flex-shrink: 0; display: block; diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue index 1c99383c47..54d7ec0ca9 100644 --- a/packages/client/src/components/MkNoteDetailed.vue +++ b/packages/client/src/components/MkNoteDetailed.vue @@ -81,21 +81,21 @@ - - - @@ -117,7 +117,7 @@ From e649a465ed28e65b33211191d093970ab3fe043a Mon Sep 17 00:00:00 2001 From: thatonecalculator Date: Thu, 1 Dec 2022 23:13:08 -0800 Subject: [PATCH 40/51] Release candidate 8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2651c05f5c..53e6b1abd9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.18-rc.7", + "version": "12.119.0-calc.18-rc.8", "codename": "aqua", "repository": { "type": "git", From 25fa34d97c588726c18bcefdfbd09188ab5fb1ce Mon Sep 17 00:00:00 2001 From: thatonecalculator Date: Thu, 1 Dec 2022 23:19:37 -0800 Subject: [PATCH 41/51] fix --- package.json | 2 +- packages/client/src/components/MkRenoteButton.vue | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 53e6b1abd9..a4923241d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.18-rc.8", + "version": "12.119.0-calc.18-rc.9", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue index 7550c4ab02..cee5687720 100644 --- a/packages/client/src/components/MkRenoteButton.vue +++ b/packages/client/src/components/MkRenoteButton.vue @@ -53,7 +53,7 @@ useTooltip(buttonRef, async (showing) => { }, {}, 'closed'); }); -const renote = (viaKeyboard = false, ev?: MouseEvent) => { +const renote = async (viaKeyboard = false, ev?: MouseEvent) => { pleaseLogin(); let buttonActions = [{ text: i18n.ts.renote, @@ -72,13 +72,12 @@ const renote = (viaKeyboard = false, ev?: MouseEvent) => { } }, }]; - let users; - os.api('notes/renotes', { + const renotes = await os.api('notes/renotes', { noteId: props.note.id, limit: 11, - }).then((renotes) => { - users = renotes.map(x => x.user); }); + + const users = renotes.map(x => x.user); const hasRenotedBefore = users.includes($i); if (hasRenotedBefore) { From c965188ea700e15e66c2c37bfce269b138db404f Mon Sep 17 00:00:00 2001 From: thatonecalculator Date: Thu, 1 Dec 2022 23:22:43 -0800 Subject: [PATCH 42/51] fix --- package.json | 2 +- packages/client/src/components/MkRenoteButton.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index a4923241d3..4d0963fc3f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.18-rc.9", + "version": "12.119.0-calc.18-rc.10", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue index cee5687720..39dce49488 100644 --- a/packages/client/src/components/MkRenoteButton.vue +++ b/packages/client/src/components/MkRenoteButton.vue @@ -77,8 +77,8 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { limit: 11, }); - const users = renotes.map(x => x.user); - const hasRenotedBefore = users.includes($i); + const users = renotes.map(x => x.user.id); + const hasRenotedBefore = users.includes($i.id); if (hasRenotedBefore) { buttonActions.push({ From 69d828332b6831c0a97b202c9717804d1e5888c4 Mon Sep 17 00:00:00 2001 From: thatonecalculator Date: Thu, 1 Dec 2022 23:28:16 -0800 Subject: [PATCH 43/51] Consistent styling --- package.json | 2 +- packages/client/src/components/MkRenoteButton.vue | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4d0963fc3f..d732f2f79f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.18-rc.10", + "version": "12.119.0-calc.18-rc.11", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue index 39dce49488..3b7cc7a025 100644 --- a/packages/client/src/components/MkRenoteButton.vue +++ b/packages/client/src/components/MkRenoteButton.vue @@ -58,6 +58,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { let buttonActions = [{ text: i18n.ts.renote, icon: 'ph-repeat-bold ph-lg', + danger: false, action: () => { os.api('notes/create', { renoteId: props.note.id, @@ -83,7 +84,8 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { if (hasRenotedBefore) { buttonActions.push({ text: i18n.ts.unrenote, - icon: 'ph-eraser-bold ph-lg', + icon: 'ph-trash-bold ph-lg', + danger: true, action: () => { os.api('notes/unrenote', { noteId: props.note.id, @@ -95,6 +97,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { buttonActions.push({ text: i18n.ts.quote, icon: 'ph-quotes-bold ph-lg', + danger: false, action: () => { os.post({ renote: props.note, From ea6c1ebee202c9065805540394aaeaab1cb41527 Mon Sep 17 00:00:00 2001 From: thatonecalculator Date: Thu, 1 Dec 2022 23:37:25 -0800 Subject: [PATCH 44/51] take back button after quote button if combined --- .../client/src/components/MkRenoteButton.vue | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue index 3b7cc7a025..ffba924f95 100644 --- a/packages/client/src/components/MkRenoteButton.vue +++ b/packages/client/src/components/MkRenoteButton.vue @@ -55,6 +55,15 @@ useTooltip(buttonRef, async (showing) => { const renote = async (viaKeyboard = false, ev?: MouseEvent) => { pleaseLogin(); + + const renotes = await os.api('notes/renotes', { + noteId: props.note.id, + limit: 11, + }); + + const users = renotes.map(x => x.user.id); + const hasRenotedBefore = users.includes($i.id); + let buttonActions = [{ text: i18n.ts.renote, icon: 'ph-repeat-bold ph-lg', @@ -73,26 +82,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { } }, }]; - const renotes = await os.api('notes/renotes', { - noteId: props.note.id, - limit: 11, - }); - const users = renotes.map(x => x.user.id); - const hasRenotedBefore = users.includes($i.id); - - if (hasRenotedBefore) { - buttonActions.push({ - text: i18n.ts.unrenote, - icon: 'ph-trash-bold ph-lg', - danger: true, - action: () => { - os.api('notes/unrenote', { - noteId: props.note.id, - }); - }, - }); - } if (!defaultStore.state.seperateRenoteQuote) { buttonActions.push({ text: i18n.ts.quote, @@ -105,6 +95,19 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { }, }); } + + if (hasRenotedBefore) { + buttonActions.push({ + text: i18n.ts.unrenote, + icon: 'ph-trash-bold ph-lg', + danger: true, + action: () => { + os.api('notes/unrenote', { + noteId: props.note.id, + }); + }, + }); + } os.popupMenu(buttonActions, buttonRef.value, { viaKeyboard }); }; From 36785ee87c1b8a16237fcc2504ce379acf0dc3a2 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Fri, 2 Dec 2022 20:46:56 +0000 Subject: [PATCH 45/51] Add more patrons! --- patrons.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/patrons.json b/patrons.json index 65306d72f8..6d6af60415 100644 --- a/patrons.json +++ b/patrons.json @@ -4,6 +4,8 @@ "@shoq@newsroom.social", "@pikadude@erisly.social", "@sage@stop.voring.me", - "@sky@therian.club" + "@sky@therian.club", + "@panos@electricrequiem.com", + "@redhunt07@www.foxyhole.io", ] } From e6ebae074c9629b3406e6b87c010126990c441a9 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Fri, 2 Dec 2022 20:48:19 +0000 Subject: [PATCH 46/51] Trailing comma --- patrons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patrons.json b/patrons.json index 6d6af60415..194c0e98c3 100644 --- a/patrons.json +++ b/patrons.json @@ -6,6 +6,6 @@ "@sage@stop.voring.me", "@sky@therian.club", "@panos@electricrequiem.com", - "@redhunt07@www.foxyhole.io", + "@redhunt07@www.foxyhole.io" ] } From bc6169e1c8e0a6222ab4f2bdcae536516abaa39e Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 3 Dec 2022 16:02:03 -0800 Subject: [PATCH 47/51] Rename/re-icon "favorites" to "bookmarks": closes #9176 --- locales/en-US.yml | 18 +++--- packages/client/src/navbar.ts | 2 +- packages/client/src/pages/favorites.vue | 62 ++++++++++++-------- packages/client/src/scripts/get-note-menu.ts | 6 +- 4 files changed, 49 insertions(+), 39 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 6ad3bf614e..f58296b9f5 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -32,12 +32,12 @@ uploading: "Uploading..." save: "Save" users: "Users" addUser: "Add a user" -favorite: "Add to favorites" -favorites: "Favorites" -unfavorite: "Remove from favorites" -favorited: "Added to favorites." -alreadyFavorited: "Already added to favorites." -cantFavorite: "Couldn't add to favorites." +favorite: "Add to bookmarks" +favorites: "Bookmarks" +unfavorite: "Remove from bookmarks" +favorited: "Added to bookmarks." +alreadyFavorited: "Already added to bookmarks." +cantFavorite: "Couldn't add to bookmarks." pin: "Pin to profile" unpin: "Unpin from profile" copyContent: "Copy contents" @@ -679,7 +679,7 @@ disableShowingAnimatedImages: "Don't play animated images" verificationEmailSent: "A verification email has been sent. Please follow the included link to complete verification." notSet: "Not set" emailVerified: "Email has been verified" -noteFavoritesCount: "Number of favorite notes" +noteFavoritesCount: "Number of bookmarked notes" pageLikesCount: "Number of liked Pages" pageLikedCount: "Number of received Page likes" contact: "Contact" @@ -1250,8 +1250,8 @@ _permissions: "write:blocks": "Edit your list of blocked users" "read:drive": "Access your Drive files and folders" "write:drive": "Edit or delete your Drive files and folders" - "read:favorites": "View your list of favorites" - "write:favorites": "Edit your list of favorites" + "read:favorites": "View your list of bookmarks" + "write:favorites": "Edit your list of bookmarks" "read:following": "View information on who you follow" "write:following": "Follow or unfollow other accounts" "read:messaging": "View your chats" diff --git a/packages/client/src/navbar.ts b/packages/client/src/navbar.ts index 308f3f96b6..6785428a58 100644 --- a/packages/client/src/navbar.ts +++ b/packages/client/src/navbar.ts @@ -72,7 +72,7 @@ export const navbarItemDef = reactive({ }, favorites: { title: 'favorites', - icon: 'ph-star-bold ph-lg', + icon: 'ph-bookmark-simple-bold ph-lg', show: computed(() => $i != null), to: '/my/favorites', }, diff --git a/packages/client/src/pages/favorites.vue b/packages/client/src/pages/favorites.vue index c2a6b0600d..4895af18d1 100644 --- a/packages/client/src/pages/favorites.vue +++ b/packages/client/src/pages/favorites.vue @@ -1,35 +1,45 @@ diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts index 0e53aad2ac..9c52b2e242 100644 --- a/packages/client/src/scripts/get-note-menu.ts +++ b/packages/client/src/scripts/get-note-menu.ts @@ -231,12 +231,12 @@ export function getNoteMenu(props: { action: translate, } : undefined, null, - statePromise.then(state => state.isFavorited ? { - icon: 'ph-star-bold ph-lg', + statePromise.then(state => state?.isFavorited ? { + icon: 'ph-bookmark-simple-bold ph-lg', text: i18n.ts.unfavorite, action: () => toggleFavorite(false), } : { - icon: 'ph-star-bold ph-lg', + icon: 'ph-bookmark-simple-bold ph-lg', text: i18n.ts.favorite, action: () => toggleFavorite(true), }), From f0e8e6bce48a5434cd514df16aa280e5e427f77c Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 3 Dec 2022 18:45:24 -0800 Subject: [PATCH 48/51] Hide share button if unavailable (closes #9175) --- packages/client/src/pages/gallery/post.vue | 3 ++- packages/client/src/pages/page.vue | 3 ++- packages/client/src/scripts/get-note-menu.ts | 5 +++-- packages/client/src/scripts/share-available.ts | 6 ++++++ 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 packages/client/src/scripts/share-available.ts diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue index 43d3651b81..a4be9e85fa 100644 --- a/packages/client/src/pages/gallery/post.vue +++ b/packages/client/src/pages/gallery/post.vue @@ -24,7 +24,7 @@
- +
@@ -67,6 +67,7 @@ import { url } from '@/config'; import { useRouter } from '@/router'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; +import { shareAvailable } from '@/scripts/share-available'; const router = useRouter(); diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue index 2497db950e..e89fd3e2a8 100644 --- a/packages/client/src/pages/page.vue +++ b/packages/client/src/pages/page.vue @@ -34,7 +34,7 @@
- +
@@ -81,6 +81,7 @@ import MkPagination from '@/components/MkPagination.vue'; import MkPagePreview from '@/components/MkPagePreview.vue'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; +import { shareAvailable } from '@/scripts/share-available'; const props = defineProps<{ pageName: string; diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts index 9c52b2e242..e17ade59c0 100644 --- a/packages/client/src/scripts/get-note-menu.ts +++ b/packages/client/src/scripts/get-note-menu.ts @@ -8,6 +8,7 @@ import * as os from '@/os'; import copyToClipboard from '@/scripts/copy-to-clipboard'; import { url } from '@/config'; import { noteActions } from '@/store'; +import { shareAvailable } from '@/scripts/share-available'; export function getNoteMenu(props: { note: misskey.entities.Note; @@ -220,11 +221,11 @@ export function getNoteMenu(props: { window.open(appearNote.url || appearNote.uri, '_blank'); }, } : undefined, - { + shareAvailable() ? { icon: 'ph-share-network-bold ph-lg', text: i18n.ts.share, action: share, - }, + } : undefined, instance.translatorAvailable ? { icon: 'ph-translate-bold ph-lg', text: i18n.ts.translate, diff --git a/packages/client/src/scripts/share-available.ts b/packages/client/src/scripts/share-available.ts new file mode 100644 index 0000000000..8056d6dc2e --- /dev/null +++ b/packages/client/src/scripts/share-available.ts @@ -0,0 +1,6 @@ +export function shareAvailable(): boolean { + if (navigator.share) { + return true; + } + return false; +} From 19baca72c951c463cd56b31646e695b3bf91d18a Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 3 Dec 2022 21:32:32 -0800 Subject: [PATCH 49/51] =?UTF-8?q?release:=20=F0=9F=94=96=20.18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d732f2f79f..7e0d154012 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.18-rc.11", + "version": "12.119.0-calc.18", "codename": "aqua", "repository": { "type": "git", From aacb1420d233499c6774147d46c5c6b1a3acbc89 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 3 Dec 2022 21:50:18 -0800 Subject: [PATCH 50/51] feat: Docker update script (closes #9159) --- push-docker.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 push-docker.sh diff --git a/push-docker.sh b/push-docker.sh new file mode 100755 index 0000000000..434c9cc630 --- /dev/null +++ b/push-docker.sh @@ -0,0 +1,10 @@ +sudo systemctl start docker.service +sudo docker rmi $(docker images -q) +sudo docker compose build +sudo docker tag thatonecalculator/calckey:latest thatonecalculator/calckey:$(git describe --tags --exact-match) +sudo docker images +echo "\nPress any key to continue\n" +read +sudo docker push thatonecalculator/calckey:$(git describe --tags --exact-match) +sudo docker push thatonecalculator/calckey:latest +sudo systemctl stop docker.service From c3226b896d291484d670077608292e6a3cd643bf Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Sat, 3 Dec 2022 21:56:45 -0800 Subject: [PATCH 51/51] locale --- locales/en-US.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index f58296b9f5..0f3fff72e3 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1227,7 +1227,7 @@ _tutorial: step5_3: "The Home {icon} timeline is where you can see posts from your followers." step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance." step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend." - step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers." + step5_6: "The Social {icon} timeline is your home + local." step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance." step6_1: "So, what is this place?" step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"."