From f969d8530d339cf98f64dcd0890f9a67cf32b2de Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 15 Nov 2022 11:47:30 -0800 Subject: [PATCH 01/56] another i18n fix --- packages/client/src/components/form/suspense.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/form/suspense.vue b/packages/client/src/components/form/suspense.vue index 7db0018a3d..9ad5d3b438 100644 --- a/packages/client/src/components/form/suspense.vue +++ b/packages/client/src/components/form/suspense.vue @@ -22,7 +22,7 @@ import { i18n } from '@/i18n'; export default defineComponent({ components: { - MkButton + MkButton, }, props: { @@ -60,7 +60,7 @@ export default defineComponent({ watch(() => props.p, () => { process(); }, { - immediate: true + immediate: true, }); const retry = () => { @@ -73,6 +73,7 @@ export default defineComponent({ rejected, result, retry, + i18n, }; } }); From be4cae510fb0cb3547ffe1cc16e628106f86b721 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Wed, 16 Nov 2022 04:51:59 +0100 Subject: [PATCH 02/56] Update config example --- .config/example.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.config/example.yml b/.config/example.yml index 4c9f4df07d..5cf984e9e0 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -1,5 +1,5 @@ #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -# Misskey configuration +# Calckey configuration #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ # ┌─────┐ @@ -38,11 +38,11 @@ db: port: 5432 # Database name - db: misskey + db: calckey # Auth - user: example-misskey-user - pass: example-misskey-pass + user: example-calckey-user + pass: example-calckey-pass # Whether disable Caching queries #disableCache: true @@ -147,7 +147,8 @@ id: 'aid' # Managed hosting settings # !!!!!!!!!! -# >>>>>> NORMAL SELF-HOSTERS, STAY AWAY! YOU DON'T NEED THIS! <<<<<< +# >>>>>> NORMAL SELF-HOSTERS, STAY AWAY! <<<<<< +# >>>>>> YOU DON'T NEED THIS! <<<<<< # !!!!!!!!!! # Each category is optional, but if each item in each category is mandatory! # If you mess this up, that's on you, you've been warned... @@ -181,4 +182,11 @@ id: 'aid' # connnectOverProxy: false # setPublicReadOnUpload: true # s3ForcePathStyle: true -#summalyProxyUrl: 'https://summaly.arkjp.net' + +# !!!!!!!!!! +# >>>>>> AGAIN, NORMAL SELF-HOSTERS, STAY AWAY! <<<<<< +# >>>>>> YOU DON'T NEED THIS, ABOVE SETTINGS ARE FOR MANAGED HOSTING ONLY! <<<<<< +# !!!!!!!!!! + +# Seriously. Do NOT fill out the above settings if you're self-hosting. +# They're much better off being set from the control panel. From f81492e835a55492044d4198b02b587d9bb102e1 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 15 Nov 2022 20:16:50 -0800 Subject: [PATCH 03/56] docs: :memo: improve documentation, nginx --- README.md | 100 +++++++-------------------------------------- calckey.nginx.conf | 72 ++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 86 deletions(-) create mode 100644 calckey.nginx.conf diff --git a/README.md b/README.md index a5da9e1ba8..74dd4b6d2b 100644 --- a/README.md +++ b/README.md @@ -93,89 +93,17 @@ cp -r ../misskey/files . # if you don't use object storage ## 🍀 NGINX -
-Click to see an example NGINX config: - -```nginx -# Replace example.tld with your domain - -# For WebSocket -map $http_upgrade $connection_upgrade { - default upgrade; - '' close; -} - -proxy_cache_path /tmp/nginx_cache levels=1:2 keys_zone=cache1:16m max_size=1g inactive=720m use_temp_path=off; - -server { - listen 80; - listen [::]:80; - server_name example.tld; - - # For SSL domain validation - root /var/www/html; - location /.well-known/acme-challenge/ { allow all; } - location /.well-known/pki-validation/ { allow all; } - location / { return 301 https://$server_name$request_uri; } -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name example.tld; - - ssl_session_timeout 1d; - ssl_session_cache shared:ssl_session_cache:10m; - ssl_session_tickets off; - - # To use Let's Encrypt certificate - ssl_certificate /etc/letsencrypt/live/example.tld/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/example.tld/privkey.pem; - - # To use Debian/Ubuntu's self-signed certificate (For testing or before issuing a certificate) - #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; - #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; - - # SSL protocol settings - ssl_protocols TLSv1.2 TLSv1.3; - ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; - ssl_prefer_server_ciphers off; - ssl_stapling on; - ssl_stapling_verify on; - - # Change to your upload limit - client_max_body_size 80m; - - # Proxy to Node - location / { - proxy_pass http://127.0.0.1:3000; - proxy_set_header Host $host; - proxy_http_version 1.1; - proxy_redirect off; - - # If it's behind another reverse proxy or CDN, remove the following. - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto https; - - # For WebSocket - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - - # Cache settings - proxy_cache cache1; - proxy_cache_lock on; - proxy_cache_use_stale updating; - add_header X-Cache $upstream_cache_status; - } -} -``` +- Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-avaliable/ && cd /etc/nginx/sites-avaliable/` +- Edit `calckey.nginx.conf` to reflect your instance properly +- Run `sudo cp ./calckey.nginx.conf ../sites-enabled/` +- Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service.
## 🚀 Build and launch! ### 🐢 NodeJS + #### `git pull` and run these steps to update Calckey in the future! ```sh @@ -195,19 +123,19 @@ docker up -d ### 🐳 Docker Compose ```sh -sudo docker compose build -sudo docker-compose run --rm web yarn run init -sudo docker compose up -d +docker compose build +docker-compose run --rm web yarn run init +docker compose up -d ``` ## 😉 Tips & Tricks -- I'd ***strongly*** recommend against using CloudFlare, but if you do, make sure to turn code minification off. +- 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. - To add another admin account: - - Go to the user's page > 3 Dots > About > Moderation > turn on "Moderator" - - Go back to Overview > click the clipboard icon next to the ID - - Run `psql -d calckey` (or whatever the database name is) - - Run `UPDATE "user" SET "isAdmin" = true WHERE id='999999';` (replace 999999 with the copied ID) - - Have the new admin log out and log back in \ No newline at end of file + - Go to the user's page > 3 Dots > About > Moderation > turn on "Moderator" + - Go back to Overview > click the clipboard icon next to the ID + - Run `psql -d calckey` (or whatever the database name is) + - Run `UPDATE "user" SET "isAdmin" = true WHERE id='999999';` (replace `999999` with the copied ID) + - Have the new admin log out and log back in diff --git a/calckey.nginx.conf b/calckey.nginx.conf new file mode 100644 index 0000000000..def7fe3a5a --- /dev/null +++ b/calckey.nginx.conf @@ -0,0 +1,72 @@ +# Replace example.tld with your domain + +# For WebSocket +map $http_upgrade $connection_upgrade { + default upgrade; + '' close; +} + +proxy_cache_path /tmp/nginx_cache levels=1:2 keys_zone=cache1:16m max_size=1g inactive=720m use_temp_path=off; + +server { + listen 80; + listen [::]:80; + server_name example.tld; + + # For SSL domain validation + root /var/www/html; + location /.well-known/acme-challenge/ { allow all; } + location /.well-known/pki-validation/ { allow all; } + location / { return 301 https://$server_name$request_uri; } +} + +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name example.tld; + + ssl_session_timeout 1d; + ssl_session_cache shared:ssl_session_cache:10m; + ssl_session_tickets off; + + # To use Let's Encrypt certificate + ssl_certificate /etc/letsencrypt/live/example.tld/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/example.tld/privkey.pem; + + # To use Debian/Ubuntu's self-signed certificate (For testing or before issuing a certificate) + #ssl_certificate /etc/ssl/certs/ssl-cert-snakeoil.pem; + #ssl_certificate_key /etc/ssl/private/ssl-cert-snakeoil.key; + + # SSL protocol settings + ssl_protocols TLSv1.2 TLSv1.3; + ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; + ssl_prefer_server_ciphers off; + ssl_stapling on; + ssl_stapling_verify on; + + # Change to your upload limit + client_max_body_size 80m; + + # Proxy to Node + location / { + proxy_pass http://127.0.0.1:3000; + proxy_set_header Host $host; + proxy_http_version 1.1; + proxy_redirect off; + + # If it's behind another reverse proxy or CDN, remove the following. + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto https; + + # For WebSocket + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + + # Cache settings + proxy_cache cache1; + proxy_cache_lock on; + proxy_cache_use_stale updating; + add_header X-Cache $upstream_cache_status; + } +} From f72412ea81b7fdab3d2942165ddc1870159394d9 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 15 Nov 2022 20:18:04 -0800 Subject: [PATCH 04/56] docs: :memo: tip --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 74dd4b6d2b..c445b91bf4 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,7 @@ docker compose up -d ## 😉 Tips & Tricks +- 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. - 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 2e3cd5677da1bb132bd4b03a3d750986e814979d Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 15 Nov 2022 20:19:53 -0800 Subject: [PATCH 05/56] docs: :memo: open port tip --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c445b91bf4..2688c71a95 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,7 @@ docker compose up -d ## 😉 Tips & Tricks - 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 ***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 aac0a3df6a5c8d396d3422cc2aee24d15952cb2b Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Wed, 16 Nov 2022 05:25:00 +0100 Subject: [PATCH 06/56] =?UTF-8?q?docs:=20=F0=9F=93=9D=20alt=20text=20for?= =?UTF-8?q?=20calc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2688c71a95..828e92b6f6 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@
- +Calc (the Calckey mascot) smoking a fat dart # ✨ About Calckey From 3a06c43007be97b0f6554d653f93ccfa4664d7e3 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 15 Nov 2022 22:12:24 -0800 Subject: [PATCH 07/56] better page margins --- package.json | 2 +- packages/client/src/pages/page.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 85e12bfb47..5f2101b239 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.14", + "version": "12.119.0-calc.14.1", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue index b4b791876d..87350e367e 100644 --- a/packages/client/src/pages/page.vue +++ b/packages/client/src/pages/page.vue @@ -1,7 +1,7 @@ diff --git a/packages/client/src/pages/page-editor/page-editor.script-block.vue b/packages/client/src/pages/page-editor/page-editor.script-block.vue index e817fa6f8a..04b2c03c66 100644 --- a/packages/client/src/pages/page-editor/page-editor.script-block.vue +++ b/packages/client/src/pages/page-editor/page-editor.script-block.vue @@ -43,15 +43,15 @@
- + - +
- +
@@ -124,7 +124,7 @@ export default defineComponent({ typeText(): any { if (this.modelValue.type === null) return null; if (this.modelValue.type.startsWith('fn:')) return this.modelValue.type.split(':')[1]; - return this.$t(`_pages.script.blocks.${this.modelValue.type}`); + return i18n.t(`_pages.script.blocks.${this.modelValue.type}`); }, }, diff --git a/packages/client/src/pages/settings/apps.vue b/packages/client/src/pages/settings/apps.vue index 1a15afcbc4..da0de12ff7 100644 --- a/packages/client/src/pages/settings/apps.vue +++ b/packages/client/src/pages/settings/apps.vue @@ -27,7 +27,7 @@
{{ i18n.ts.details }}
    -
  • {{ $t(`_permissions.${p}`) }}
    • +
  • {{ i18n.t(`_permissions.${p}`) }}
diff --git a/packages/client/src/pages/settings/sounds.vue b/packages/client/src/pages/settings/sounds.vue index fe9319e846..970b75ca35 100644 --- a/packages/client/src/pages/settings/sounds.vue +++ b/packages/client/src/pages/settings/sounds.vue @@ -7,7 +7,7 @@ - {{ $t('_sfx.' + type) }} + {{ i18n.t('_sfx.' + type) }} diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index 4176e64364..b0ff75eefe 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -51,7 +51,7 @@
{{ i18n.ts.birthday }}
-
{{ user.birthday.replace('-', '/').replace('-', '/') }} ({{ $t('yearsOld', { age }) }})
+
{{ user.birthday.replace('-', '/').replace('-', '/') }} ({{ i18n.t('yearsOld', { age }) }})
{{ i18n.ts.registeredDate }}
diff --git a/packages/client/src/pages/welcome.entrance.b.vue b/packages/client/src/pages/welcome.entrance.b.vue index 7bcaa17ee7..b099214d6d 100644 --- a/packages/client/src/pages/welcome.entrance.b.vue +++ b/packages/client/src/pages/welcome.entrance.b.vue @@ -105,7 +105,7 @@ export default defineComponent({ showMenu(ev) { os.popupMenu([{ - text: this.$t('aboutX', { x: instanceName }), + text: i18n.t('aboutX', { x: instanceName }), icon: 'ph-info-bold ph-lg', action: () => { os.pageWindow('/about'); diff --git a/packages/client/src/pages/welcome.entrance.c.vue b/packages/client/src/pages/welcome.entrance.c.vue index a61c9ebc93..0b35a22539 100644 --- a/packages/client/src/pages/welcome.entrance.c.vue +++ b/packages/client/src/pages/welcome.entrance.c.vue @@ -125,7 +125,7 @@ export default defineComponent({ showMenu(ev) { os.popupMenu([{ - text: this.$t('aboutX', { x: instanceName }), + text: i18n.t('aboutX', { x: instanceName }), icon: 'ph-info-bold ph-lg', action: () => { os.pageWindow('/about'); diff --git a/packages/client/src/ui/deck/tl-column.vue b/packages/client/src/ui/deck/tl-column.vue index a03c9e4a63..e4102747d0 100644 --- a/packages/client/src/ui/deck/tl-column.vue +++ b/packages/client/src/ui/deck/tl-column.vue @@ -11,9 +11,9 @@

- {{ $t('disabled-timeline.title') }} + {{ i18n.t('disabled-timeline.title') }}

-

{{ $t('disabled-timeline.description') }}

+

{{ i18n.t('disabled-timeline.description') }}

diff --git a/packages/client/src/widgets/calendar.vue b/packages/client/src/widgets/calendar.vue index a39f4904da..52e39138d9 100644 --- a/packages/client/src/widgets/calendar.vue +++ b/packages/client/src/widgets/calendar.vue @@ -2,11 +2,11 @@

- {{ $t('yearX', { year }) }} - {{ $t('monthX', { month }) }} + {{ i18n.t('yearX', { year }) }} + {{ i18n.t('monthX', { month }) }}

-

🎉{{ $t('dayX', { day }) }}🎉

-

{{ $t('dayX', { day }) }}

+

🎉{{ i18n.t('dayX', { day }) }}🎉

+

{{ i18n.t('dayX', { day }) }}

{{ weekDay }}

diff --git a/packages/client/src/widgets/slideshow.vue b/packages/client/src/widgets/slideshow.vue index e317b8ab94..128b0f35b7 100644 --- a/packages/client/src/widgets/slideshow.vue +++ b/packages/client/src/widgets/slideshow.vue @@ -4,7 +4,7 @@

{{ i18n.ts.folder }}

-

{{ $t('no-image') }}

+

{{ i18n.t('no-image') }}

diff --git a/packages/client/src/widgets/timeline.vue b/packages/client/src/widgets/timeline.vue index 41c71e9009..05080281b7 100644 --- a/packages/client/src/widgets/timeline.vue +++ b/packages/client/src/widgets/timeline.vue @@ -8,7 +8,7 @@ - {{ widgetProps.src === 'list' ? widgetProps.list.name : widgetProps.src === 'antenna' ? widgetProps.antenna.name : $t('_timelines.' + widgetProps.src) }} + {{ widgetProps.src === 'list' ? widgetProps.list.name : widgetProps.src === 'antenna' ? widgetProps.antenna.name : i18n.t('_timelines.' + widgetProps.src) }} diff --git a/packages/client/src/widgets/trends.vue b/packages/client/src/widgets/trends.vue index 9e5c4553fa..a1d612c753 100644 --- a/packages/client/src/widgets/trends.vue +++ b/packages/client/src/widgets/trends.vue @@ -8,7 +8,7 @@
#{{ stat.tag }} -

{{ $t('nUsersMentioned', { n: stat.usersCount }) }}

+

{{ i18n.t('nUsersMentioned', { n: stat.usersCount }) }}

From 395758021f60743c1fd91d9260845b081029fcd5 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 16 Nov 2022 01:46:09 -0800 Subject: [PATCH 16/56] fix: don't show rtl if disabled, regardless of perms --- packages/client/src/pages/timeline.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index a2643dddf2..803af70547 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -86,9 +86,7 @@ if (defaultStore.reactiveState.tutorial.value !== -1) { const isLocalTimelineAvailable = !instance.disableLocalTimeline || ($i != null && ($i.isModerator || $i.isAdmin)); -const isRecommendedTimelineAvailable = - !instance.disableRecommendedTimeline || - ($i != null && ($i.isModerator || $i.isAdmin)); +const isRecommendedTimelineAvailable = !instance.disableRecommendedTimeline; const isGlobalTimelineAvailable = !instance.disableGlobalTimeline || ($i != null && ($i.isModerator || $i.isAdmin)); From 29c2fb1ba809d945bc847315cfe01f4b276b9207 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 16 Nov 2022 01:48:19 -0800 Subject: [PATCH 17/56] typo --- packages/client/src/pages/user/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue index cb2b70bb00..7de1bca3d9 100644 --- a/packages/client/src/pages/user/index.vue +++ b/packages/client/src/pages/user/index.vue @@ -83,26 +83,26 @@ const headerTabs = $computed(() => { key: 'home', title: i18n.ts.overview, - icon: 'ph-user-bold ph-large', + icon: 'ph-user-bold ph-lg', }, ...(($i && $i.id === user.id) || user.publicReactions ? [{ key: 'reactions', title: i18n.ts.reaction, - icon: 'ph-smiley-bold ph-large', + icon: 'ph-smiley-bold ph-lg', }] : []), ...(user.instance == null ? [{ key: 'clips', title: i18n.ts.clips, - icon: 'ph-paperclip-bold ph-large', + icon: 'ph-paperclip-bold ph-lg', }, { key: 'pages', title: i18n.ts.pages, - icon: 'ph-file-text-bold ph-large', + icon: 'ph-file-text-bold ph-lg', }, { key: 'gallery', title: i18n.ts.gallery, - icon: 'ph-image-square-bold ph-large', + icon: 'ph-image-square-bold ph-lg', }] : []), ] : null, From cb6362fd497b9a1e906bd0a1d5bf9264304700e7 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 16 Nov 2022 02:08:33 -0800 Subject: [PATCH 18/56] chore: :arrow_up: upgrade packages --- package.json | 10 +++++----- packages/backend/package.json | 20 ++++++++++---------- packages/client/package.json | 10 +++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index edff41f67d..83b4cec1b8 100644 --- a/package.json +++ b/package.json @@ -39,8 +39,8 @@ "lodash": "^4.17.21" }, "dependencies": { - "@bull-board/api": "^4.6.3", - "@bull-board/ui": "^4.6.3", + "@bull-board/api": "^4.6.4", + "@bull-board/ui": "^4.6.4", "@tensorflow/tfjs": "^3.21.0", "eslint": "^8.27.0", "execa": "5.1.1", @@ -55,13 +55,13 @@ "seedrandom": "^3.0.5" }, "devDependencies": { - "@types/gulp": "4.0.9", + "@types/gulp": "4.0.10", "@types/gulp-rename": "2.0.1", - "@typescript-eslint/parser": "5.42.1", + "@typescript-eslint/parser": "5.43.0", "cross-env": "7.0.3", "cypress": "10.11.0", "start-server-and-test": "1.14.0", - "typescript": "4.8.4", + "typescript": "4.9.3", "vue-eslint-parser": "^9.1.0" } } diff --git a/packages/backend/package.json b/packages/backend/package.json index 190d57ff71..c7532bed32 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -21,9 +21,9 @@ "@tensorflow/tfjs-node": "3.21.1" }, "dependencies": { - "@bull-board/api": "^4.6.3", - "@bull-board/koa": "^4.6.3", - "@bull-board/ui": "^4.6.3", + "@bull-board/api": "^4.6.4", + "@bull-board/koa": "^4.6.4", + "@bull-board/ui": "^4.6.4", "@discordapp/twemoji": "14.0.2", "@elastic/elasticsearch": "7.17.0", "@koa/cors": "3.4.3", @@ -32,11 +32,11 @@ "@peertube/http-signature": "1.7.0", "@sinonjs/fake-timers": "9.1.2", "@syuilo/aiscript": "0.11.1", - "ajv": "8.11.0", + "ajv": "8.11.2", "archiver": "5.3.1", "autobind-decorator": "2.4.0", "autwh": "0.1.0", - "aws-sdk": "2.1253.0", + "aws-sdk": "2.1255.0", "bcryptjs": "2.4.3", "blurhash": "1.1.5", "bull": "4.10.1", @@ -54,10 +54,10 @@ "feed": "4.2.2", "file-type": "17.1.6", "fluent-ffmpeg": "2.1.2", - "got": "12.5.2", + "got": "12.5.3", "hpagent": "0.1.2", "ioredis": "4.28.5", - "ip-cidr": "3.0.10", + "ip-cidr": "3.0.11", "is-svg": "4.3.2", "js-yaml": "4.1.0", "jsdom": "20.0.2", @@ -174,12 +174,12 @@ "@types/web-push": "3.3.2", "@types/websocket": "1.0.5", "@types/ws": "8.5.3", - "@typescript-eslint/eslint-plugin": "5.42.1", - "@typescript-eslint/parser": "5.42.1", + "@typescript-eslint/eslint-plugin": "5.43.0", + "@typescript-eslint/parser": "5.43.0", "cross-env": "7.0.3", "eslint": "8.27.0", "eslint-plugin-import": "2.26.0", "execa": "6.1.0", - "typescript": "4.8.4" + "typescript": "4.9.3" } } diff --git a/packages/client/package.json b/packages/client/package.json index cd333c34dd..00ecb0456f 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -54,10 +54,10 @@ "tsc-alias": "1.7.1", "tsconfig-paths": "4.1.0", "twemoji-parser": "14.0.0", - "typescript": "4.8.4", + "typescript": "4.9.3", "uuid": "9.0.0", "vanilla-tilt": "1.7.3", - "vite": "^3.2.3", + "vite": "^3.2.4", "vue": "3.2.45", "vue-isyourpasswordsafe": "^2.0.0", "vue-plyr": "^7.0.0", @@ -67,7 +67,7 @@ "devDependencies": { "@types/escape-regexp": "0.0.1", "@types/glob": "8.0.0", - "@types/gulp": "4.0.9", + "@types/gulp": "4.0.10", "@types/gulp-rename": "2.0.1", "@types/katex": "0.14.0", "@types/matter-js": "0.18.2", @@ -76,8 +76,8 @@ "@types/throttle-debounce": "5.0.0", "@types/tinycolor2": "1.4.3", "@types/uuid": "8.3.4", - "@typescript-eslint/eslint-plugin": "5.42.1", - "@typescript-eslint/parser": "5.42.1", + "@typescript-eslint/eslint-plugin": "5.43.0", + "@typescript-eslint/parser": "5.43.0", "cross-env": "7.0.3", "cypress": "10.11.0", "eslint": "8.27.0", From ddf4a071cfb9ba325d2df1fcf11d7b517f6167db Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Wed, 16 Nov 2022 19:44:25 +0100 Subject: [PATCH 19/56] =?UTF-8?q?docs:=20=F0=9F=93=9D=20typo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's "available". Thank you luke :P --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 828e92b6f6..0328e46614 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ cp -r ../misskey/files . # if you don't use object storage ## 🍀 NGINX -- Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-avaliable/ && cd /etc/nginx/sites-avaliable/` +- Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/` - Edit `calckey.nginx.conf` to reflect your instance properly - Run `sudo cp ./calckey.nginx.conf ../sites-enabled/` - Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service. From 4a4f83a18f18a08a2b915eeb7c04c8e51eb496a3 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 17 Nov 2022 13:55:34 -0800 Subject: [PATCH 20/56] chore: :arrow_up: yarn 3.3.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 83b4cec1b8..7d58afcd7d 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "type": "git", "url": "https://codeberg.org/thatonecalculator/calckey.git" }, - "packageManager": "yarn@3.2.4", + "packageManager": "yarn@3.3.0", "workspaces": [ "packages/client", "packages/backend", From 259cc214216380be2eaf0f22d03f3aae391814aa Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 17 Nov 2022 13:55:48 -0800 Subject: [PATCH 21/56] =?UTF-8?q?docs:=20=F0=9F=93=9D=20typo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0328e46614..95db66c0f1 100644 --- a/README.md +++ b/README.md @@ -123,9 +123,9 @@ docker up -d ### 🐳 Docker Compose ```sh -docker compose build +docker-compose build docker-compose run --rm web yarn run init -docker compose up -d +docker-compose up -d ``` ## 😉 Tips & Tricks From 9386ad9e7908eba85b58cdf736e6e56502199447 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Thu, 17 Nov 2022 23:14:06 +0000 Subject: [PATCH 22/56] =?UTF-8?q?docs:=20=F0=9F=93=9D=20official=20account?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 95db66c0f1..a6a7f02b5a 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ # 🥂 Links +- 📣 Official account: https://i.calckey.cloud/@calckey - 💸 Liberapay: - 💁 Matrix support room: - 📜 Instance list: From 3df6b23be68f755b48d7e344622a4e9b59dfd6ad Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Thu, 17 Nov 2022 23:16:16 +0000 Subject: [PATCH 23/56] Add official account and flagship instance --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a6a7f02b5a..5506e51a24 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@
- + Calckey logo -**🌎 **[Calckey](https://stop.voring.me/)** is an open source, decentralized social media platform that's free forever! 🚀** +**🌎 **[Calckey](https://i.calckey.cloud/)** is an open source, decentralized social media platform that's free forever! 🚀**
@@ -33,7 +33,8 @@ # 🥂 Links -- 📣 Official account: https://i.calckey.cloud/@calckey +- 🚢 Flagship instance: +- 📣 Official account: - 💸 Liberapay: - 💁 Matrix support room: - 📜 Instance list: From 70c89557adfe46aafbf7db8139e121e00758dbba Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 17 Nov 2022 20:00:05 -0800 Subject: [PATCH 24/56] =?UTF-8?q?=F0=9F=92=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/en-US.yml | 2 +- package.json | 2 +- packages/client/src/components/MkPostForm.vue | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index f5758ed645..a94af60a1c 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -1094,7 +1094,7 @@ _channel: usersCount: "{n} Participants" notesCount: "{n} Notes" _messaging: - dms: "DMs" + dms: "Private" groups: "Groups" _menuDisplay: sideFull: "Side" diff --git a/package.json b/package.json index 7d58afcd7d..aa384e7da8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.14.6", + "version": "12.119.0-calc.14.7", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue index 3f97529c40..a6e67bbf56 100644 --- a/packages/client/src/components/MkPostForm.vue +++ b/packages/client/src/components/MkPostForm.vue @@ -32,10 +32,10 @@
{{ i18n.ts.recipient }}
- +
- +
@@ -832,7 +832,6 @@ onMounted(() => { padding: 6px 24px; margin-bottom: 8px; overflow: auto; - white-space: nowrap; > .visibleUsers { display: inline; @@ -844,7 +843,7 @@ onMounted(() => { border-radius: 8px; } - > span { + > div { margin-right: 14px; padding: 8px 0 8px 8px; border-radius: 8px; From 59e510464ad4c74cf06027c1f14c4e4cedd8dafd Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 17 Nov 2022 20:32:24 -0800 Subject: [PATCH 25/56] moar --- package.json | 2 +- packages/client/src/components/MkPostForm.vue | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index aa384e7da8..f536b0f29b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.14.7", + "version": "12.119.0-calc.14.8", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue index a6e67bbf56..254fc7889d 100644 --- a/packages/client/src/components/MkPostForm.vue +++ b/packages/client/src/components/MkPostForm.vue @@ -32,10 +32,10 @@
{{ i18n.ts.recipient }}
-
+ -
+
@@ -761,7 +761,7 @@ onMounted(() => { margin-left: 0 !important; } } - + > .local-only { margin: 0 0 0 12px; opacity: 0.7; @@ -839,15 +839,19 @@ onMounted(() => { font-size: 14px; > button { - padding: 4px; + padding: 2px; border-radius: 8px; + + > i { + transform: translateX(2px); + } } - > div { - margin-right: 14px; - padding: 8px 0 8px 8px; - border-radius: 8px; - background: var(--X4); + > span { + margin: 0.3rem; + padding: 4px 0 4px 4px; + border-radius: 999px; + background: var(--X3); > button { padding: 4px 8px; From 5a6377a6065303c7ce66e3dfae75cd8ab38bdffa Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 17 Nov 2022 21:01:05 -0800 Subject: [PATCH 26/56] .9 --- locales/en-US.yml | 2 +- package.json | 2 +- packages/client/src/components/MkPostForm.vue | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index a94af60a1c..d2dd2dd6ff 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -159,7 +159,7 @@ proxyAccount: "Proxy account" proxyAccountDescription: "A proxy account is an account that acts as a remote follower for users under certain conditions. For example, when a user adds a remote user to the list, the remote user's activity will not be delivered to the instance if no local user is following that user, so the proxy account will follow instead." host: "Host" selectUser: "Select a user" -recipient: "Recipient" +recipient: "Recipient(s)" annotation: "Comments" federation: "Federation" instances: "Instances" diff --git a/package.json b/package.json index f536b0f29b..97730121a1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.14.8", + "version": "12.119.0-calc.14.9", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue index 254fc7889d..e7b7de7fae 100644 --- a/packages/client/src/components/MkPostForm.vue +++ b/packages/client/src/components/MkPostForm.vue @@ -30,13 +30,13 @@
{{ i18n.ts.quoteAttached }}
+ {{ i18n.ts.recipient }}
-
{{ i18n.ts.notSpecifiedMentionWarning }} - @@ -832,6 +832,7 @@ onMounted(() => { padding: 6px 24px; margin-bottom: 8px; overflow: auto; + line-height: 2rem; > .visibleUsers { display: inline; From ca42de1b7c16bd058ac9c427594c5fb9216242e5 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 17 Nov 2022 21:04:16 -0800 Subject: [PATCH 27/56] move back --- package.json | 2 +- packages/client/src/components/MkPostForm.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 97730121a1..2a785ec5be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.14.9", + "version": "12.119.0-calc.14.10", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue index e7b7de7fae..2262fce5d0 100644 --- a/packages/client/src/components/MkPostForm.vue +++ b/packages/client/src/components/MkPostForm.vue @@ -30,13 +30,13 @@
{{ i18n.ts.quoteAttached }}
- {{ i18n.ts.recipient }}
+
{{ i18n.ts.notSpecifiedMentionWarning }} - From d40f0b8eff5a066f8270d16b1a437e017f34aa8c Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 18 Nov 2022 13:54:34 -0800 Subject: [PATCH 28/56] message style --- package.json | 2 +- .../client/src/pages/messaging/messaging-room.message.vue | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 2a785ec5be..2829ec98fc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "calckey", - "version": "12.119.0-calc.14.10", + "version": "12.119.0-calc.14.11", "codename": "aqua", "repository": { "type": "git", diff --git a/packages/client/src/pages/messaging/messaging-room.message.vue b/packages/client/src/pages/messaging/messaging-room.message.vue index c56ebed36a..f7feeda846 100644 --- a/packages/client/src/pages/messaging/messaging-room.message.vue +++ b/packages/client/src/pages/messaging/messaging-room.message.vue @@ -1,6 +1,6 @@