From 88d9f59957a731cdb2214da9bc1e00ade9bd0b4d Mon Sep 17 00:00:00 2001 From: Insert5StarName Date: Sat, 18 Nov 2023 05:17:00 +0100 Subject: [PATCH 01/43] upd: highlight active tab text --- packages/frontend/src/components/global/MkPageHeader.tabs.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/frontend/src/components/global/MkPageHeader.tabs.vue b/packages/frontend/src/components/global/MkPageHeader.tabs.vue index 320ece4efd..75c8e73582 100644 --- a/packages/frontend/src/components/global/MkPageHeader.tabs.vue +++ b/packages/frontend/src/components/global/MkPageHeader.tabs.vue @@ -216,6 +216,7 @@ onUnmounted(() => { &.active { opacity: 1; + color: var(--accent); } &.animate { From d50d335e44c29c2ab7d3154d70b5b12a2cc073fd Mon Sep 17 00:00:00 2001 From: dakkar Date: Sun, 26 Nov 2023 15:59:32 +0000 Subject: [PATCH 02/43] re-fix "hide preview of quote-renote" I'm not sure how this got lost --- packages/frontend/src/components/MkNote.vue | 2 +- packages/frontend/src/components/MkNoteDetailed.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 784a9ca348..6dedf4702b 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -271,7 +271,7 @@ const renoteUri = appearNote.renote ? appearNote.renote.uri : null; const isMyRenote = $i && ($i.id === note.userId); const showContent = ref(false); const parsed = $computed(() => appearNote.text ? mfm.parse(appearNote.text) : null); -const urls = $computed(() => parsed ? extractUrlFromMfm(parsed) : null); +const urls = $computed(() => parsed ? extractUrlFromMfm(parsed).filter(u => u !== renoteUrl && u !== renoteUri) : null); const animated = $computed(() => parsed ? checkAnimationFromMfm(parsed) : null); const allowAnim = ref(defaultStore.state.advancedMfm && defaultStore.state.animatedMfm ? true : false); const isLong = shouldCollapsed(appearNote, urls ?? []); diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index ef677389ca..fba81f58be 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -315,7 +315,7 @@ const muted = ref($i ? checkWordMute(appearNote, $i, $i.mutedWords) : false); const translation = ref(null); const translating = ref(false); const parsed = $computed(() => appearNote.text ? mfm.parse(appearNote.text) : null); -const urls = parsed ? extractUrlFromMfm(parsed) : null; +const urls = parsed ? extractUrlFromMfm(parsed).filter(u => u !== renoteUrl && u !== renoteUri) : null; const animated = $computed(() => parsed ? checkAnimationFromMfm(parsed) : null); const allowAnim = ref(defaultStore.state.advancedMfm && defaultStore.state.animatedMfm ? true : false); const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance); From ca72939c49e096afceb2ba96f330a03549a97195 Mon Sep 17 00:00:00 2001 From: Marie Date: Sun, 26 Nov 2023 17:24:20 +0100 Subject: [PATCH 03/43] Revert "release: 2023.11.1" --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6e8bb90511..6680b64806 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sharkey", - "version": "2023.11.1", + "version": "2023.11.1.beta2", "codename": "shonk", "repository": { "type": "git", From f02573cc3ed98be327ec266971ac3df4f69bb0ad Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Sun, 26 Nov 2023 17:27:25 +0100 Subject: [PATCH 04/43] chore: up dev version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6680b64806..1207e18028 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sharkey", - "version": "2023.11.1.beta2", + "version": "2023.11.2.beta1", "codename": "shonk", "repository": { "type": "git", From f262533723d5bf025b848688c5fccd3b4a4592e9 Mon Sep 17 00:00:00 2001 From: Marie Date: Sun, 26 Nov 2023 18:37:17 +0100 Subject: [PATCH 05/43] chore: fix english locale --- locales/en-US.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index e91ef1559c..7f30959c12 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -745,8 +745,8 @@ thisIsExperimentalFeature: "This is an experimental feature. Its functionality i developer: "Developer" makeExplorable: "Make account visible in \"Explore\"" makeExplorableDescription: "If you turn this off, your account will not show up in the \"Explore\" section." -makeIndexable: "Make public notes indexable" -makeIndexableDescription: "Allow note search to index your public notes." +makeIndexable: "Make public notes not indexable" +makeIndexableDescription: "Stop note search from indexing your public notes." showGapBetweenNotesInTimeline: "Show a gap between posts on the timeline" duplicate: "Duplicate" left: "Left" From 51ec675e002bc8ffb98506259db205d146b11145 Mon Sep 17 00:00:00 2001 From: Marie Date: Sun, 26 Nov 2023 18:38:35 +0100 Subject: [PATCH 06/43] chore: fix japanese locale --- locales/ja-JP.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index b4087b42d5..25ee9b1889 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -745,8 +745,8 @@ thisIsExperimentalFeature: "これは実験的な機能です。仕様が変更 developer: "開発者" makeExplorable: "アカウントを見つけやすくする" makeExplorableDescription: "オフにすると、「みつける」にアカウントが載らなくなります。" -makeIndexable: "公開ノートをインデックス化" -makeIndexableDescription: "ノート検索で公開ノートにインデックスを付けられるようにする。" +makeIndexable: "公開ノートをインデックス不可にする" +makeIndexableDescription: "ノート検索があなたの公開ノートをインデックス化しないようにします。" showGapBetweenNotesInTimeline: "タイムラインのノートを離して表示" duplicate: "複製" left: "左" From 3d0b754332192533b166f8aa20ec87f1808edfe8 Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Mon, 27 Nov 2023 22:06:25 +0100 Subject: [PATCH 07/43] fix: selecting text in a note causing it to open Closes transfem-org/Sharkey#175 --- packages/frontend/src/components/MkNote.vue | 5 ++++- packages/frontend/src/components/MkSubNoteContent.vue | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 6dedf4702b..80fd4fc45c 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -226,7 +226,10 @@ const currentClip = inject | null>('currentClip', nul let note = $ref(deepClone(props.note)); function noteclick(id: string) { - router.push(`/notes/${id}`); + const selection = document.getSelection(); + if (selection?.toString().length === 0) { + router.push(`/notes/${id}`); + } } // plugin diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue index 110644947f..8a306d172f 100644 --- a/packages/frontend/src/components/MkSubNoteContent.vue +++ b/packages/frontend/src/components/MkSubNoteContent.vue @@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.t('translatedFrom', { x: translation.sourceLang }) }}: - +
RN: ... @@ -63,7 +63,10 @@ const props = defineProps<{ const router = useRouter(); function noteclick(id: string) { - router.push(`/notes/${id}`); + const selection = document.getSelection(); + if (selection?.toString().length === 0) { + router.push(`/notes/${id}`); + } } const parsed = $computed(() => props.note.text ? mfm.parse(props.note.text) : null); From 958b97a50ccd99e01c8b03ba83b26bea182e0817 Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Mon, 27 Nov 2023 22:17:03 +0100 Subject: [PATCH 08/43] upd: add ability to open remote profile in user dropdown Closes transfem-org/Sharkey#176 --- locales/en-US.yml | 1 + locales/index.d.ts | 1 + locales/ja-JP.yml | 1 + packages/frontend/src/scripts/get-user-menu.ts | 8 +++++++- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 7f30959c12..28751cb7ef 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -55,6 +55,7 @@ addToAntenna: "Add to antenna" sendMessage: "Send a message" copyRSS: "Copy RSS" copyUsername: "Copy username" +openRemoteProfile: "Open remote profile" copyUserId: "Copy user ID" copyNoteId: "Copy note ID" copyFileId: "Copy file ID" diff --git a/locales/index.d.ts b/locales/index.d.ts index 8356046a6b..97fdd0f25e 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -58,6 +58,7 @@ export interface Locale { "sendMessage": string; "copyRSS": string; "copyUsername": string; + "openRemoteProfile": string; "copyUserId": string; "copyNoteId": string; "copyFileId": string; diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 25ee9b1889..16d8d31694 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -55,6 +55,7 @@ addToAntenna: "アンテナに追加" sendMessage: "メッセージを送信" copyRSS: "RSSをコピー" copyUsername: "ユーザー名をコピー" +openRemoteProfile: "リモートプロファイルを開く" copyUserId: "ユーザーIDをコピー" copyNoteId: "ノートIDをコピー" copyFileId: "ファイルIDをコピー" diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts index c8942314b2..41d0df1b72 100644 --- a/packages/frontend/src/scripts/get-user-menu.ts +++ b/packages/frontend/src/scripts/get-user-menu.ts @@ -176,7 +176,13 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${toUnicode(user.host)}`; copyToClipboard(`${url}/${canonical}`); }, - }, { + }, ...(user.host ? [{ + icon: 'ph-share ph-bold ph-lg', + text: i18n.ts.openRemoteProfile, + action: () => { + open(`${user.uri}`, '_blank'); + }, + }] : []), { icon: 'ph-envelope ph-bold ph-lg', text: i18n.ts.sendMessage, action: () => { From 7b9c16487b0840b6b9ec64a60f3282195853dbb1 Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Mon, 27 Nov 2023 23:35:18 +0100 Subject: [PATCH 09/43] upd: add fields to user popup Closes transfem-org/Sharkey#173 --- .../frontend/src/components/MkUserPopup.vue | 55 ++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/packages/frontend/src/components/MkUserPopup.vue b/packages/frontend/src/components/MkUserPopup.vue index 1ddae40b9d..d958b325e5 100644 --- a/packages/frontend/src/components/MkUserPopup.vue +++ b/packages/frontend/src/components/MkUserPopup.vue @@ -28,9 +28,20 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
{{ i18n.ts.noAccountDescription }}
+
+
+
+ +
+
+ + +
+
+
{{ i18n.ts.notes }}
@@ -221,6 +232,48 @@ onMounted(() => { border-bottom: solid 1px var(--divider); } +.fields { + font-size: 0.8em; + padding: 16px; + border-top: solid 1px var(--divider); + border-bottom: solid 1px var(--divider); +} + +.field { + display: flex; + padding: 0; + margin: 0; + + &:not(:last-child) { + margin-bottom: 8px; + } + + :deep(span) { + white-space: nowrap !important; + } +} + +.fieldvalue { + width: 70%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + word-wrap: nowrap; + margin: 0; +} + +.fieldname { + width: 100px; + max-height: 45px; + overflow: hidden; + white-space: nowrap; + display: inline; + text-overflow: ellipsis; + font-weight: bold; + text-align: center; + padding-inline-end: 10px; +} + .mfm { display: -webkit-box; -webkit-line-clamp: 5; From 13e8269993642d9829eace4ad4ce04432dfe1cbc Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Tue, 28 Nov 2023 02:07:50 +0100 Subject: [PATCH 10/43] upd: unset overscroll-behavior on universal --- packages/frontend/src/ui/universal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/ui/universal.vue b/packages/frontend/src/ui/universal.vue index 0213f94f5e..448f2f81f8 100644 --- a/packages/frontend/src/ui/universal.vue +++ b/packages/frontend/src/ui/universal.vue @@ -324,7 +324,7 @@ $widgets-hide-threshold: 1090px; min-width: 0; overflow: auto; overflow-y: scroll; - overscroll-behavior: contain; + overscroll-behavior: unset; background: var(--bg); } From bd470596ccdb621b290b240071d3d2a525b3e743 Mon Sep 17 00:00:00 2001 From: Mar0xy Date: Tue, 28 Nov 2023 03:01:37 +0100 Subject: [PATCH 11/43] upd: collapse mentions if multiple are followed in a row --- .../frontend/src/components/MkMention.vue | 44 ++++++++++++++++++- .../global/MkMisskeyFlavoredMarkdown.ts | 8 +++- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/components/MkMention.vue b/packages/frontend/src/components/MkMention.vue index 4d42053657..3319835a30 100644 --- a/packages/frontend/src/components/MkMention.vue +++ b/packages/frontend/src/components/MkMention.vue @@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only -->