diff --git a/.node-version b/.node-version index 7fd023741b..8ddbc0c64a 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -v16.15.0 +v18.16.0 diff --git a/README.md b/README.md index 5b3eb98fd4..5dcdc4861d 100644 --- a/README.md +++ b/README.md @@ -76,10 +76,10 @@ If you have access to a server that supports one of the sources below, I recomme ## 🧑‍💻 Dependencies -- 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v19 recommended) +- 🐢 At least [NodeJS](https://nodejs.org/en/) v18.16.0 (v20 recommended) - Install with [nvm](https://github.com/nvm-sh/nvm) -- 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12 -- 🍱 At least [Redis](https://redis.io/) v6 (v7 recommend) +- 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12 (v14 recommended) +- 🍱 At least [Redis](https://redis.io/) v6 (v7 recommended) - Web Proxy (one of the following) - 🍀 Nginx (recommended) - 🦦 Caddy @@ -104,7 +104,7 @@ If you have access to a server that supports one of the sources below, I recomme ## 👀 Get folder ready ```sh -git clone --depth 1 https://codeberg.org/calckey/calckey.git +git clone https://codeberg.org/calckey/calckey.git cd calckey/ ``` diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index f64f70583a..f438b4f9a8 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -1802,8 +1802,8 @@ pushNotificationNotSupported: El vostre navegador o servidor no admet notificaci push license: Llicència indexPosts: Índex de notes -indexFrom: Índex a partir de l'ID de Publicacions (deixeu en blanc per indexar cada - publicació) +indexFrom: Índex a partir de l'ID de Publicacions +indexFromDescription: Deixeu en blanc per indexar cada publicació indexNotice: Ara indexant. Això probablement trigarà una estona, si us plau, no reinicieu el servidor durant almenys una hora. _instanceTicker: diff --git a/locales/en-US.yml b/locales/en-US.yml index 5184df4bef..ece9a92016 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -83,6 +83,7 @@ exportRequested: "You've requested an export. This may take a while. It will be \ to your Drive once completed." importRequested: "You've requested an import. This may take a while." lists: "Lists" +listsDesc: "Lists let you create timelines with specified users. They can be accessed from the timelines page." noLists: "You don't have any lists" note: "Post" notes: "Posts" @@ -405,6 +406,7 @@ avoidMultiCaptchaConfirm: "Using multiple Captcha systems may cause interference \ them. Would you like to disable the other Captcha systems currently active? If\ \ you would like them to stay enabled, press cancel." antennas: "Antennas" +antennasDesc: "Antennas display new posts matching the criteria you set!\n They can be accessed from the timelines page." manageAntennas: "Manage Antennas" name: "Name" antennaSource: "Antenna source" @@ -686,6 +688,7 @@ logs: "Logs" delayed: "Delayed" database: "Database" channel: "Channels" +channelFederationWarn: "Channels do not yet federate to other servers" create: "Create" notificationSetting: "Notification settings" notificationSettingDesc: "Select the types of notification to display." @@ -771,6 +774,7 @@ pageLikedCount: "Number of received Page likes" contact: "Contact" useSystemFont: "Use the system's default font" clips: "Clips" +clipsDesc: "Clips are like share-able categorized bookmarks. You can create clips from the menu of individual posts." experimentalFeatures: "Experimental features" developer: "Developer" makeExplorable: "Make account visible in \"Explore\"" @@ -1065,7 +1069,8 @@ migrationConfirm: "Are you absolutely sure you want to migrate your account to { defaultReaction: "Default emoji reaction for outgoing and incoming posts" license: "License" indexPosts: "Index Posts" -indexFrom: "Index from Post ID onwards (leave blank to index every post)" +indexFrom: "Index from Post ID onwards" +indexFromDescription: "Leave blank to index every post" indexNotice: "Now indexing. This will probably take a while, please don't restart\ \ your server for at least an hour." customKaTeXMacro: "Custom KaTeX macros" @@ -1446,7 +1451,7 @@ _tutorial: \ you follow." step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this server." step5_5: "The Social {icon} timeline is a combination of the Home and Local timelines." - step5_6: "The Recommended {icon} timeline is where you can see posts from server\ + step5_6: "The Recommended {icon} timeline is where you can see posts from servers\ \ the admins recommend." step5_7: "The Global {icon} timeline is where you can see posts from every other\ \ connected server." diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 84c894c7a8..94454f3f9d 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -966,7 +966,8 @@ migrationConfirm: "本当にこのアカウントを {account} に引っ越し defaultReaction: "リモートとローカルの投稿に対するデフォルトの絵文字リアクション" license: "ライセンス" indexPosts: "投稿をインデックス" -indexFrom: "この投稿ID以降をインデックスする（空白で全ての投稿を指定します）" +indexFrom: "この投稿ID以降をインデックスする" +indexFromDescription: "空白で全ての投稿を指定します" indexNotice: "インデックスを開始しました。完了まで時間がかかる場合があるため、少なくとも1時間はサーバーを再起動しないでください。" customKaTeXMacro: "カスタムKaTeXマクロ" customKaTeXMacroDescription: "数式入力を楽にするためのマクロを設定しましょう！記法はLaTeXにおけるコマンドの定義と同様に \\newcommand{\\\ diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index c127c5a525..659e204af5 100644 --- a/locales/pl-PL.yml +++ b/locales/pl-PL.yml @@ -1898,7 +1898,8 @@ sendPushNotificationReadMessageCaption: Powiadomienie zawierające tekst "{empty defaultReaction: Domyślna reakcja emoji dla wychodzących i przychodzących wpisów license: Licencja indexPosts: Indeksuj wpisy -indexFrom: Indeksuj wpisy od ID (zostaw puste dla indeksowania wszystkich wpisów) +indexFrom: Indeksuj wpisy od ID +indexFromDescription: Zostaw puste dla indeksowania wszystkich wpisów indexNotice: Indeksuję. Zapewne zajmie to chwilę, nie restartuj serwera przez co najmniej godzinę. customKaTeXMacro: Niestandardowe makra KaTeX diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml index 4d94ab287c..ad47d7d37c 100644 --- a/locales/ru-RU.yml +++ b/locales/ru-RU.yml @@ -1909,8 +1909,8 @@ recommendedInstances: Рекомендованные инстансы defaultReaction: Эмодзи реакция по умолчанию для выходящих и исходящих постов license: Лицензия indexPosts: Индексировать посты -indexFrom: Индексировать начиная с идентификатора поста и далее (оставьте пустым для - индексации каждого поста) +indexFrom: Индексировать начиная с идентификатора поста и далее +indexFromDescription: оставьте пустым для индексации каждого поста indexNotice: Теперь индексирование. Вероятно, это займет некоторое время, пожалуйста, не перезагружайте свой сервер по крайней мере в течение часа. customKaTeXMacro: Кастомные KaTex макросы diff --git a/package.json b/package.json index de993cde08..5c57c79cf2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "14.0.0-dev32", + "version": "14.0.0-dev35", "codename": "aqua", "repository": { "type": "git", @@ -36,8 +36,8 @@ "chokidar": "^3.3.1" }, "dependencies": { - "@bull-board/api": "^4.10.2", - "@bull-board/ui": "^4.10.2", + "@bull-board/api": "5.2.0", + "@bull-board/ui": "5.2.0", "@napi-rs/cli": "^2.15.0", "@tensorflow/tfjs": "^3.21.0", "focus-trap": "^7.2.0", diff --git a/packages/backend/package.json b/packages/backend/package.json index bffa42c495..82a3f6cc8b 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -23,9 +23,9 @@ "@tensorflow/tfjs-node": "3.21.1" }, "dependencies": { - "@bull-board/api": "^4.6.4", - "@bull-board/koa": "^4.6.4", - "@bull-board/ui": "^4.6.4", + "@bull-board/api": "5.2.0", + "@bull-board/koa": "5.2.0", + "@bull-board/ui": "5.2.0", "@calckey/megalodon": "5.2.0", "@discordapp/twemoji": "14.0.2", "@elastic/elasticsearch": "7.17.0", @@ -68,7 +68,7 @@ "fluent-ffmpeg": "2.1.2", "got": "12.5.3", "hpagent": "0.1.2", - "ioredis": "5.2.4", + "ioredis": "5.3.2", "ip-cidr": "3.0.11", "is-svg": "4.3.2", "js-yaml": "4.1.0", diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue index 43f2de29e0..d8bf68fc1b 100644 --- a/packages/client/src/components/MkInfo.vue +++ b/packages/client/src/components/MkInfo.vue @@ -1,21 +1,48 @@ diff --git a/packages/client/src/components/MkPagination.vue b/packages/client/src/components/MkPagination.vue index 24018e5269..4caea737e9 100644 --- a/packages/client/src/components/MkPagination.vue +++ b/packages/client/src/components/MkPagination.vue @@ -17,7 +17,7 @@ -
+
:deep(._button) { + margin-inline: auto; + margin-bottom: 16px; + &:last-of-type:not(:first-child) { + margin-top: 16px; + } +} diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue index e0d2a8f4c0..697e1c86fd 100644 --- a/packages/client/src/components/MkPostForm.vue +++ b/packages/client/src/components/MkPostForm.vue @@ -1030,6 +1030,8 @@ onMounted(() => { } > header { + display: flex; + flex-wrap: wrap; z-index: 1000; height: 66px; diff --git a/packages/client/src/components/MkTimeline.vue b/packages/client/src/components/MkTimeline.vue index 317e556cfb..11fe175d9c 100644 --- a/packages/client/src/components/MkTimeline.vue +++ b/packages/client/src/components/MkTimeline.vue @@ -1,4 +1,14 @@ @@ -71,6 +76,7 @@ import XActiveUsers from "./overview.active-users.vue"; import XStats from "./overview.stats.vue"; import XModerators from "./overview.moderators.vue"; import XHeatmap from "./overview.heatmap.vue"; +import XMetrics from "./overview.metrics.vue"; import MkTagCloud from "@/components/MkTagCloud.vue"; import { version, url } from "@/config"; import * as os from "@/os"; diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue index d03fb61d5a..b79985bafb 100644 --- a/packages/client/src/pages/channels.vue +++ b/packages/client/src/pages/channels.vue @@ -7,6 +7,9 @@ :tabs="headerTabs" /> + {{ + i18n.ts.channelFederationWarn + }} -
- -
+ +
+ +
+ diff --git a/packages/client/src/widgets/server-metric/cpu.vue b/packages/client/src/widgets/server-metric/cpu.vue index 5aa4d26987..563fe3b0fb 100644 --- a/packages/client/src/widgets/server-metric/cpu.vue +++ b/packages/client/src/widgets/server-metric/cpu.vue @@ -2,7 +2,7 @@
-

CPU

+

CPU

{{ meta.cpu.cores }} Logical cores

{{ meta.cpu.model }}

diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue index 8119ff537b..78032cb6e4 100644 --- a/packages/client/src/widgets/server-metric/meilisearch.vue +++ b/packages/client/src/widgets/server-metric/meilisearch.vue @@ -1,11 +1,15 @@