Skip to content

Commit 8f0e59d

Browse files
committed
undo the formattin i don like,,,
1 parent d19854a commit 8f0e59d

2 files changed

Lines changed: 100 additions & 206 deletions

File tree

src/lib/components/CategoryHome/MyFeed.svelte

Lines changed: 25 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,34 @@
66
import { Category, UserDisplay } from "PenguinMod-SvelteUI";
77
import Icon from "$lib/components/Icon/Component.svelte";
88
import LocalizedString from "$lib/components/Localization/LocalizedString.svelte";
9-
9+
1010
import { CACHE_USER_FEED } from "$lib/resources/cache/cache-time";
1111
import CacheHelper from "$lib/resources/cache/cache-helper";
1212
1313
import TranslationMapper from "$lib/resources/localization/translation/mapper";
1414
import PenguinModClient from "$lib/resources/penguinmod/client.js";
1515
import Locale from "$lib/resources/localization/locale";
16-
16+
1717
import StoreSettings from "$lib/stores/settings";
1818
import StoreSession from "$lib/stores/session";
19-
19+
2020
let props = $props();
2121
let loading = $state(false);
2222
let failed = $state(false);
2323
const loadingAttempt = async () => {
2424
// NOTE: We only actually ask the API if our own cache is expired (or doesnt exist, which is also counted as expired)
25-
if (!CacheHelper.isExpired("userFeedCachedTime", CACHE_USER_FEED))
26-
return;
25+
if (!CacheHelper.isExpired("userFeedCachedTime", CACHE_USER_FEED)) return;
2726
2827
const myFeed = await PenguinModClient.users.getMyFeed();
2928
CacheHelper.update({
3029
userFeedCachedData: myFeed,
3130
});
3231
};
3332
onMount(async () => {
34-
if (!$StoreSettings.loggedIn) return;
33+
if (!($StoreSettings.loggedIn)) return;
3534
if (loading) return; // TODO: remove these loading false then true then false things
3635
loading = true;
37-
36+
3837
try {
3938
await loadingAttempt();
4039
} catch (err) {
@@ -50,43 +49,19 @@
5049
switch (type) {
5150
// TODO: At some point we should stop including removed projects in the feed.
5251
case "follow":
53-
return TranslationMapper.mapCurrent(
54-
"feed.following",
55-
"$1 followed you",
56-
).replaceAll("$1", author);
52+
return TranslationMapper.mapCurrent("feed.following", "$1 followed you")
53+
.replaceAll("$1", author);
5754
case "upload":
58-
return TranslationMapper.mapCurrent(
59-
"feed.uploaded",
60-
"$1 uploaded $2",
61-
)
55+
return TranslationMapper.mapCurrent("feed.uploaded", "$1 uploaded $2")
6256
.replaceAll("$1", author)
63-
.replaceAll(
64-
"$2",
65-
content.name ||
66-
TranslationMapper.mapCurrent(
67-
"project.status.removed",
68-
"(removed)",
69-
),
70-
);
57+
.replaceAll("$2", content.name || TranslationMapper.mapCurrent("project.status.removed", "(removed)"));
7158
case "remix":
72-
return TranslationMapper.mapCurrent(
73-
"feed.remixed",
74-
"$1 remixed $2",
75-
)
59+
return TranslationMapper.mapCurrent("feed.remixed", "$1 remixed $2")
7660
.replaceAll("$1", author)
77-
.replaceAll(
78-
"$2",
79-
content.name ||
80-
TranslationMapper.mapCurrent(
81-
"project.status.removed",
82-
"(removed)",
83-
),
84-
);
61+
.replaceAll("$2", content.name || TranslationMapper.mapCurrent("project.status.removed", "(removed)"));
8562
case "posted":
86-
return TranslationMapper.mapCurrent(
87-
"feed.posted",
88-
"$1 made a post",
89-
).replaceAll("$1", author);
63+
return TranslationMapper.mapCurrent("feed.posted", "$1 made a post")
64+
.replaceAll("$1", author);
9065
}
9166
};
9267
const getFeedUrl = (type, author, content) => {
@@ -107,9 +82,12 @@
10782
<Category {...props}>
10883
<!-- My Feed Category -->
10984
{#snippet header()}
110-
<LocalizedString text="My Feed" key="home.sections.feed" />
85+
<LocalizedString
86+
text="My Feed"
87+
key="home.sections.feed"
88+
/>
11189
{/snippet}
112-
{#if !$StoreSettings.loggedIn}
90+
{#if !($StoreSettings.loggedIn)}
11391
<!-- NOTE: This state should never render, but we'll handle it nicely anyways -->
11492
<div class="category-textdisplay">
11593
<p>
@@ -143,27 +121,15 @@
143121
{#each $StoreSession.userFeedCachedData as feedItem}
144122
<!-- TODO: User display should allow 3 hrefs for the user pfp & bottom text (though we only need the image url to go elsewhere here) -->
145123
<UserDisplay
146-
src={PenguinModClient.users.getPfpUrl(
147-
feedItem.username,
148-
)}
149-
href={getFeedUrl(
150-
feedItem.type,
151-
feedItem.username,
152-
feedItem.data,
153-
)}
124+
src={PenguinModClient.users.getPfpUrl(feedItem.username)}
125+
href={getFeedUrl(feedItem.type, feedItem.username, feedItem.data)}
154126
kind="detail"
155127
>
156128
{#snippet textTop()}
157-
{getFeedText(
158-
feedItem.type,
159-
feedItem.username,
160-
feedItem.data,
161-
)}
129+
{getFeedText(feedItem.type, feedItem.username, feedItem.data)}
162130
{/snippet}
163131
{#snippet textBottom()}
164-
{Locale.timestampToDateWithTime(
165-
Number(new Date(feedItem.date)),
166-
)}
132+
{Locale.timestampToDateWithTime(Number(new Date(feedItem.date)))}
167133
{/snippet}
168134
</UserDisplay>
169135
{:else}
@@ -207,11 +173,10 @@
207173
overflow: hidden;
208174
overflow-y: auto;
209175
}
210-
.category-feed :global(div[data-penguinmodsvelteui-userdisplay="true"]) {
176+
.category-feed :global(div[data-penguinmodsvelteui-userdisplay=true]) {
211177
margin-bottom: 4px;
212178
}
213-
.category-feed
214-
:global(div[data-penguinmodsvelteui-userdisplay="true"]:last-child) {
179+
.category-feed :global(div[data-penguinmodsvelteui-userdisplay=true]:last-child) {
215180
margin-bottom: 0;
216181
}
217182
</style>

0 commit comments

Comments
 (0)