From 36fbd0e419220d79ce161b122b163b43d3c1574b Mon Sep 17 00:00:00 2001 From: TalonTheDragon Date: Fri, 26 May 2023 23:30:27 +0200 Subject: [PATCH 001/101] Add aria live region to message list so they get read automatically as they come in --- packages/client/src/pages/messaging/messaging-room.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue index 771d590bba..52504a267b 100644 --- a/packages/client/src/pages/messaging/messaging-room.vue +++ b/packages/client/src/pages/messaging/messaging-room.vue @@ -28,6 +28,7 @@ #default="{ items: messages, fetching: pFetching }" > 0" class="typers"> +
Date: Fri, 26 May 2023 23:43:35 +0200 Subject: [PATCH 003/101] Add labels to chat form --- packages/client/src/pages/messaging/messaging-room.form.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/messaging/messaging-room.form.vue b/packages/client/src/pages/messaging/messaging-room.form.vue index 4bc12ce9ad..f6565c25c5 100644 --- a/packages/client/src/pages/messaging/messaging-room.form.vue +++ b/packages/client/src/pages/messaging/messaging-room.form.vue @@ -17,16 +17,17 @@ {{ file.name }}
- -
--> From 028d47587cc89bdca13de900c4eb8adb03e14d73 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Fri, 2 Jun 2023 21:36:47 +0000 Subject: [PATCH 009/101] Update 'CODE_OF_CONDUCT.md' --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 95e2bd421a..143c63d29c 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -59,7 +59,7 @@ representative at an online or offline event. ## Enforcement -Servers of abusive, harassing, or otherwise unacceptable behavior may be +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at @thatonecalculator on Codeberg, `@kainoa@calckey.social` on the Fediverse, From 4cbf73140c3d62f6c9bbe6f1e64d3cc26c8d6ae3 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 2 Jun 2023 14:52:44 -0700 Subject: [PATCH 010/101] fix: show message on error alert if text is null --- packages/client/src/os.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts index 0aa823d059..0636bfd3e2 100644 --- a/packages/client/src/os.ts +++ b/packages/client/src/os.ts @@ -277,6 +277,9 @@ export function alert(props: { text?: string | null; }): Promise { return new Promise((resolve, reject) => { + if (props.text == null && props.type === "error") { + props.text = "An unknown error occured!" + } popup( MkDialog, props, From 8e5a374ac76aea52b66bb0eb330f05d96aaa9570 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 2 Jun 2023 14:53:28 -0700 Subject: [PATCH 011/101] chore: formatting --- packages/client/src/components/MkNote.vue | 10 ++++++++-- packages/client/src/components/MkNoteSub.vue | 3 ++- packages/client/src/os.ts | 2 +- packages/client/src/pages/about-calckey.vue | 3 +-- packages/client/src/pages/settings/general.vue | 8 +++++--- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue index 669fd67efa..7eca22a734 100644 --- a/packages/client/src/components/MkNote.vue +++ b/packages/client/src/components/MkNote.vue @@ -68,7 +68,9 @@ class="article" @contextmenu.stop="onContextmenu" @click="noteClick" - :style="{ cursor: expandOnNoteClick && !detailedView ? 'pointer' : '' }" + :style="{ + cursor: expandOnNoteClick && !detailedView ? 'pointer' : '', + }" >
@@ -503,7 +505,11 @@ function scrollIntoView() { } function noteClick(e) { - if (document.getSelection().type === "Range" || props.detailedView || !expandOnNoteClick) { + if ( + document.getSelection().type === "Range" || + props.detailedView || + !expandOnNoteClick + ) { e.stopPropagation(); } else { router.push(notePage(appearNote)); diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue index 60fbbe11eb..c26af16687 100644 --- a/packages/client/src/components/MkNoteSub.vue +++ b/packages/client/src/components/MkNoteSub.vue @@ -14,7 +14,8 @@ @contextmenu.stop="onContextmenu" >
-
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts index 0636bfd3e2..6831d72fae 100644 --- a/packages/client/src/os.ts +++ b/packages/client/src/os.ts @@ -278,7 +278,7 @@ export function alert(props: { }): Promise { return new Promise((resolve, reject) => { if (props.text == null && props.type === "error") { - props.text = "An unknown error occured!" + props.text = "An unknown error occured!"; } popup( MkDialog, diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue index f0faa40660..1e16356a51 100644 --- a/packages/client/src/pages/about-calckey.vue +++ b/packages/client/src/pages/about-calckey.vue @@ -98,8 +98,7 @@ :text="'$[sparkle @kainoa@calckey.social] (Main developer)'" /> {{ i18n.ts.disablePagesScript }} - {{ - i18n.ts.expandOnNoteClick - }} + {{ i18n.ts.expandOnNoteClick + }} {{ i18n.ts.flagShowTimelineReplies From 903d12f18fab17219d68cf64e6c1dece39307c7a Mon Sep 17 00:00:00 2001 From: Freeplay Date: Fri, 2 Jun 2023 18:14:39 -0400 Subject: [PATCH 012/101] fix gap --- packages/client/src/pages/user/home.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index 277d5f5ef9..a7da75dc64 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -261,7 +261,7 @@
-
+
Date: Fri, 2 Jun 2023 15:45:05 -0700 Subject: [PATCH 013/101] fix: :recycle: use locale for error https://calckey.social/notes/9fippqiwhl287b5m --- packages/client/src/os.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts index 6831d72fae..ed911978b4 100644 --- a/packages/client/src/os.ts +++ b/packages/client/src/os.ts @@ -11,6 +11,7 @@ import MkToast from "@/components/MkToast.vue"; import MkDialog from "@/components/MkDialog.vue"; import { MenuItem } from "@/types/menu"; import { $i } from "@/account"; +import { i18n } from "./i18n"; export const pendingApiRequestsCount = ref(0); @@ -278,7 +279,7 @@ export function alert(props: { }): Promise { return new Promise((resolve, reject) => { if (props.text == null && props.type === "error") { - props.text = "An unknown error occured!"; + props.text = i18n.ts.somethingHappened; } popup( MkDialog, From 09983a657d03429cecbe40b09822cfed9d26f605 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Fri, 2 Jun 2023 16:10:57 -0700 Subject: [PATCH 014/101] chore: update example config --- .config/example.yml | 65 +++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/.config/example.yml b/.config/example.yml index ba53bde43a..16fa67142e 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -2,32 +2,31 @@ # Calckey configuration #โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ” +# After starting your server, please don't change the URL! Doing so will break federation. + # โ”Œโ”€โ”€โ”€โ”€โ”€โ” #โ”€โ”€โ”€โ”˜ URL โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ # Final accessible URL seen by a user. -url: https://example.tld/ - -# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE -# URL SETTINGS AFTER THAT! +url: https://example.com/ # โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ” #โ”€โ”€โ”€โ”˜ Port and TLS settings โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ # -# Misskey requires a reverse proxy to support HTTPS connections. +# Calckey requires a reverse proxy to support HTTPS connections. # -# +----- https://example.tld/ ------------+ +# +----- https://example.com/ ------------+ # +------+ |+-------------+ +----------------+| -# | User | ---> || Proxy (443) | ---> | Misskey (3000) || +# | User | ---> || Proxy (443) | ---> | Calckey (3000) || # +------+ |+-------------+ +----------------+| # +---------------------------------------+ # -# You need to set up a reverse proxy. (e.g. nginx) +# You need to set up a reverse proxy. (e.g. nginx, caddy) # An encrypted connection with HTTPS is highly recommended # because tokens may be transferred in GET requests. -# The port that your Misskey server should listen on. +# The port that your Calckey server should listen on. port: 3000 # โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ” @@ -62,6 +61,17 @@ redis: #prefix: example-prefix #db: 1 +# Please configure either MeiliSearch *or* Sonic. +# If both MeiliSearch and Sonic configurations are present, MeiliSearch will take precedence. + +# โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ” +#โ”€โ”€โ”€โ”˜ MeiliSearch configuration โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ +#meilisearch: +# host: meilisearch +# port: 7700 +# ssl: false +# apiKey: + # โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ” #โ”€โ”€โ”€โ”˜ Sonic configuration โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ @@ -72,23 +82,6 @@ redis: # collection: notes # bucket: default -# โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ” -#โ”€โ”€โ”€โ”˜ Elasticsearch configuration โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ - -#elasticsearch: -# host: localhost -# port: 9200 -# ssl: false -# user: -# pass: - -# โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ” -#โ”€โ”€โ”€โ”˜ Meilisearch configuration โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ -#meilisearch: -# host: meilisearch -# port: 7700 -# ssl: false -# apiKey: # โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ” #โ”€โ”€โ”€โ”˜ ID generation โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ @@ -108,10 +101,10 @@ redis: # โ”Œโ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ” #โ”€โ”€โ”€โ”˜ Other configuration โ””โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€ -# Max note length, should be < 8000. +# Maximum length of a post (default 3000, max 8192) #maxNoteLength: 3000 -# Maximum lenght of an image caption or file comment (default 1500, max 8192) +# Maximum length of an image caption (default 1500, max 8192) #maxCaptionLength: 1500 # Reserved usernames that only the administrator can register with @@ -185,13 +178,21 @@ reservedUsernames: [ # Upload or download file size limits (bytes) #maxFileSize: 262144000 +#โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ” +# Congrats, you've reached the end of the config file needed for most deployments! +# Enjoy your Calckey server! +#โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ” + + + + +#โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ” # 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... +#โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ” #maxUserSignups: 100 #isManagedHosting: true From 389ca3f332748bce2f11048796ee16112eb0ff05 Mon Sep 17 00:00:00 2001 From: Freeplay Date: Fri, 2 Jun 2023 21:04:51 -0400 Subject: [PATCH 015/101] aria to acc menu button --- packages/client/src/pages/user/home.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index a7da75dc64..2ea4bc9711 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -134,7 +134,7 @@