Mirrors/phanpy
1
0
Fork 0
mirror of https://github.com/cheeaun/phanpy.git synced 2025-02-02 06:06:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Include Prettier & format everything properly

Browse source 
My bad for not including prettier
This commit is contained in:
Lim Chee Aun 2024-12-04 14:47:15 +08:00
parent 4c0bfc332c
commit e652ce8d9b
16 changed files with 145 additions and 138 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
package-lock.json generated
View file

@ -58,6 +58,7 @@
"postcss": "~8.4.49", "postcss": "~8.4.49",
"postcss-dark-theme-class": "~1.3.0", "postcss-dark-theme-class": "~1.3.0",
"postcss-preset-env": "~10.1.1", "postcss-preset-env": "~10.1.1",
"prettier": "3.4.1",
"sonda": "~0.6.1", "sonda": "~0.6.1",
"twitter-text": "~3.1.0", "twitter-text": "~3.1.0",
"vite": "~5.4.11", "vite": "~5.4.11",
@ -8406,17 +8407,15 @@
} }
}, },
"node_modules/prettier": { "node_modules/prettier": {
"version": "2.8.0", "version": "3.4.1",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.0.tgz", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.1.tgz",
"integrity": "sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==", "integrity": "sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==",
"dev": true, "dev": true,
"license": "MIT",
"peer": true,
"bin": { "bin": {
"prettier": "bin-prettier.js" "prettier": "bin/prettier.cjs"
}, },
"engines": { "engines": {
"node": ">=10.13.0" "node": ">=14"
}, },
"funding": { "funding": {
"url": "https://github.com/prettier/prettier?sponsor=1" "url": "https://github.com/prettier/prettier?sponsor=1"

1
package.json
View file

@ -66,6 +66,7 @@
"postcss": "~8.4.49", "postcss": "~8.4.49",
"postcss-dark-theme-class": "~1.3.0", "postcss-dark-theme-class": "~1.3.0",
"postcss-preset-env": "~10.1.1", "postcss-preset-env": "~10.1.1",
"prettier": "3.4.1",
"sonda": "~0.6.1", "sonda": "~0.6.1",
"twitter-text": "~3.1.0", "twitter-text": "~3.1.0",
"vite": "~5.4.11", "vite": "~5.4.11",

9
src/app.jsx
View file

@ -27,6 +27,7 @@ import SearchCommand from './components/search-command';
import Shortcuts from './components/shortcuts'; import Shortcuts from './components/shortcuts';
import NotFound from './pages/404'; import NotFound from './pages/404';
import AccountStatuses from './pages/account-statuses'; import AccountStatuses from './pages/account-statuses';
import AnnualReport from './pages/annual-report';
import Bookmarks from './pages/bookmarks'; import Bookmarks from './pages/bookmarks';
import Catchup from './pages/catchup'; import Catchup from './pages/catchup';
import Favourites from './pages/favourites'; import Favourites from './pages/favourites';
@ -46,7 +47,6 @@ import Search from './pages/search';
import StatusRoute from './pages/status-route'; import StatusRoute from './pages/status-route';
import Trending from './pages/trending'; import Trending from './pages/trending';
import Welcome from './pages/welcome'; import Welcome from './pages/welcome';
import AnnualReport from './pages/annual-report';
import { import {
api, api,
hasInstance, hasInstance,
@ -99,7 +99,8 @@ window.__STATES_STATS__ = () => {
// Experimental "garbage collection" for states // Experimental "garbage collection" for states
// Every 15 minutes // Every 15 minutes
// Only posts for now // Only posts for now
setInterval(() => { setInterval(
() => {
if (!window.__IDLE__) return; if (!window.__IDLE__) return;
const { statuses, unfurledLinks, notifications } = states; const { statuses, unfurledLinks, notifications } = states;
let keysCount = 0; let keysCount = 0;
@ -131,7 +132,9 @@ setInterval(() => {
if (keysCount) { if (keysCount) {
console.info(`GC: Removed ${keysCount} keys`); console.info(`GC: Removed ${keysCount} keys`);
} }
}, 15 * 60 * 1000); },
15 * 60 * 1000,
);
// Preload icons // Preload icons
// There's probably a better way to do this // There's probably a better way to do this

8
src/components/notification.jsx
View file

@ -261,9 +261,7 @@ const contentText = {
), ),
emoji_reaction: emojiText, emoji_reaction: emojiText,
'pleroma:emoji_reaction': emojiText, 'pleroma:emoji_reaction': emojiText,
annual_report: ({ year }) => ( annual_report: ({ year }) => <Trans>Your {year} #Wrapstodon is here!</Trans>,
<Trans>Your {year} #Wrapstodon is here!</Trans>
),
}; };
// account_suspension, domain_block, user_domain_block // account_suspension, domain_block, user_domain_block
@ -537,7 +535,9 @@ function Notification({
)} )}
{type === 'annual_report' && ( {type === 'annual_report' && (
<div> <div>
<Link to={`/annual_report/${annualReport?.year}`}><Trans>View #Wrapstodon</Trans></Link> <Link to={`/annual_report/${annualReport?.year}`}>
<Trans>View #Wrapstodon</Trans>
</Link>
</div> </div>
)} )}
</> </>

42
src/locales/en.po generated
View file

@ -963,7 +963,7 @@ msgid "Nothing to show"
msgstr "" msgstr ""
#: src/components/generic-accounts.jsx:145 #: src/components/generic-accounts.jsx:145
#: src/components/notification.jsx:446 #: src/components/notification.jsx:444
#: src/pages/accounts.jsx:41 #: src/pages/accounts.jsx:41
#: src/pages/search.jsx:317 #: src/pages/search.jsx:317
#: src/pages/search.jsx:350 #: src/pages/search.jsx:350
@ -1472,78 +1472,78 @@ msgstr ""
msgid "Moderation warning" msgid "Moderation warning"
msgstr "" msgstr ""
#: src/components/notification.jsx:265 #: src/components/notification.jsx:264
msgid "Your {year} #Wrapstodon is here!" msgid "Your {year} #Wrapstodon is here!"
msgstr "Your {year} #Wrapstodon is here!" msgstr "Your {year} #Wrapstodon is here!"
#: src/components/notification.jsx:272 #: src/components/notification.jsx:270
msgid "An admin from <0>{from}</0> has suspended <1>{targetName}</1>, which means you can no longer receive updates from them or interact with them." msgid "An admin from <0>{from}</0> has suspended <1>{targetName}</1>, which means you can no longer receive updates from them or interact with them."
msgstr "" msgstr ""
#: src/components/notification.jsx:278 #: src/components/notification.jsx:276
msgid "An admin from <0>{from}</0> has blocked <1>{targetName}</1>. Affected followers: {followersCount}, followings: {followingCount}." msgid "An admin from <0>{from}</0> has blocked <1>{targetName}</1>. Affected followers: {followersCount}, followings: {followingCount}."
msgstr "" msgstr ""
#: src/components/notification.jsx:284 #: src/components/notification.jsx:282
msgid "You have blocked <0>{targetName}</0>. Removed followers: {followersCount}, followings: {followingCount}." msgid "You have blocked <0>{targetName}</0>. Removed followers: {followersCount}, followings: {followingCount}."
msgstr "" msgstr ""
#: src/components/notification.jsx:292 #: src/components/notification.jsx:290
msgid "Your account has received a moderation warning." msgid "Your account has received a moderation warning."
msgstr "" msgstr ""
#: src/components/notification.jsx:293 #: src/components/notification.jsx:291
msgid "Your account has been disabled." msgid "Your account has been disabled."
msgstr "" msgstr ""
#: src/components/notification.jsx:294 #: src/components/notification.jsx:292
msgid "Some of your posts have been marked as sensitive." msgid "Some of your posts have been marked as sensitive."
msgstr "" msgstr ""
#: src/components/notification.jsx:295 #: src/components/notification.jsx:293
msgid "Some of your posts have been deleted." msgid "Some of your posts have been deleted."
msgstr "" msgstr ""
#: src/components/notification.jsx:296 #: src/components/notification.jsx:294
msgid "Your posts will be marked as sensitive from now on." msgid "Your posts will be marked as sensitive from now on."
msgstr "" msgstr ""
#: src/components/notification.jsx:297 #: src/components/notification.jsx:295
msgid "Your account has been limited." msgid "Your account has been limited."
msgstr "" msgstr ""
#: src/components/notification.jsx:298 #: src/components/notification.jsx:296
msgid "Your account has been suspended." msgid "Your account has been suspended."
msgstr "" msgstr ""
#: src/components/notification.jsx:373 #: src/components/notification.jsx:371
msgid "[Unknown notification type: {type}]" msgid "[Unknown notification type: {type}]"
msgstr "" msgstr ""
#: src/components/notification.jsx:442 #: src/components/notification.jsx:440
#: src/components/status.jsx:1036 #: src/components/status.jsx:1036
#: src/components/status.jsx:1046 #: src/components/status.jsx:1046
msgid "Boosted/Liked by…" msgid "Boosted/Liked by…"
msgstr "" msgstr ""
#: src/components/notification.jsx:443 #: src/components/notification.jsx:441
msgid "Liked by…" msgid "Liked by…"
msgstr "" msgstr ""
#: src/components/notification.jsx:444 #: src/components/notification.jsx:442
msgid "Boosted by…" msgid "Boosted by…"
msgstr "" msgstr ""
#: src/components/notification.jsx:445 #: src/components/notification.jsx:443
msgid "Followed by…" msgid "Followed by…"
msgstr "" msgstr ""
#: src/components/notification.jsx:516 #: src/components/notification.jsx:514
#: src/components/notification.jsx:532 #: src/components/notification.jsx:530
msgid "Learn more <0/>" msgid "Learn more <0/>"
msgstr "" msgstr ""
#: src/components/notification.jsx:540 #: src/components/notification.jsx:539
msgid "View #Wrapstodon" msgid "View #Wrapstodon"
msgstr "View #Wrapstodon" msgstr "View #Wrapstodon"
@ -2410,7 +2410,7 @@ msgid "Login required."
msgstr "Login required." msgstr "Login required."
#: src/compose.jsx:90 #: src/compose.jsx:90
#: src/pages/annual-report.jsx:132 #: src/pages/annual-report.jsx:136
#: src/pages/http-route.jsx:91 #: src/pages/http-route.jsx:91
#: src/pages/login.jsx:270 #: src/pages/login.jsx:270
msgid "Go home" msgid "Go home"

12
src/pages/annual-report.jsx
View file

@ -64,7 +64,8 @@ export default function AnnualReport() {
<tr> <tr>
{Object.entries(item).map(([k, value]) => ( {Object.entries(item).map(([k, value]) => (
<td> <td>
{value && /(accountId)/i.test(k) && {value &&
/(accountId)/i.test(k) &&
/^(mostRebloggedAccounts|commonlyInteractedWithAccounts)$/i.test( /^(mostRebloggedAccounts|commonlyInteractedWithAccounts)$/i.test(
key, key,
) ? ( ) ? (
@ -90,14 +91,17 @@ export default function AnnualReport() {
<> <>
<dt>{k}</dt> <dt>{k}</dt>
<dd> <dd>
{value && {value && (
<Link to={`/${instance}/s/${value}`}> <Link to={`/${instance}/s/${value}`}>
<Status <Status
status={statuses?.find((s) => s.id === value)} status={statuses?.find(
(s) => s.id === value,
)}
size="s" size="s"
readOnly readOnly
/> />
</Link>} </Link>
)}
</dd> </dd>
</> </>
))} ))}

2
src/utils/enhance-content.js
View file

@ -13,7 +13,7 @@ function escapeHTML(html) {
'&': '&amp;', '&': '&amp;',
'<': '&lt;', '<': '&lt;',
'>': '&gt;', '>': '&gt;',
}[c]), })[c],
); );
} }

2
src/utils/status-peek.js
View file

@ -26,7 +26,7 @@ function statusPeek(status) {
video: '📹', video: '📹',
audio: '🎵', audio: '🎵',
unknown: '', unknown: '',
}[m.type] || ''), })[m.type] || '',
) )
.join(''); .join('');
} }