From 44c6bc7dd0c796a2c28136ab5574c39a8941c20c Mon Sep 17 00:00:00 2001 From: cutestnekoaqua Date: Sun, 5 Feb 2023 12:38:40 +0100 Subject: [PATCH 001/382] fixing a git merge error. --- packages/backend/src/misc/reaction-lib.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/backend/src/misc/reaction-lib.ts b/packages/backend/src/misc/reaction-lib.ts index 5fd47aab70..babebfb627 100644 --- a/packages/backend/src/misc/reaction-lib.ts +++ b/packages/backend/src/misc/reaction-lib.ts @@ -71,6 +71,12 @@ export async function toDbReaction( if (Object.keys(legacies).includes(reaction)) return legacies[reaction]; // Convert old heart to new if (reaction === "♥️") return "❤️"; + // Allow unicode reactions + const match = emojiRegex.exec(reaction); + if (match) { + const unicode = match[0]; + return unicode; + } const custom = reaction.match(/^:([\w+-]+)(?:@\.)?:$/); if (custom) { From 2ae58c1c629dcd6d2d0e8f8f48d5dc80e26923fb Mon Sep 17 00:00:00 2001 From: cutestnekoaqua Date: Sun, 5 Feb 2023 12:39:57 +0100 Subject: [PATCH 002/382] fix: docker tags --- .woodpecker/dockerHubTag.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.woodpecker/dockerHubTag.yml b/.woodpecker/dockerHubTag.yml index 4294e1a581..5543ae2340 100644 --- a/.woodpecker/dockerHubTag.yml +++ b/.woodpecker/dockerHubTag.yml @@ -16,6 +16,3 @@ pipeline: # Push new version when version tag is created event: tag tag: v* - -depends_on: - - prSecurityCheck From 3ecc69185c9f01334d8c0047f37eed78d7f740eb Mon Sep 17 00:00:00 2001 From: Cleo Date: Thu, 9 Feb 2023 22:59:05 +0000 Subject: [PATCH 003/382] Beta Docker build (#9589) Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9589 --- .woodpecker/dockerHubRelease.yml | 2 +- .woodpecker/dockerHubReleaseCandidate.yml | 15 +++++++++++++++ .woodpecker/testDocker.yml | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 .woodpecker/dockerHubReleaseCandidate.yml diff --git a/.woodpecker/dockerHubRelease.yml b/.woodpecker/dockerHubRelease.yml index e995b3fd01..bcb6df4904 100644 --- a/.woodpecker/dockerHubRelease.yml +++ b/.woodpecker/dockerHubRelease.yml @@ -12,4 +12,4 @@ pipeline: # Secret 'docker_password' needs to be set in the CI settings from_secret: docker_password -branch: main +branches: main diff --git a/.woodpecker/dockerHubReleaseCandidate.yml b/.woodpecker/dockerHubReleaseCandidate.yml new file mode 100644 index 0000000000..9b1a84316d --- /dev/null +++ b/.woodpecker/dockerHubReleaseCandidate.yml @@ -0,0 +1,15 @@ +pipeline: + publish-docker-latest: + image: plugins/kaniko + settings: + repo: thatonecalculator/calckey + tags: rc + dockerfile: Dockerfile + username: + # Secret 'docker_username' needs to be set in the CI settings + from_secret: docker_username + password: + # Secret 'docker_password' needs to be set in the CI settings + from_secret: docker_password + +branches: beta diff --git a/.woodpecker/testDocker.yml b/.woodpecker/testDocker.yml index aef58c9ad4..e3fdf0eb93 100644 --- a/.woodpecker/testDocker.yml +++ b/.woodpecker/testDocker.yml @@ -8,4 +8,4 @@ pipeline: no_push: true branches: - include: [ main, develop ] + include: [ main, develop, beta ] From 69089016d551c5a39a89a1ddc7c6a057bff1daab Mon Sep 17 00:00:00 2001 From: Cleo Date: Fri, 10 Feb 2023 07:00:47 +0000 Subject: [PATCH 004/382] Meow --- .woodpecker/dockerHubReleaseCandidate.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker/dockerHubReleaseCandidate.yml b/.woodpecker/dockerHubReleaseCandidate.yml index 9b1a84316d..48bd39525f 100644 --- a/.woodpecker/dockerHubReleaseCandidate.yml +++ b/.woodpecker/dockerHubReleaseCandidate.yml @@ -11,5 +11,4 @@ pipeline: password: # Secret 'docker_password' needs to be set in the CI settings from_secret: docker_password - branches: beta From a6e1669d608a1518be6e5b8c48b97770dcd6c33e Mon Sep 17 00:00:00 2001 From: Cleo Date: Fri, 10 Feb 2023 07:10:42 +0000 Subject: [PATCH 005/382] Nya --- cypress/e2e/widgets.cy.js | 1 - 1 file changed, 1 deletion(-) diff --git a/cypress/e2e/widgets.cy.js b/cypress/e2e/widgets.cy.js index db35a60b5a..9eea010bde 100644 --- a/cypress/e2e/widgets.cy.js +++ b/cypress/e2e/widgets.cy.js @@ -2,7 +2,6 @@ describe('After user signed in', () => { beforeEach(() => { cy.resetState(); cy.viewport('macbook-16'); - // インスタンス初期セットアップ cy.registerUser('admin', 'pass', true); From 234315dacd415567e0c7381b601bcfb94857c3d9 Mon Sep 17 00:00:00 2001 From: Cleo Date: Fri, 10 Feb 2023 10:04:32 +0000 Subject: [PATCH 006/382] Fix build --- packages/backend/src/misc/reaction-lib.ts | 7 ------- 1 file changed, 7 deletions(-) diff --git a/packages/backend/src/misc/reaction-lib.ts b/packages/backend/src/misc/reaction-lib.ts index 41036489a6..babebfb627 100644 --- a/packages/backend/src/misc/reaction-lib.ts +++ b/packages/backend/src/misc/reaction-lib.ts @@ -78,13 +78,6 @@ export async function toDbReaction( return unicode; } - // Allow unicode reactions - const match = emojiRegex.exec(reaction); - if (match) { - const unicode = match[0]; - return unicode; - } - const custom = reaction.match(/^:([\w+-]+)(?:@\.)?:$/); if (custom) { const name = custom[1]; From 424fdd4f267d1f8630588a2d540e3102f0c3ba45 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Sat, 11 Feb 2023 06:02:08 +0000 Subject: [PATCH 007/382] Upload files to 'packages/backend/assets' --- packages/backend/assets/favicon.svg | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 packages/backend/assets/favicon.svg diff --git a/packages/backend/assets/favicon.svg b/packages/backend/assets/favicon.svg new file mode 100644 index 0000000000..a77c6e22bb --- /dev/null +++ b/packages/backend/assets/favicon.svg @@ -0,0 +1,25 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + \ No newline at end of file From a1592dad907736c3afe1f8d44f9a9188d0348da3 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Sat, 11 Feb 2023 06:10:15 +0000 Subject: [PATCH 008/382] Delete 'packages/backend/assets/favicon.svg' --- packages/backend/assets/favicon.svg | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 packages/backend/assets/favicon.svg diff --git a/packages/backend/assets/favicon.svg b/packages/backend/assets/favicon.svg deleted file mode 100644 index a77c6e22bb..0000000000 --- a/packages/backend/assets/favicon.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 00bcaeaa47ef48d1fd13f190b21a6ceda619235a Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Mon, 13 Feb 2023 03:35:21 +0000 Subject: [PATCH 009/382] Update 'CALCKEY.md' --- CALCKEY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CALCKEY.md b/CALCKEY.md index 015232f700..1186277e27 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -108,6 +108,7 @@ - Allows custom emoji - Fix lint errors - Use Rome instead of ESLint +- Keyboard accesibility - MissV: [fix Misskey Forkbomb](https://code.vtopia.live/Vtopia/MissV/commit/40b23c070bd4adbb3188c73546c6c625138fb3c1) - [Make showing ads optional](https://github.com/misskey-dev/misskey/pull/8996) - [Tapping avatar in mobile opens account modal](https://github.com/misskey-dev/misskey/pull/9056) From 94b9db451ec9121e1494adbc7e0ca92bfa2f2231 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Mon, 20 Feb 2023 12:20:47 -0800 Subject: [PATCH 010/382] update readme --- README.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index bc4141a8e2..fd6b14c25d 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ If you have access to a server that supports one of the sources below, I recomme ### 🐋 Docker -[How to run Calckey with Docker](./docker-README.md). +[How to run Calckey with Docker](./docs/docker.md). ## 🧑‍💻 Dependencies @@ -97,9 +97,10 @@ If you have access to a server that supports one of the sources below, I recomme ```sh git clone --depth 1 https://codeberg.org/calckey/calckey.git cd calckey/ -# git checkout main # if you want only stable versions ``` +By default, you're on the development branch. Run `git checkout beta` or `git checkout main` to switch to the Beta/Main branches. + ## 📩 Install dependencies ```sh @@ -123,6 +124,8 @@ psql postgres -c "create database calckey with encoding = 'UTF8';" - To add custom CSS for all users, edit `./custom/assets/instance.css`. - To add static assets (such as images for the splash screen), place them in the `./custom/assets/` directory. They'll then be available on `https://yourinstance.tld/static-assets/filename.ext`. - To add custom locales, place them in the `./custom/locales/` directory. If you name your custom locale the same as an existing locale, it will overwrite it. If you give it a unique name, it will be added to the list. Also make sure that the first part of the filename matches the locale you're basing it on. (Example: `en-FOO.yml`) +- To add custom error images, place them in the `./custom/assets/badges` directory, replacing the files already there. +- To add custom sounds, place only mp3 files in the `./custom/assets/sounds` directory. - To update custom assets without rebuilding, just run `pnpm run gulp`. ## 🧑‍🔬 Configuring a new instance @@ -133,12 +136,7 @@ psql postgres -c "create database calckey with encoding = 'UTF8';" ## 🚚 Migrating from Misskey to Calckey -> ⚠️ Because of their changes, migrating from Foundkey is not supported. - -```sh -cp ../misskey/.config/default.yml ./.config/default.yml # replace `../misskey/` with misskey path, add `docker.env` if you use Docker -cp -r ../misskey/files . -``` +For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](https://codeberg.org/calckey/calckey/src/branch/develop/docs/migrate.md). ## 🍀 NGINX From c48c42850c6b08eb4345815e43087f2261ddeeec Mon Sep 17 00:00:00 2001 From: Freeplay Date: Thu, 23 Feb 2023 20:50:58 -0500 Subject: [PATCH 011/382] fix not being able to click around there are new posts button --- packages/client/src/pages/timeline.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index 3646e8d86d..9357050c7e 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -315,12 +315,14 @@ onMounted(() => { top: calc(var(--stickyTop, 0px) + 16px); z-index: 1000; width: 100%; + pointer-events: none; > button { display: block; margin: var(--margin) auto 0 auto; padding: 8px 16px; border-radius: 32px; + pointer-events: all; } } From 2f419ad7278fd23d9afe0261e569c9f251af4e00 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 17 Feb 2023 00:01:22 -0800 Subject: [PATCH 012/382] perf: :zap: emoji lib performance fix --- packages/backend/src/misc/reaction-lib.ts | 87 +++++++++++------------ 1 file changed, 41 insertions(+), 46 deletions(-) diff --git a/packages/backend/src/misc/reaction-lib.ts b/packages/backend/src/misc/reaction-lib.ts index a61c0a1198..7d78904bba 100644 --- a/packages/backend/src/misc/reaction-lib.ts +++ b/packages/backend/src/misc/reaction-lib.ts @@ -4,73 +4,68 @@ import { Emojis } from "@/models/index.js"; import { toPunyNullable } from "./convert-host.js"; import { IsNull } from "typeorm"; -const legacies: Record = { - like: "👍", - love: "❤️", // ここに記述する場合は異体字セレクタを入れない <- not that good because modern browsers just display it as the red heart so just convert it to it to not end up with two seperate reactions of "the same emoji" for the user - laugh: "😆", - hmm: "🤔", - surprise: "😮", - congrats: "🎉", - angry: "💢", - confused: "😥", - rip: "😇", - pudding: "🍮", - star: "⭐", -}; +const legacies = new Map([ + ['like', '👍'], + ['love', '❤️'], + ['laugh', '😆'], + ['hmm', '🤔'], + ['surprise', '😮'], + ['congrats', '🎉'], + ['angry', '💢'], + ['confused', '😥'], + ['rip', '😇'], + ['pudding', '🍮'], + ['star', '⭐'], +]); -export async function getFallbackReaction(): Promise { +export async function getFallbackReaction() { const meta = await fetchMeta(); return meta.defaultReaction; } export function convertLegacyReactions(reactions: Record) { - const _reactions = {} as Record; + const _reactions = new Map(); + const decodedReactions = new Map(); - for (const reaction of Object.keys(reactions)) { + for (const reaction in reactions) { if (reactions[reaction] <= 0) continue; - if (Object.keys(legacies).includes(reaction)) { - if (_reactions[legacies[reaction]]) { - _reactions[legacies[reaction]] += reactions[reaction]; - } else { - _reactions[legacies[reaction]] = reactions[reaction]; - } - } else if (reaction === "♥️") { - if (_reactions["❤️"]) { - _reactions["❤️"] += reactions[reaction]; - } else { - _reactions["❤️"] = reactions[reaction]; - } + let decodedReaction; + if (decodedReactions.has(reaction)) { + decodedReaction = decodedReactions.get(reaction); } else { - if (_reactions[reaction]) { - _reactions[reaction] += reactions[reaction]; - } else { - _reactions[reaction] = reactions[reaction]; - } + decodedReaction = decodeReaction(reaction); + decodedReactions.set(reaction, decodedReaction); + } + + let emoji = legacies.get(decodedReaction.reaction); + if (emoji) { + _reactions.set(emoji, (_reactions.get(emoji) || 0) + reactions[reaction]); + } else { + _reactions.set(reaction, (_reactions.get(reaction) || 0) + reactions[reaction]); } } - const _reactions2 = {} as Record; - - for (const reaction of Object.keys(_reactions)) { - _reactions2[decodeReaction(reaction).reaction] = _reactions[reaction]; + const _reactions2 = new Map(); + for (const [reaction, count] of _reactions) { + const decodedReaction = decodedReactions.get(reaction); + _reactions2.set(decodedReaction.reaction, count); } - return _reactions2; + return Object.fromEntries(_reactions2); } export async function toDbReaction( reaction?: string | null, reacterHost?: string | null, ): Promise { - if (reaction == null) return await getFallbackReaction(); + if (!reaction) return await getFallbackReaction(); reacterHost = toPunyNullable(reacterHost); // Convert string-type reactions to unicode - if (Object.keys(legacies).includes(reaction)) return legacies[reaction]; - // Convert old heart to new - if (reaction === "♥️") return "❤️"; + const emoji = legacies.get(reaction) || (reaction === "♥️" ? "❤️" : null); + if (emoji) return emoji; // Allow unicode reactions const match = emojiRegex.exec(reaction); @@ -83,7 +78,7 @@ export async function toDbReaction( if (custom) { const name = custom[1]; const emoji = await Emojis.findOneBy({ - host: reacterHost ?? IsNull(), + host: reacterHost || IsNull(), name, }); @@ -132,7 +127,7 @@ export function decodeReaction(str: string): DecodedReaction { } export function convertLegacyReaction(reaction: string): string { - reaction = decodeReaction(reaction).reaction; - if (Object.keys(legacies).includes(reaction)) return legacies[reaction]; - return reaction; + const decoded = decodeReaction(reaction).reaction; + if (legacies.has(decoded)) return legacies.get(decoded)!; + return decoded; } From 456eb4b62746c62cdf505872cd1b7a501dc0a9c9 Mon Sep 17 00:00:00 2001 From: Free Date: Mon, 13 Feb 2023 21:14:06 +0000 Subject: [PATCH 013/382] New MkPageHeader --- .../src/components/global/MkPageHeader.vue | 85 +++++++++++-------- 1 file changed, 50 insertions(+), 35 deletions(-) diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue index 464a965b33..5eaa5e4fee 100644 --- a/packages/client/src/components/global/MkPageHeader.vue +++ b/packages/client/src/components/global/MkPageHeader.vue @@ -1,35 +1,35 @@ + + diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue index 2d8eeefcfc..f243f93459 100644 --- a/packages/client/src/pages/channels.vue +++ b/packages/client/src/pages/channels.vue @@ -20,6 +20,24 @@ @swiper="setSwiperRef" @slide-change="onSlideChange" > + +
+
+ + + + + + + + {{ i18n.ts.search }} +
+ + + + +
+
- + diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue index ea01fcdc0a..b70edda7d5 100644 --- a/packages/client/src/components/MkRenoteButton.vue +++ b/packages/client/src/components/MkRenoteButton.vue @@ -35,7 +35,7 @@ const buttonRef = ref(); const canRenote = computed( () => - ["public", "home","hidden"].includes(props.note.visibility) || + ["public", "home", "hidden"].includes(props.note.visibility) || props.note.userId === $i.id ); @@ -75,7 +75,10 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { let buttonActions = []; - if (props.note.visibility === "public" || props.note.visibility === "hidden") { + if ( + props.note.visibility === "public" || + props.note.visibility === "hidden" + ) { buttonActions.push({ text: i18n.ts.renote, textStyle: "font-weight: bold", @@ -102,7 +105,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => { }); } - if (["public", "home","hidden"].includes(props.note.visibility)) { + if (["public", "home", "hidden"].includes(props.note.visibility)) { buttonActions.push({ text: `${i18n.ts.renote} (${i18n.ts._visibility.home})`, icon: "ph-house ph-bold ph-lg", diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue index f243f93459..3fcda33d4d 100644 --- a/packages/client/src/pages/channels.vue +++ b/packages/client/src/pages/channels.vue @@ -23,18 +23,44 @@
- - + + - - - + + + - {{ i18n.ts.search }} + {{ i18n.ts.search }}
- - + +
@@ -96,12 +122,12 @@ import { computed, onMounted, defineComponent, inject, watch } from "vue"; import { Virtual } from "swiper"; import { Swiper, SwiperSlide } from "swiper/vue"; import MkChannelPreview from "@/components/MkChannelPreview.vue"; -import MkChannelList from '@/components/MkChannelList.vue'; +import MkChannelList from "@/components/MkChannelList.vue"; import MkPagination from "@/components/MkPagination.vue"; -import MkInput from '@/components/MkInput.vue'; -import MkRadios from '@/components/MkRadios.vue'; +import MkInput from "@/components/MkInput.vue"; +import MkRadios from "@/components/MkRadios.vue"; import MkButton from "@/components/MkButton.vue"; -import MkFoldableSection from '@/components/MkFoldableSection.vue'; +import MkFoldableSection from "@/components/MkFoldableSection.vue"; import { useRouter } from "@/router"; import { definePageMetadata } from "@/scripts/page-metadata"; import { deviceKind } from "@/scripts/device-kind"; @@ -120,14 +146,14 @@ const props = defineProps<{ query: string; type?: string; }>(); -let key = $ref(''); -let tab = $ref('search'); -let searchQuery = $ref(''); -let searchType = $ref('nameAndDescription'); +let key = $ref(""); +let tab = $ref("search"); +let searchQuery = $ref(""); +let searchType = $ref("nameAndDescription"); let channelPagination = $ref(); onMounted(() => { - searchQuery = props.query ?? ''; - searchType = props.type ?? 'nameAndDescription'; + searchQuery = props.query ?? ""; + searchType = props.type ?? "nameAndDescription"; }); const featuredPagination = { @@ -146,10 +172,10 @@ const ownedPagination = { async function search() { const query = searchQuery.toString().trim(); - if (query == null || query === '') return; + if (query == null || query === "") return; const type = searchType.toString().trim(); channelPagination = { - endpoint: 'channels/search', + endpoint: "channels/search", limit: 10, params: { query: searchQuery, @@ -173,9 +199,9 @@ const headerActions = $computed(() => [ const headerTabs = $computed(() => [ { - key: 'search', + key: "search", title: i18n.ts.search, - icon: 'ti ti-search', + icon: "ti ti-search", }, { key: "featured", From baef1b8ca9ad22d7146b5a56bcbc744bca371366 Mon Sep 17 00:00:00 2001 From: naskya Date: Sun, 7 May 2023 08:08:07 +0900 Subject: [PATCH 106/382] Use phosphor icons --- packages/client/src/pages/channels.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue index 3fcda33d4d..f188fb1daf 100644 --- a/packages/client/src/pages/channels.vue +++ b/packages/client/src/pages/channels.vue @@ -30,7 +30,7 @@ type="search" > [ { key: "search", title: i18n.ts.search, - icon: "ti ti-search", + icon: "ph-search ph-bold ph-lg", }, { key: "featured", From cd3cfe4203867d9e654ffb5bf3c1dd59640f654b Mon Sep 17 00:00:00 2001 From: Kaity A Date: Sun, 7 May 2023 09:26:24 +1000 Subject: [PATCH 107/382] Add support for CW boosting --- locales/en-US.yml | 1 + packages/client/src/components/MkMenu.vue | 47 ++- packages/client/src/components/MkNote.vue | 3 +- packages/client/src/components/MkNoteSub.vue | 1 + .../client/src/components/MkPopupMenu.vue | 22 +- .../client/src/components/MkRenoteButton.vue | 43 ++- .../src/components/MkSubNoteContent.vue | 288 ++++++++++-------- packages/client/src/os.ts | 4 +- .../client/src/pages/settings/general.vue | 4 + packages/client/src/store.ts | 4 + packages/client/src/types/menu.ts | 61 +++- 11 files changed, 326 insertions(+), 152 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 8da0af981f..1ade50c7f2 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -886,6 +886,7 @@ global: "Global" recommended: "Recommended" squareAvatars: "Display squared avatars" seperateRenoteQuote: "Separate boost and quote buttons" +highlightCw: "Highlight content warned posts" sent: "Sent" received: "Received" searchResult: "Search results" diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue index e47f32e45d..161a7a59a9 100644 --- a/packages/client/src/components/MkMenu.vue +++ b/packages/client/src/components/MkMenu.vue @@ -13,6 +13,7 @@ > - - From f0ddb5832f0c3cd34bc49faf19ab1613cc148260 Mon Sep 17 00:00:00 2001 From: jolupa Date: Sat, 13 May 2023 16:19:08 +0000 Subject: [PATCH 255/382] chore: Translated using Weblate (Catalan) Currently translated at 100.0% (1747 of 1747 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/ --- locales/ca-ES.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index ddb67a44bc..6b1ec1fc06 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -2049,3 +2049,5 @@ _experiments: release: Publicà enablePostEditing: Activà l'edició de publicacions title: Experiments + postEditingCaption: Mostra l'opció perquè els usuaris editin les seves publicacions + existents mitjançant el menú d'opcions de publicació From 1d4a9a56b2baacc390112034c889996c5c961a35 Mon Sep 17 00:00:00 2001 From: FineFindus Date: Sat, 13 May 2023 19:07:56 +0000 Subject: [PATCH 256/382] chore: Translated using Weblate (German) Currently translated at 99.0% (1730 of 1747 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/ --- locales/de-DE.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/de-DE.yml b/locales/de-DE.yml index 619dd66b06..896ecb26ae 100644 --- a/locales/de-DE.yml +++ b/locales/de-DE.yml @@ -105,7 +105,7 @@ followRequestPending: "Follow-up-Anfrage ausstehend" enterEmoji: "Ein Emoji eingeben" renote: "Boost" unrenote: "Boost zurücknehmen" -renoted: "Geboostet" +renoted: "Geboostet." cantRenote: "Dieser Beitrag kann nicht geboostet werden." cantReRenote: "Ein Boost kann nicht geboostet werden." quote: "Zitieren" From 49cf003e4f93aaa7f3375713a6396d105e725428 Mon Sep 17 00:00:00 2001 From: Thomas Date: Sat, 13 May 2023 16:18:55 +0000 Subject: [PATCH 257/382] chore: Translated using Weblate (French) Currently translated at 96.2% (1682 of 1747 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fr/ --- locales/fr-FR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml index 2978835a12..93512ec6f3 100644 --- a/locales/fr-FR.yml +++ b/locales/fr-FR.yml @@ -2036,4 +2036,4 @@ signupsDisabled: Les inscriptions sur ce serveur sont actuellement désactivés, pour ce serveur, entrez-le ci-dessous s'il vous plait. apps: Applications userSaysSomethingReasonReply: '{noms} a répondu à une note contenant {raison}' -defaultValueIs: 'défaut: {valeur}' +defaultValueIs: 'défaut : {valeur}' From b01c9ce0b0d7068210cb5fe2c928ea19008e718f Mon Sep 17 00:00:00 2001 From: amy bones Date: Sat, 13 May 2023 16:29:05 -0700 Subject: [PATCH 258/382] Fix hover unblur text after keyboard nav changes --- packages/client/src/components/MkNote.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index f36af4a711..5028d711e7 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -748,5 +748,9 @@ function readPromo() { text-align: center; opacity: 0.7; width: 100%; + + ._blur_text { + pointer-events: auto; + } } From cdc48bd0183671afe9caf8db1792616dbedd62f3 Mon Sep 17 00:00:00 2001 From: naskya Date: Sun, 14 May 2023 14:36:29 +0900 Subject: [PATCH 259/382] Use ph-flying-saucer for antenna column in Deck --- packages/client/src/ui/deck/antenna-column.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/ui/deck/antenna-column.vue b/packages/client/src/ui/deck/antenna-column.vue index 9dba7bd485..445f68d9ad 100644 --- a/packages/client/src/ui/deck/antenna-column.vue +++ b/packages/client/src/ui/deck/antenna-column.vue @@ -6,7 +6,7 @@ @parent-focus="($event) => emit('parent-focus', $event)" > From 6109122d02e0b3ffcc559aedcbc2de8653e4d8cf Mon Sep 17 00:00:00 2001 From: naskya Date: Sun, 14 May 2023 14:40:36 +0900 Subject: [PATCH 260/382] Change "Add caption" icon in Drive --- packages/client/src/components/MkDrive.file.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/MkDrive.file.vue b/packages/client/src/components/MkDrive.file.vue index 667a5c754c..ab3953f825 100644 --- a/packages/client/src/components/MkDrive.file.vue +++ b/packages/client/src/components/MkDrive.file.vue @@ -89,7 +89,7 @@ function getMenu() { }, { text: i18n.ts.describeFile, - icon: "ph-cursor-text ph-bold ph-lg", + icon: "ph-subtitles ph-bold ph-lg", action: describe, }, null, From 5d5edbb6559775c056c6f5831f0ec977e36857e6 Mon Sep 17 00:00:00 2001 From: naskya Date: Sun, 14 May 2023 14:53:33 +0900 Subject: [PATCH 261/382] Set antenna/list column names automatically --- packages/client/src/ui/deck/antenna-column.vue | 1 + packages/client/src/ui/deck/list-column.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/client/src/ui/deck/antenna-column.vue b/packages/client/src/ui/deck/antenna-column.vue index 9dba7bd485..3cc25a48d1 100644 --- a/packages/client/src/ui/deck/antenna-column.vue +++ b/packages/client/src/ui/deck/antenna-column.vue @@ -58,6 +58,7 @@ async function setAntenna() { }); if (canceled) return; updateColumn(props.column.id, { + name: antenna.name, antennaId: antenna.id, }); } diff --git a/packages/client/src/ui/deck/list-column.vue b/packages/client/src/ui/deck/list-column.vue index e4c820d6f6..82bf58f851 100644 --- a/packages/client/src/ui/deck/list-column.vue +++ b/packages/client/src/ui/deck/list-column.vue @@ -56,6 +56,7 @@ async function setList() { }); if (canceled) return; updateColumn(props.column.id, { + name: list.name, listId: list.id, }); } From 389df53f5632566ad5cab2f7e5351277ddc92634 Mon Sep 17 00:00:00 2001 From: naskya Date: Sun, 14 May 2023 05:15:40 +0000 Subject: [PATCH 262/382] chore: Translated using Weblate (English) Currently translated at 100.0% (1744 of 1744 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/en/ --- locales/en-US.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 92b1e09d01..7df19e815e 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -230,7 +230,7 @@ silencedInstancesDescription: "List the hostnames of the instances that you want hiddenTags: "Hidden Hashtags" hiddenTagsDescription: "List the hashtags (without the #) of the hashtags you wish\ \ to hide from trending and explore. Hidden hashtags are still discoverable via\ - \ other means. Blocked instances are not affected even if listed here." + \ other means." muteAndBlock: "Mutes and Blocks" mutedUsers: "Muted users" blockedUsers: "Blocked users" @@ -1084,7 +1084,8 @@ findOtherInstance: "Find another server" apps: "Apps" sendModMail: "Send Moderation Notice" preventAiLearning: "Prevent AI bot scraping" -preventAiLearningDescription: "Request third-party AI language models not to study content you upload, such as posts and images." +preventAiLearningDescription: "Request third-party AI language models not to study\ + \ content you upload, such as posts and images." _sensitiveMediaDetection: @@ -2011,4 +2012,5 @@ _deck: _experiments: title: "Experiments" enablePostEditing: "Enable post editing" - postEditingCaption: "Shows the option for users to edit their existing posts via the post options menu" + postEditingCaption: "Shows the option for users to edit their existing posts via\ + \ the post options menu" From b8168fed90e965e335ff87b9959bb2f68440b560 Mon Sep 17 00:00:00 2001 From: naskya Date: Sat, 13 May 2023 22:56:04 +0000 Subject: [PATCH 263/382] chore: Translated using Weblate (Japanese) Currently translated at 99.9% (1743 of 1744 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ja/ --- locales/ja-JP.yml | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 4fc2f42d79..46741be0b6 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -66,7 +66,7 @@ import: "インポート" export: "エクスポート" files: "ファイル" download: "ダウンロード" -driveFileDeleteConfirm: "ファイル「{name}」を削除しますか？このファイルを添付した投稿も消えます。" +driveFileDeleteConfirm: "ファイル「{name}」を削除しますか？これにより、このファイルが添付されている投稿も削除されます。" unfollowConfirm: "{name}さんのフォローを解除しますか？" exportRequested: "エクスポートをリクエストしました。これには時間がかかる場合があります。エクスポートが終わると、「ドライブ」に追加されます。" importRequested: "インポートをリクエストしました。これには時間がかかる場合があります。" @@ -815,7 +815,7 @@ customCssWarn: "この設定は必ず知識のある方が行ってください global: "グローバル" recommended: "推奨" squareAvatars: "アイコンを四角形で表示" -seperateRenoteQuote: "ブーストと引用ボタンを分ける" +seperateRenoteQuote: "ブーストと引用のボタンを分ける" sent: "送信" received: "受信" searchResult: "検索結果" @@ -945,7 +945,7 @@ customSplashIconsDescription: "ユーザがページをロード/リロードす \ URL。画像は静的なURLで、できればすべて192x192にリサイズしてください。" showUpdates: "Calckeyの更新時にポップアップを表示する" recommendedInstances: "おすすめインスタンス" -recommendedInstancesDescription: "おすすめタイムラインに表示される、改行で区切られたインスタンス。`https://`を追加しないでください。ドメインのみを追加してください。" +recommendedInstancesDescription: "おすすめタイムラインに表示するインスタンスを改行区切りで入力してください。`https://`は書かず、ドメインのみを入力してください。" caption: "自動キャプション" splash: "スプラッシュスクリーン" updateAvailable: "アップデートがありますよ！" @@ -962,7 +962,7 @@ moveFrom: "別のアカウントからこのアカウントに引っ越す" moveFromLabel: "引っ越し元のアカウント：" moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引き継いで引っ越したい場合、ここでエイリアスを作成しておく必要があります。必ず引っ越しを実行する前に作成してください！引っ越し元のアカウントをこのように入力してください：@person@instance.com" migrationConfirm: "本当にこのアカウントを {account} に引っ越しますか？一度引っ越しを行うと取り消せず、二度とこのアカウントを元の状態で使用できなくなります。\n\ - また、引っ越し先のアカウントでエイリアスを作成したことを確認してください。" + この操作を行う前に引っ越し先のアカウントでエイリアスを作成する必要があります。エイリアスが作成されているか、必ず確認してください。" defaultReaction: "リモートとローカルの投稿に対するデフォルトの絵文字リアクション" license: "ライセンス" indexPosts: "投稿をインデックス" @@ -1130,6 +1130,17 @@ _mfm: plain: "プレーン" plainDescription: "内側の構文を全て無効にします。" position: 位置 + stop: MFMアニメーションを停止 + alwaysPlay: MFMアニメーションを自動再生する + play: MFMアニメーションを再生 + warn: MFMアニメーションは激しい動きを含む可能性があります。 + positionDescription: 位置を指定した値だけずらします。 + foreground: 文字色 + backgroundDescription: 背景の色を変更します。 + background: 背景色 + scale: 拡大・縮小 + scaleDescription: 大きさを指定した値に拡大・縮小します。 + foregroundDescription: 文字の色を変更します。 _instanceTicker: none: "表示しない" remote: "リモートユーザーに表示" @@ -1843,3 +1854,14 @@ noteId: 投稿のID hiddenTagsDescription: 'トレンドと「みつける」から除外したいハッシュタグを（先頭の # を除いて）改行区切りで入力してください。この設定はトレンドと「みつける」以外には影響しません。' hiddenTags: 非表示にするハッシュタグ apps: "アプリ" +_experiments: + enablePostEditing: 投稿の編集機能を有効にする + title: 試験的な機能 + postEditingCaption: 投稿のメニューに既存の投稿を編集するボタンを表示します。 +sendModMail: モデレーションノートを送る +deleted: 削除済み +editNote: 投稿を編集 +edited: 編集済み +signupsDisabled: + 現在、このサーバーでは新規登録が一般開放されていません。招待コードをお持ちの場合には、以下の欄に入力してください。招待コードをお持ちでない場合にも、新規登録を開放している他のサーバーには入れますよ！ +findOtherInstance: 他のサーバーを探す From c2d7b5c183f940b3263bb375334657187bdb97c6 Mon Sep 17 00:00:00 2001 From: waon Date: Sun, 14 May 2023 02:21:00 +0000 Subject: [PATCH 264/382] chore: Translated using Weblate (Japanese) Currently translated at 99.9% (1743 of 1744 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ja/ --- locales/ja-JP.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 46741be0b6..e3005720cc 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -52,7 +52,7 @@ sendMessage: "メッセージを送信" copyUsername: "ユーザー名をコピー" searchUser: "ユーザーを検索" reply: "返信" -loadMore: "もっと見る" +loadMore: "もっと読み込む" showMore: "もっと見る" showLess: "閉じる" youGotNewFollower: "フォローされました" From 950100e95ee154d9a5f517725521d586bca7011b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=B8=D0=B1=D0=B5=D1=80=20=D0=BE=D0=B3=D1=83=D1=80?= =?UTF-8?q?=D1=87=D0=B8=D0=BA?= Date: Sat, 13 May 2023 21:07:48 +0000 Subject: [PATCH 265/382] chore: Translated using Weblate (Russian) Currently translated at 98.1% (1711 of 1744 strings) Translation: Calckey/locales Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ru/ --- locales/ru-RU.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index b022c75ea6..bf135da9e1 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -65,7 +65,8 @@ import: "Импорт" export: "Экспорт" files: "Файлы" download: "Скачать" -driveFileDeleteConfirm: "Удалить файл «{name}»? Посты с ним также будут удалены." +driveFileDeleteConfirm: "Удалить файл «{name}»? Он будет удален со всех постов которые\ + \ содержат его как вложение." unfollowConfirm: "Удалить из подписок пользователя {name}?" exportRequested: "Вы запросили экспорт. Это может занять некоторое время. Результат\ \ будет добавлен на «Диск»." @@ -1984,3 +1985,8 @@ customKaTeXMacroDescription: 'Настройте макросы чтобы ле cannotUploadBecauseExceedsFileSizeLimit: Этот файл не может быть загружен так как он превышает максимально разрешённый размер. apps: Приложения +silenceThisInstance: Заглушить инстанс +silencedInstances: Заглушенные инстансы +editNote: Редактировать заметку +edited: Редактировано +deleted: Удалённое From e4a821a494b42dd24faf61eb6a6e567fa6e07a3a Mon Sep 17 00:00:00 2001 From: April John Date: Sun, 14 May 2023 18:46:48 +0200 Subject: [PATCH 266/382] Feat: move post imports to new jobs --- packages/backend/src/queue/index.ts | 38 ++++++++ .../src/queue/processors/db/import-posts.ts | 90 +------------------ .../backend/src/queue/processors/db/index.ts | 4 + packages/backend/src/queue/types.ts | 9 +- 4 files changed, 53 insertions(+), 88 deletions(-) diff --git a/packages/backend/src/queue/index.ts b/packages/backend/src/queue/index.ts index 035556e487..78696c4e2f 100644 --- a/packages/backend/src/queue/index.ts +++ b/packages/backend/src/queue/index.ts @@ -333,6 +333,44 @@ export function createImportPostsJob( ); } +export function createImportMastoPostJob( + user: ThinUser, + post: any, + signatureCheck: boolean, +) { + return dbQueue.add( + "importMastoPost", + { + user: user, + post: post, + signatureCheck: signatureCheck, + }, + { + removeOnComplete: true, + removeOnFail: true, + }, + ); +} + +export function createImportCkPostJob( + user: ThinUser, + post: any, + signatureCheck: boolean, +) { + return dbQueue.add( + "importCkPost", + { + user: user, + post: post, + signatureCheck: signatureCheck, + }, + { + removeOnComplete: true, + removeOnFail: true, + }, + ); +} + export function createImportMutingJob(user: ThinUser, fileId: DriveFile["id"]) { return dbQueue.add( "importMuting", diff --git a/packages/backend/src/queue/processors/db/import-posts.ts b/packages/backend/src/queue/processors/db/import-posts.ts index 73cec113e1..63e97789f7 100644 --- a/packages/backend/src/queue/processors/db/import-posts.ts +++ b/packages/backend/src/queue/processors/db/import-posts.ts @@ -1,16 +1,9 @@ -import { IsNull } from "typeorm"; -import follow from "@/services/following/create.js"; - -import * as Post from "@/misc/post.js"; -import create from "@/services/note/create.js"; import { downloadTextFile } from "@/misc/download-text-file.js"; import { Users, DriveFiles } from "@/models/index.js"; import type { DbUserImportPostsJobData } from "@/queue/types.js"; import { queueLogger } from "../../logger.js"; import type Bull from "bull"; -import { htmlToMfm } from "@/remote/activitypub/misc/html-to-mfm.js"; -import { resolveNote } from "@/remote/activitypub/models/note.js"; -import { Note } from "@/models/entities/note.js"; +import { createImportCkPostJob, createImportMastoPostJob } from "@/queue/index.js"; const logger = queueLogger.createSubLogger("import-posts"); @@ -36,94 +29,17 @@ export async function importPosts( const json = await downloadTextFile(file.url); - let linenum = 0; - try { const parsed = JSON.parse(json); if (parsed instanceof Array) { logger.info("Parsing key style posts"); for (const post of JSON.parse(json)) { - try { - linenum++; - if (post.replyId != null) { - continue; - } - if (post.renoteId != null) { - continue; - } - if (post.visibility !== "public") { - continue; - } - const { text, cw, localOnly, createdAt } = Post.parse(post); - - logger.info(`Posting[${linenum}] ...`); - - const note = await create(user, { - createdAt: createdAt, - files: undefined, - poll: undefined, - text: text || undefined, - reply: null, - renote: null, - cw: cw, - localOnly, - visibility: "hidden", - visibleUsers: [], - channel: null, - apMentions: new Array(0), - apHashtags: undefined, - apEmojis: undefined, - }); - } catch (e) { - logger.warn(`Error in line:${linenum} ${e}`); - } + createImportCkPostJob(job.data.user, post, job.data.signatureCheck); } } else if (parsed instanceof Object) { logger.info("Parsing animal style posts"); for (const post of parsed.orderedItems) { - async () => { - try { - linenum++; - let reply: Note | null = null; - if (post.object.inReplyTo != null) { - reply = await resolveNote(post.object.inReplyTo); - } - if (post.directMessage) { - return; - } - if (job.data.signatureCheck) { - if (!post.signature) { - return; - } - } - let text; - try { - text = htmlToMfm(post.object.content, post.object.tag); - } catch (e) { - return; - } - logger.info(`Posting[${linenum}] ...`); - - const note = await create(user, { - createdAt: new Date(post.object.published), - files: undefined, - poll: undefined, - text: text || undefined, - reply, - renote: null, - cw: post.sensitive, - localOnly: false, - visibility: "hidden", - visibleUsers: [], - channel: null, - apMentions: new Array(0), - apHashtags: undefined, - apEmojis: undefined, - }); - } catch (e) { - logger.warn(`Error in line:${linenum} ${e}`); - } - }; + createImportMastoPostJob(job.data.user, post, job.data.signatureCheck); } } } catch (e) { diff --git a/packages/backend/src/queue/processors/db/index.ts b/packages/backend/src/queue/processors/db/index.ts index 22b55a3683..07fc8e6d5f 100644 --- a/packages/backend/src/queue/processors/db/index.ts +++ b/packages/backend/src/queue/processors/db/index.ts @@ -12,6 +12,8 @@ import { importUserLists } from "./import-user-lists.js"; import { deleteAccount } from "./delete-account.js"; import { importMuting } from "./import-muting.js"; import { importPosts } from "./import-posts.js"; +import { importMastoPost } from "./import-masto-post.js"; +import { importCkPost } from "./import-calckey-post.js"; import { importBlocking } from "./import-blocking.js"; import { importCustomEmojis } from "./import-custom-emojis.js"; @@ -28,6 +30,8 @@ const jobs = { importBlocking, importUserLists, importPosts, + importMastoPost, + importCkPost, importCustomEmojis, deleteAccount, } as Record< diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts index e31619ff27..b72b127894 100644 --- a/packages/backend/src/queue/types.ts +++ b/packages/backend/src/queue/types.ts @@ -23,7 +23,8 @@ export type DbJobData = | DbUserJobData | DbUserImportPostsJobData | DbUserImportJobData - | DbUserDeleteJobData; + | DbUserDeleteJobData + | DbUserImportMastoPostJobData; export type DbUserJobData = { user: ThinUser; @@ -47,6 +48,12 @@ export type DbUserImportPostsJobData = { signatureCheck: boolean; }; +export type DbUserImportMastoPostJobData = { + user: ThinUser; + post: any; + signatureCheck: boolean; +}; + export type ObjectStorageJobData = | ObjectStorageFileJobData | Record; From 657857e8d6cceb124fa6afc694b10b38f2f9dd73 Mon Sep 17 00:00:00 2001 From: April John Date: Sun, 14 May 2023 18:46:48 +0200 Subject: [PATCH 267/382] Feat: move post imports to new jobs --- .../processors/db/import-calckey-post.ts | 53 ++++++++++++++++ .../queue/processors/db/import-masto-post.ts | 61 +++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 packages/backend/src/queue/processors/db/import-calckey-post.ts create mode 100644 packages/backend/src/queue/processors/db/import-masto-post.ts diff --git a/packages/backend/src/queue/processors/db/import-calckey-post.ts b/packages/backend/src/queue/processors/db/import-calckey-post.ts new file mode 100644 index 0000000000..707933ae5c --- /dev/null +++ b/packages/backend/src/queue/processors/db/import-calckey-post.ts @@ -0,0 +1,53 @@ +import * as Post from "@/misc/post.js"; +import create from "@/services/note/create.js"; +import { Users } from "@/models/index.js"; +import type { + DbUserImportMastoPostJobData, +} from "@/queue/types.js"; +import { queueLogger } from "../../logger.js"; +import type Bull from "bull"; + +const logger = queueLogger.createSubLogger("import-calckey-post"); + +export async function importCkPost( + job: Bull.Job, + done: any, +): Promise { + const user = await Users.findOneBy({ id: job.data.user.id }); + if (user == null) { + done(); + return; + } + const post = job.data.post; + if (post.replyId != null) { + done(); + return; + } + if (post.renoteId != null) { + done(); + return; + } + if (post.visibility !== "public") { + done(); + return; + } + const { text, cw, localOnly, createdAt } = Post.parse(post); + const note = await create(user, { + createdAt: createdAt, + files: undefined, + poll: undefined, + text: text || undefined, + reply: null, + renote: null, + cw: cw, + localOnly, + visibility: "hidden", + visibleUsers: [], + channel: null, + apMentions: new Array(0), + apHashtags: undefined, + apEmojis: undefined, + }); + logger.succ("Imported"); + done(); +} diff --git a/packages/backend/src/queue/processors/db/import-masto-post.ts b/packages/backend/src/queue/processors/db/import-masto-post.ts new file mode 100644 index 0000000000..98823d109d --- /dev/null +++ b/packages/backend/src/queue/processors/db/import-masto-post.ts @@ -0,0 +1,61 @@ +import create from "@/services/note/create.js"; +import { Users } from "@/models/index.js"; +import type { + DbUserImportMastoPostJobData, +} from "@/queue/types.js"; +import { queueLogger } from "../../logger.js"; +import type Bull from "bull"; +import { htmlToMfm } from "@/remote/activitypub/misc/html-to-mfm.js"; +import { resolveNote } from "@/remote/activitypub/models/note.js"; +import { Note } from "@/models/entities/note.js"; + +const logger = queueLogger.createSubLogger("import-masto-post"); + +export async function importMastoPost( + job: Bull.Job, + done: any, +): Promise { + const user = await Users.findOneBy({ id: job.data.user.id }); + if (user == null) { + done(); + return; + } + const post = job.data.post; + let reply: Note | null = null; + if (post.object.inReplyTo != null) { + reply = await resolveNote(post.object.inReplyTo); + } + if (post.directMessage) { + return; + } + if (job.data.signatureCheck) { + if (!post.signature) { + return; + } + } + let text; + try { + text = htmlToMfm(post.object.content, post.object.tag); + } catch (e) { + return; + } + + const note = await create(user, { + createdAt: new Date(post.object.published), + files: undefined, + poll: undefined, + text: text || undefined, + reply, + renote: null, + cw: post.sensitive, + localOnly: false, + visibility: "hidden", + visibleUsers: [], + channel: null, + apMentions: new Array(0), + apHashtags: undefined, + apEmojis: undefined, + }); + logger.succ("Imported"); + done(); +} From 448d830c518bf3dcb1f3f924eee1abf8e486e66a Mon Sep 17 00:00:00 2001 From: Freeplay Date: Sun, 14 May 2023 15:31:07 -0400 Subject: [PATCH 268/382] fix image not displaying if no text --- packages/client/src/components/MkSubNoteContent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue index 87a30c2474..521dd08cea 100644 --- a/packages/client/src/components/MkSubNoteContent.vue +++ b/packages/client/src/components/MkSubNoteContent.vue @@ -188,7 +188,7 @@ const mfms = props.note.text ? extractMfmWithAnimation(mfm.parse(props.note.text)) : null; -const hasMfm = $ref(mfms.length > 0); +const hasMfm = $ref(mfms && mfms.length > 0); let disableMfm = $ref(hasMfm && defaultStore.state.animatedMfm); From 2c22a20da4c5140ddcd829ff30f15065a0dad549 Mon Sep 17 00:00:00 2001 From: Freeplay Date: Sun, 14 May 2023 15:33:50 -0400 Subject: [PATCH 269/382] button alignment --- packages/client/src/components/MkSubNoteContent.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue index 521dd08cea..915e5a0155 100644 --- a/packages/client/src/components/MkSubNoteContent.vue +++ b/packages/client/src/components/MkSubNoteContent.vue @@ -340,6 +340,8 @@ function focusFooter(ev) { } > :deep(button) { margin-top: 10px; + margin-left: 0; + margin-right: .4rem; } } From 001f8038bfece8a49c62867c2ca2d2d088a3727e Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Sun, 14 May 2023 13:45:36 -0700 Subject: [PATCH 270/382] remove duplicate --- packages/client/src/scripts/get-note-menu.ts | 34 ++++---------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts index 1ec36d1ef4..d8e47ff437 100644 --- a/packages/client/src/scripts/get-note-menu.ts +++ b/packages/client/src/scripts/get-note-menu.ts @@ -70,15 +70,6 @@ export function getNoteMenu(props: { }); } - function duplicate(): void { - os.post({ - initialNote: appearNote, - renote: appearNote.renote, - reply: appearNote.reply, - channel: appearNote.channel, - }); - } - function toggleFavorite(favorite: boolean): void { os.apiWithDialog( favorite ? "notes/favorites/create" : "notes/favorites/delete", @@ -284,6 +275,13 @@ export function getNoteMenu(props: { null, ] : []), + instance.features.postEditing && isAppearAuthor + ? { + icon: "ph-pencil-line ph-bold ph-lg", + text: i18n.ts.edit, + action: edit, + } + : undefined, { icon: "ph-smiley ph-bold ph-lg", text: i18n.ts.reaction, @@ -421,24 +419,6 @@ export function getNoteMenu(props: { null, - instance.features.postEditing && isAppearAuthor - ? { - icon: "ph-pencil-line ph-bold ph-lg", - text: i18n.ts.edit, - textStyle: "color: var(--accent)", - action: edit, - } - : undefined, - - instance.features.postEditing - ? { - icon: "ph-copy ph-bold ph-lg", - text: i18n.ts.duplicate, - textStyle: "color: var(--accent)", - action: duplicate, - } - : undefined, - isAppearAuthor || isModerator ? { icon: "ph-trash ph-bold ph-lg", From 2a313e73ff3431ad1b333baa780abfd9b1bafb9a Mon Sep 17 00:00:00 2001 From: Freeplay Date: Sun, 14 May 2023 17:06:58 -0400 Subject: [PATCH 271/382] Replace classic.vue w/ a class in universal.vue --- packages/client/src/init.ts | 2 - packages/client/src/ui/classic.vue | 410 --------------------------- packages/client/src/ui/universal.vue | 85 +++++- 3 files changed, 82 insertions(+), 415 deletions(-) delete mode 100644 packages/client/src/ui/classic.vue diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts index 34cdc16efa..43a92a3163 100644 --- a/packages/client/src/init.ts +++ b/packages/client/src/init.ts @@ -191,8 +191,6 @@ import { getAccountFromId } from "@/scripts/get-account-from-id"; ? defineAsyncComponent(() => import("@/ui/visitor.vue")) : ui === "deck" ? defineAsyncComponent(() => import("@/ui/deck.vue")) - : ui === "classic" - ? defineAsyncComponent(() => import("@/ui/classic.vue")) : defineAsyncComponent(() => import("@/ui/universal.vue")), ); diff --git a/packages/client/src/ui/classic.vue b/packages/client/src/ui/classic.vue deleted file mode 100644 index 4ee25a0fe2..0000000000 --- a/packages/client/src/ui/classic.vue +++ /dev/null @@ -1,410 +0,0 @@ - - - - - diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue index f6b57c081f..068f3f7f3b 100644 --- a/packages/client/src/ui/universal.vue +++ b/packages/client/src/ui/universal.vue @@ -1,5 +1,5 @@ --> - + {{ i18n.ts.reduceUiAnimation }} diff --git a/packages/client/src/pages/admin/experiments.vue b/packages/client/src/pages/admin/experiments.vue index 4df1bdd257..7e37c65769 100644 --- a/packages/client/src/pages/admin/experiments.vue +++ b/packages/client/src/pages/admin/experiments.vue @@ -16,9 +16,7 @@