161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-22 04:03:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "feat: swap home timeline with social's functionality (#9597)"

Browse Source 
This reverts commit df68d5ffff72bd960d2fcf33562da5e38a18fb3b.
This commit is contained in:
Kainoa Kanter 2023-05-14 15:18:18 -07:00
parent 808008bbc8
commit 7d8c0798e5
9 changed files with 117 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
locales/ar-SA.yml
View File

@ -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: "سجّل جهازًا جديدًا"

21
locales/bn-BD.yml
View File

@ -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: "নতুন ডিভাইস নিবন্ধন করুন"

10
locales/en-US.yml
View File

@ -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\

21
locales/sk-SK.yml
View File

@ -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"

21
locales/vi-VN.yml
View File

@ -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ị"

5
packages/client/src/pages/settings/general.vue
View File

@ -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();

1
packages/client/src/pages/settings/preferences-backups.vue
View File

@ -81,7 +81,6 @@ const defaultStoreSaveKeys: (keyof (typeof defaultStore)["state"])[] = [
"widgets",
"tl",
"overridedDeviceKind",
"showLocalPostsInTimeline",
"serverDisconnectedBehavior",
"nsfw",
"showAds",

106
packages/client/src/pages/timeline.vue
View File

@ -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;

4
packages/client/src/store.ts
View File

@ -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",