diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml index fc29623ddc..844cfb5d56 100644 --- a/locales/ar-SA.yml +++ b/locales/ar-SA.yml @@ -1027,27 +1027,6 @@ _time: minute: "د" hour: "سا" day: "ي" -_tutorial: - title: "How to use Calckey" - step1_1: "Welcome!" - step1_2: "Let's get you set up. You'll be up and running in no time!" - step2_1: "First, please fill out your profile." - step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you." - step3_1: "Now time to follow some people!" - step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them." - step4_1: "Let's get you out there." - step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\"" - step5_1: "Timelines, timelines everywhere!" - step5_2: "Your instance has {timelines} different timelines enabled." - step5_3: "The Home {icon} timeline is where you can see posts from your followers." - step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance." - step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend." - step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers." - step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance." - step6_1: "So, what is this place?" - step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"." - step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time." - step6_4: "Now go, explore, and have fun!" _2fa: alreadyRegistered: "سجلت سلفًا جهازًا للاستيثاق بعاملين." registerDevice: "سجّل جهازًا جديدًا" diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml index 3ed6e53aa6..8a9358e2a1 100644 --- a/locales/bn-BD.yml +++ b/locales/bn-BD.yml @@ -1108,27 +1108,6 @@ _time: minute: "মিনিট" hour: "ঘণ্টা" day: "দিন" -_tutorial: - title: "How to use Calckey" - step1_1: "Welcome!" - step1_2: "Let's get you set up. You'll be up and running in no time!" - step2_1: "First, please fill out your profile." - step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you." - step3_1: "Now time to follow some people!" - step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them." - step4_1: "Let's get you out there." - step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\"" - step5_1: "Timelines, timelines everywhere!" - step5_2: "Your instance has {timelines} different timelines enabled." - step5_3: "The Home {icon} timeline is where you can see posts from your followers." - step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance." - step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend." - step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers." - step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance." - step6_1: "So, what is this place?" - step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"." - step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time." - step6_4: "Now go, explore, and have fun!" _2fa: alreadyRegistered: "আপনি ইতিমধ্যে একটি 2-ফ্যাক্টর অথেনটিকেশন ডিভাইস নিবন্ধন করেছেন৷" registerDevice: "নতুন ডিভাইস নিবন্ধন করুন" diff --git a/locales/en-US.yml b/locales/en-US.yml index 8da78d3b8d..ee0025cb94 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -849,6 +849,9 @@ overridedDeviceKind: "Device type" smartphone: "Smartphone" tablet: "Tablet" auto: "Auto" +showLocalPosts: "Show local posts in:" +homeTimeline: "Home Timeline" +socialTimeline: "Social Timeline" themeColor: "Instance Ticker Color" size: "Size" numberOfColumn: "Number of columns" @@ -1240,10 +1243,10 @@ _tutorial: step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\"" step5_1: "Timelines, timelines everywhere!" step5_2: "Your instance has {timelines} different timelines enabled." - step5_3: "The Home {icon} timeline is where you can see posts from your followers." + step5_3: "The Home {icon} timeline is where you can see posts from the accounts you follow and from everyone else on this instance. If you prefer your Home timeline to only display posts from accounts you follow, you can easily change this in Settings!" step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance." - step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend." - step5_6: "The Social {icon} timeline is your home + local." + step5_5: "The Social {icon} timeline is where you can see posts only from the accounts you follow." + step5_6: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend." step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance." step6_1: "So, what is this place?" step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"." diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml index ced0d67b7e..3f8a4b7b9c 100644 --- a/locales/sk-SK.yml +++ b/locales/sk-SK.yml @@ -1174,27 +1174,6 @@ _time: minute: "min" hour: "hod" day: "dní" -_tutorial: - title: "How to use Calckey" - step1_1: "Welcome!" - step1_2: "Let's get you set up. You'll be up and running in no time!" - step2_1: "First, please fill out your profile." - step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you." - step3_1: "Now time to follow some people!" - step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them." - step4_1: "Let's get you out there." - step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\"" - step5_1: "Timelines, timelines everywhere!" - step5_2: "Your instance has {timelines} different timelines enabled." - step5_3: "The Home {icon} timeline is where you can see posts from your followers." - step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance." - step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend." - step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers." - step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance." - step6_1: "So, what is this place?" - step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"." - step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time." - step6_4: "Now go, explore, and have fun!" _2fa: alreadyRegistered: "Už ste zaregistrovali 2-faktorové autentifikačné zariadenie." registerDevice: "Registrovať nové zariadenie" diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml index 4f38b80c84..48ef4e3234 100644 --- a/locales/vi-VN.yml +++ b/locales/vi-VN.yml @@ -1179,27 +1179,6 @@ _time: minute: "phút" hour: "giờ" day: "ngày" -_tutorial: - title: "How to use Calckey" - step1_1: "Welcome!" - step1_2: "Let's get you set up. You'll be up and running in no time!" - step2_1: "First, please fill out your profile." - step2_2: "Providing some information about who you are will make it easier for others to tell if they want to see your notes or follow you." - step3_1: "Now time to follow some people!" - step3_2: "Your home and social timelines are based off of who you follow, so try following a couple accounts to get started.\nClick the plus circle on the top right of a profile to follow them." - step4_1: "Let's get you out there." - step4_2: "For your first post, some people like to made a {introduction} post or a simple \"Hello world!\"" - step5_1: "Timelines, timelines everywhere!" - step5_2: "Your instance has {timelines} different timelines enabled." - step5_3: "The Home {icon} timeline is where you can see posts from your followers." - step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this instance." - step5_5: "The Recommended {icon} timeline is where you can see posts from instances the admins recommend." - step5_6: "The Social {icon} timeline is where you can see posts from friends of your followers." - step5_7: "The Global {icon} timeline is where you can see posts from every other connected instance." - step6_1: "So, what is this place?" - step6_2: "Well, you didn't just join Calckey. You joined a portal to the Fediverse, an interconnected network of thousands of servers, called \"instances\"." - step6_3: "Each server works in different ways, and not all servers run Calckey. This one does though! It's a bit complicated, but you'll get the hang of it in no time." - step6_4: "Now go, explore, and have fun!" _2fa: alreadyRegistered: "Bạn đã đăng ký thiết bị xác minh 2 bước." registerDevice: "Đăng ký một thiết bị" diff --git a/packages/backend/src/remote/activitypub/misc/ld-signature.ts b/packages/backend/src/remote/activitypub/misc/ld-signature.ts index 0a4ec3a539..1657597ab6 100644 --- a/packages/backend/src/remote/activitypub/misc/ld-signature.ts +++ b/packages/backend/src/remote/activitypub/misc/ld-signature.ts @@ -70,13 +70,13 @@ export class LdSignature { ...options, "@context": "https://w3id.org/identity/v1", }; - transformedOptions["type"] = undefined; - transformedOptions["id"] = undefined; - transformedOptions["signatureValue"] = undefined; + delete transformedOptions["type"]; + delete transformedOptions["id"]; + delete transformedOptions["signatureValue"]; const canonizedOptions = await this.normalize(transformedOptions); const optionsHash = this.sha256(canonizedOptions); const transformedData = { ...data }; - transformedData["signature"] = undefined; + delete transformedData["signature"]; const cannonidedData = await this.normalize(transformedData); if (this.debug) console.debug(`cannonidedData: ${cannonidedData}`); const documentHash = this.sha256(cannonidedData); diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue index 5df37c9584..1e18b7aa67 100644 --- a/packages/client/src/pages/settings/general.vue +++ b/packages/client/src/pages/settings/general.vue @@ -20,6 +20,12 @@ + + + + + + {{ i18n.ts.showFixedPostForm }} @@ -127,6 +133,7 @@ async function reloadAsk() { } const overridedDeviceKind = computed(defaultStore.makeGetterSetter('overridedDeviceKind')); +const showLocalPostsInTimeline = computed(defaultStore.makeGetterSetter('showLocalPostsInTimeline')); const serverDisconnectedBehavior = computed(defaultStore.makeGetterSetter('serverDisconnectedBehavior')); const reduceAnimation = computed(defaultStore.makeGetterSetter('animation', v => !v, v => !v)); const useBlurEffectForModal = computed(defaultStore.makeGetterSetter('useBlurEffectForModal')); @@ -183,6 +190,7 @@ watch([ showGapBetweenNotesInTimeline, instanceTicker, overridedDeviceKind, + showLocalPostsInTimeline, showAds, showUpdates, swipeOnDesktop, diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue index 9340b4440c..62ad029f30 100644 --- a/packages/client/src/pages/settings/preferences-backups.vue +++ b/packages/client/src/pages/settings/preferences-backups.vue @@ -55,6 +55,7 @@ const defaultStoreSaveKeys: (keyof typeof defaultStore['state'])[] = [ 'widgets', 'tl', 'overridedDeviceKind', + 'showLocalPostsInTimeline', 'serverDisconnectedBehavior', 'nsfw', 'showAds', diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue index a3d272e4de..5a5e51ec61 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -94,17 +94,27 @@ const keymap = { t: focus, }; -let timelines = ['home']; +let timelines = []; + +if (isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home') { + timelines.push('social'); +} else { + timelines.push('home'); +} if (isLocalTimelineAvailable) { timelines.push('local'); } + +if (isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home') { + timelines.push('home'); +} else if (isLocalTimelineAvailable) { + timelines.push('social'); +} + if (isRecommendedTimelineAvailable) { timelines.push('recommended'); } -if (isLocalTimelineAvailable) { - timelines.push('social'); -} if (isGlobalTimelineAvailable) { timelines.push('global'); } @@ -220,13 +230,26 @@ const headerActions = $computed(() => [ }*/, ]); +// Swap home timeline with social's functionality + const headerTabs = $computed(() => [ - { - key: 'home', - title: i18n.ts._timelines.home, - icon: 'ph-house ph-bold ph-lg', - iconOnly: true, - }, + ...(isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home' + ? [ + { + key: 'social', + title: i18n.ts._timelines.home, + icon: 'ph-house ph-bold ph-lg', + iconOnly: true, + }, + ] + : [ + { + key: 'home', + title: i18n.ts._timelines.home, + icon: 'ph-house ph-bold ph-lg', + iconOnly: true, + } + ]), ...(isLocalTimelineAvailable ? [ { @@ -237,6 +260,24 @@ const headerTabs = $computed(() => [ }, ] : []), + ...(isLocalTimelineAvailable && defaultStore.state.showLocalPostsInTimeline === 'home' + ? [ + { + key: 'home', + title: i18n.ts._timelines.social, + icon: 'ph-handshake ph-bold ph-lg', + iconOnly: true, + }, + ] + : isLocalTimelineAvailable ? [ + { + key: 'social', + title: i18n.ts._timelines.social, + icon: 'ph-handshake ph-bold ph-lg', + iconOnly: true, + }, + ] + : []), ...(isRecommendedTimelineAvailable ? [ { @@ -247,16 +288,6 @@ const headerTabs = $computed(() => [ }, ] : []), - ...(isLocalTimelineAvailable - ? [ - { - key: 'social', - title: i18n.ts._timelines.social, - icon: 'ph-handshake ph-bold ph-lg', - iconOnly: true, - }, - ] - : []), ...(isGlobalTimelineAvailable ? [ { @@ -275,13 +306,17 @@ definePageMetadata( icon: src === 'local' ? 'ph-users ph-bold ph-lg' - : src === 'social' - ? 'ph-handshake ph-bold ph-lg' - : src === 'recommended' - ? 'ph-thumbs-up ph-bold ph-lg' - : src === 'global' - ? 'ph-planet ph-bold ph-lg' - : 'ph-house ph-bold ph-lg', + : src === 'social' && defaultStore.state.showLocalPostsInTimeline === 'home' + ? 'ph-house ph-bold ph-lg' + : src === 'social' + ? 'ph-handshake ph-bold ph-lg' + : src === 'recommended' + ? 'ph-thumbs-up ph-bold ph-lg' + : src === 'global' + ? 'ph-planet ph-bold ph-lg' + : src === 'home' && defaultStore.state.showLocalPostsInTimeline === 'home' + ? 'ph-handshake ph-bold ph-lg' + : 'ph-house ph-bold ph-lg', })), ); diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts index 0e23ae1b7e..6c0398ac40 100644 --- a/packages/client/src/store.ts +++ b/packages/client/src/store.ts @@ -133,6 +133,10 @@ export const defaultStore = markRaw( where: "device", default: null as null | "smartphone" | "tablet" | "desktop", }, + showLocalPostsInTimeline: { + where: "device", + default: "home" as "home" | "social", + }, serverDisconnectedBehavior: { where: "device", default: "nothing" as "nothing" | "quiet" | "reload" | "dialog",