From a7600dff542674adff7449b93fe5c8b8956d48d8 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 9 Aug 2022 23:14:51 -0700 Subject: [PATCH 01/14] docs: :memo: Add links --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 16116d58df..5eebf661b0 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,17 @@
+# ๐Ÿฅ‚ Links + +- Liberapay: https://liberapay.com/ThatOneCalculator +- Matrix support room: https://matrix.to/#/#calckey:matrix.fedibird.com +- Instance list: https://calckey.fediverse.observer/list +- JoinFediverse Wiki: https://joinfediverse.wiki/What_is_Calckey%3F + # ๐Ÿ“ Documentation - Misskey documentation can be found on [Misskey Hub](https://misskey-hub.net/) + - To make a new Calckey instance, read their documentation for building from source or using Docker, but replace their repo link (`https://github.com/misskey-dev/misskey.git`) with `https://codeberg.org/thatonecalculator/calckey.git`. - API reference can be found on any Calckey instance's [API doc page](https://stop.voring.me/api-doc) # ๐Ÿšš Migrating from Misskey to Calckey From 0e7c01d56f4471522f91a9fdf39a6628ed431eda Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 9 Aug 2022 23:16:12 -0700 Subject: [PATCH 02/14] docs: :memo: Notable differences --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5eebf661b0..240ea7a297 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,8 @@ - Calckey adds many quality of life changes and bug fixes for users and instance admins alike. - Read **[this document](./CALCKEY.md)** all for current and future differences. - Notable differences: + - Improved UI/UX, notifications, security, and more - Recommended Instances timeline - - Improved notifications - Many more user and admin settings From fb0765ba76a584fb36513d3d57059ac6ae147f75 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 9 Aug 2022 23:18:00 -0700 Subject: [PATCH 03/14] docs: :memo: Customize instructions --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 240ea7a297..d2082e242f 100644 --- a/README.md +++ b/README.md @@ -62,8 +62,8 @@ cp ../misskey/.config/default.yml ./.config/default.yml # replace `../misskey/` ## ๐Ÿ’… Customize -- To add custom CSS for all users, edit `/custom/instance.css`. -- To add static assets (such as images for the splash screen), place them in the `/custom/` folder. They'll then be avaliable on `https://yourinstance.tld/static-assets/filename.png`. +- To add custom CSS for all users, edit `./custom/instance.css`. +- To add static assets (such as images for the splash screen), place them in the `./custom/` directory. They'll then be avaliable on `https://yourinstance.tld/static-assets/filename.ext`. ## ๐Ÿš€ Build and launch! From 72b7a33d3b2762655c8d9c9023616ba949993f03 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 9 Aug 2022 23:28:41 -0700 Subject: [PATCH 04/14] docs: :memo: checksum behavior note --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d2082e242f..9198be6330 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ cp ../misskey/.config/default.yml ./.config/default.yml # replace `../misskey/` ```sh # git pull -yarn install +yarn install # prepend `YARN_CHECKSUM_BEHAVIOR=update` if it doesn't work NODE_ENV=production yarn run build && yarn run migrate # Edit service to point to calckey folder and restart! ``` From ea97c9f5d2ab98d43031aec67c444558a05052f8 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Tue, 9 Aug 2022 23:40:36 -0700 Subject: [PATCH 05/14] docs: :memo: emojis! --- README.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9198be6330..b63b156e58 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,10 @@ # ๐Ÿฅ‚ Links -- Liberapay: https://liberapay.com/ThatOneCalculator -- Matrix support room: https://matrix.to/#/#calckey:matrix.fedibird.com -- Instance list: https://calckey.fediverse.observer/list -- JoinFediverse Wiki: https://joinfediverse.wiki/What_is_Calckey%3F +- ๐Ÿ’ธ Liberapay: https://liberapay.com/ThatOneCalculator +- ๐Ÿ’ Matrix support room: https://matrix.to/#/#calckey:matrix.fedibird.com +- ๐Ÿ“œ Instance list: https://calckey.fediverse.observer/list +- ๐Ÿ“– JoinFediverse Wiki: https://joinfediverse.wiki/What_is_Calckey%3F # ๐Ÿ“ Documentation @@ -83,7 +83,3 @@ NODE_ENV=production yarn run build && yarn run migrate sudo docker-compose build sudo docker-compose stop && sudo docker-compose up -d ``` - -# ๐Ÿ’ธ Patrons - -None yet! You can support of the development of this fork here, every little bit counts: https://liberapay.com/ThatOneCalculator/ From 31729a28d69b16f07dcef6d32ff9288249ec6af9 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 10 Aug 2022 00:04:32 -0700 Subject: [PATCH 06/14] docs: :memo: planning join reasons --- CALCKEY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CALCKEY.md b/CALCKEY.md index b05d4064d0..bcc90df2b3 100644 --- a/CALCKEY.md +++ b/CALCKEY.md @@ -15,6 +15,7 @@ - Non-nyaify cat mode - Timeline filters - Filter notifications by user +- Join Reason system like Mastodon/Pleroma - Build flag to remove NSFW/AI stuff - [Rat mode?](https://stop.voring.me/notes/933fx97bmd) From e1b9406b95c69e0874d331e32c334eaf66d9b120 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Wed, 10 Aug 2022 00:50:50 -0700 Subject: [PATCH 07/14] docs: :memo: warning for node 18.6.0 --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b63b156e58..637a14176d 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,8 @@ You need at least ๐Ÿข NodeJS v16.15.0 (v18.4.0 recommended!) and *exactly* ๐Ÿงถ Yarn v3.2.2! +> โš ๏ธ Please don't use NodeJS v18.6.0, as it's known to cause problems. + ## ๐Ÿ“ฉ Install dependencies ```sh From bed7fe6a4e146471b131f4efbe7d350802f10187 Mon Sep 17 00:00:00 2001 From: erisdisqordia Date: Wed, 10 Aug 2022 10:18:10 +0200 Subject: [PATCH 08/14] Avoid adding custom CSS to git patches :) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e3bbac9c3f..5dd72c88fa 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ api-docs.json .DS_Store /files ormconfig.json +/custom # blender backups *.blend1 From 563280abe190ed49a7fee5b9f2d7e61eedbfc5b1 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 12 Aug 2022 21:43:11 -0700 Subject: [PATCH 09/14] fix: :package: Fix yarn.lock --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index c239f1bee4..3c7069e62b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3308,8 +3308,8 @@ __metadata: "browser-image-resizer@git+https://github.com/misskey-dev/browser-image-resizer#v2.2.1-misskey.2": version: 2.2.1-misskey.2 - resolution: "browser-image-resizer@https://github.com/misskey-dev/browser-image-resizer.git#commit=a58834f5fe2af9f9f31ff115121aef3de6f9d416" - checksum: 8ea30705704cc3f81eca23ff6cd0d5bf0d5404cd82612a52de11c0b851be511613022758babf5c202cc92b019483cfb97d7ef48cc18368a8913803fd654ac5d1 + resolution: "browser-image-resizer@https://github.com/misskey-dev/browser-image-resizer.git#commit=a58834f5fe2af9f9f31ff115121aef3de6> + checksum: eb5ddfe7f6a2de96340ef420df9be03a75f2bfd8f568a60be22cc8f2ccdcb754105b7799cf706c09add3f9d82b7ce1c6f963842f80a85f234b26ef6bf1b> languageName: node linkType: hard @@ -14591,11 +14591,11 @@ __metadata: "typescript@patch:typescript@4.7.4#~builtin": version: 4.7.4 - resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin::version=4.7.4&hash=f456af" + resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin::version=4.7.4&hash=7ad353" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 9096d8f6c16cb80ef3bf96fcbbd055bf1c4a43bd14f3b7be45a9fbe7ada46ec977f604d5feed3263b4f2aa7d4c7477ce5f9cd87de0d6feedec69a983f3a4f93e + checksum: 9096d8f6c16cb80ef3bf96fcbbd055bf1c4a43bd14f3b7be45a9fbe7ada46ec977f604d5feed3263b4f2aa7d4c7477ce5f9cd87de0d6feedec69a983f3a> languageName: node linkType: hard From 8a09de6b283a23761059ecc1abb856a96027c10b Mon Sep 17 00:00:00 2001 From: nvisser Date: Sat, 13 Aug 2022 07:26:51 +0200 Subject: [PATCH 10/14] Add following badge to user preview popup (#9048) --- CHANGELOG.md | 5 +++++ packages/client/src/components/user-preview.vue | 14 +++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58d79c52bd..34ec7a6427 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,11 @@ You should also include the user name that made the change. --> +## 12.x.x (unreleased) + +### Improvements +- Client: Add following badge to user preview popup @nvisser + ## 12.118.1 (2022/08/08) ### Bugfixes diff --git a/packages/client/src/components/user-preview.vue b/packages/client/src/components/user-preview.vue index f80947f75a..523960564b 100644 --- a/packages/client/src/components/user-preview.vue +++ b/packages/client/src/components/user-preview.vue @@ -2,7 +2,9 @@
- +
@@ -120,6 +122,16 @@ export default defineComponent({ background-color: rgba(0, 0, 0, 0.1); background-size: cover; background-position: center; + > .followed { + position: absolute; + top: 12px; + left: 12px; + padding: 4px 8px; + color: #fff; + background: rgba(0, 0, 0, 0.7); + font-size: 0.7em; + border-radius: 6px; + } } > .avatar { From c97dc7fe933f62615984dc1e1f00d89358964460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=9A=E3=81=8D=E2=AA=A5=E2=84=A2?= <44765629+melt-adzuki@users.noreply.github.com> Date: Sat, 13 Aug 2022 17:41:17 +0900 Subject: [PATCH 11/14] feat: show header with current user avatar on TL (#9051) * feat: show header with current user avatar on TL * refactor(client): use displayMyAvatar prop instead of metadata * refactor(client): prefer v-if to `display: none;` --- .../src/components/global/page-header.vue | 21 ++++++++++++++++++- packages/client/src/pages/timeline.vue | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/packages/client/src/components/global/page-header.vue b/packages/client/src/components/global/page-header.vue index 106e216b9b..ba75b2446b 100644 --- a/packages/client/src/components/global/page-header.vue +++ b/packages/client/src/components/global/page-header.vue @@ -1,5 +1,8 @@