From 7d8c0798e585095b7fecf52dc3bf0d510c4a67d3 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Sun, 14 May 2023 15:18:18 -0700 Subject: [PATCH] Revert "feat: swap home timeline with social's functionality (#9597)" This reverts commit df68d5ffff72bd960d2fcf33562da5e38a18fb3b. --- locales/ar-SA.yml | 21 ++++ locales/bn-BD.yml | 21 ++++ locales/en-US.yml | 10 +- locales/sk-SK.yml | 21 ++++ locales/vi-VN.yml | 21 ++++ .../client/src/pages/settings/general.vue | 5 +- .../pages/settings/preferences-backups.vue | 1 - packages/client/src/pages/timeline.vue | 106 +++++------------- packages/client/src/store.ts | 4 - 9 files changed, 117 insertions(+), 93 deletions(-) diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml index 844cfb5d5..fc29623dd 100644 --- a/locales/ar-SA.yml +++ b/locales/ar-SA.yml @@ -1027,6 +1027,27 @@ _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 8a9358e2a..3ed6e53aa 100644 --- a/locales/bn-BD.yml +++ b/locales/bn-BD.yml @@ -1108,6 +1108,27 @@ _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 f62c9d72e..f63154786 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -939,9 +939,6 @@ 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" @@ -1436,13 +1433,10 @@ _tutorial: 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 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!" + \ you follow. step5_4: "The Local {icon} timeline is where you can see posts from everyone else\ \ on this instance." - step5_5: "The Social {icon} timeline is where you can see posts only from the accounts\ - \ you follow." + 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 instances\ \ the admins recommend." step5_7: "The Global {icon} timeline is where you can see posts from every other\ diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml index 3f8a4b7b9..ced0d67b7 100644 --- a/locales/sk-SK.yml +++ b/locales/sk-SK.yml @@ -1174,6 +1174,27 @@ _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 48ef4e323..4f38b80c8 100644 --- a/locales/vi-VN.yml +++ b/locales/vi-VN.yml @@ -1179,6 +1179,27 @@ _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/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue index fdee4a210..e84cb260a 100644 --- a/packages/client/src/pages/settings/general.vue +++ b/packages/client/src/pages/settings/general.vue @@ -247,9 +247,6 @@ async function reloadAsk() { const overridedDeviceKind = computed( defaultStore.makeGetterSetter("overridedDeviceKind") ); -const showLocalPostsInTimeline = computed( - defaultStore.makeGetterSetter("showLocalPostsInTimeline") -); const serverDisconnectedBehavior = computed( defaultStore.makeGetterSetter("serverDisconnectedBehavior") ); @@ -349,12 +346,12 @@ watch( showGapBetweenNotesInTimeline, instanceTicker, overridedDeviceKind, - showLocalPostsInTimeline, showAds, showUpdates, swipeOnDesktop, seperateRenoteQuote, showAdminUpdates, + autoplayMfm, ], async () => { await reloadAsk(); diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue index 81f68fad1..a5f606e0e 100644 --- a/packages/client/src/pages/settings/preferences-backups.vue +++ b/packages/client/src/pages/settings/preferences-backups.vue @@ -81,7 +81,6 @@ 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 6ab0fdda4..ba39c7ed3 100644 --- a/packages/client/src/pages/timeline.vue +++ b/packages/client/src/pages/timeline.vue @@ -99,33 +99,17 @@ const keymap = { t: focus, }; -let timelines = []; - -if ( - isLocalTimelineAvailable && - defaultStore.state.showLocalPostsInTimeline === "home" -) { - timelines.push("social"); -} else { - timelines.push("home"); -} +let timelines = ['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"); } @@ -249,27 +233,13 @@ const headerActions = $computed(() => [ }*/, ]); -// Swap home timeline with social's functionality - const headerTabs = $computed(() => [ - ...(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, - }, - ]), + { + key: 'home', + title: i18n.ts._timelines.home, + icon: 'ph-house ph-bold ph-lg', + iconOnly: true, + }, ...(isLocalTimelineAvailable ? [ { @@ -280,26 +250,6 @@ 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 ? [ { @@ -310,6 +260,16 @@ const headerTabs = $computed(() => [ }, ] : []), + ...(isLocalTimelineAvailable + ? [ + { + key: 'social', + title: i18n.ts._timelines.social, + icon: 'ph-handshake ph-bold ph-lg', + iconOnly: true, + }, + ] + : []), ...(isGlobalTimelineAvailable ? [ { @@ -326,22 +286,16 @@ definePageMetadata( computed(() => ({ title: i18n.ts.timeline, icon: - src === "local" - ? "ph-users 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", - })) + 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', + })), ); let swiperRef: any = null; diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts index adebb1c49..7043c88aa 100644 --- a/packages/client/src/store.ts +++ b/packages/client/src/store.ts @@ -134,10 +134,6 @@ 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",