natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: formatting

This commit is contained in:
ThatOneCalculator 2023-06-08 11:01:00 -07:00
parent 1186969ee6
commit 5769bdcc69
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
5 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/package.json
View File

@ -15,10 +15,10 @@
"check:connect": "node ./check_connect.js", "check:connect": "node ./check_connect.js",
"build": "pnpm swc src -d built -D", "build": "pnpm swc src -d built -D",
"watch": "pnpm swc src -d built -D -w", "watch": "pnpm swc src -d built -D -w",
"lint": "pnpm rome check \"src/**/*.ts\"", "lint": "pnpm rome check --apply *",
"mocha": "cross-env NODE_ENV=test TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" mocha", "mocha": "cross-env NODE_ENV=test TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" mocha",
"test": "pnpm run mocha", "test": "pnpm run mocha",
"format": "pnpm rome format * --write && pnpm rome check --apply *" "format": "pnpm rome format * --write"
}, },
"resolutions": { "resolutions": {
"chokidar": "^3.3.1" "chokidar": "^3.3.1"

4
packages/backend/src/misc/fetch-meta.ts
View File

@ -3,7 +3,7 @@ import { Meta } from "@/models/entities/meta.js";
let cache: Meta; let cache: Meta;
export function metaToPugArgs(meta: Meta) : object { export function metaToPugArgs(meta: Meta): object {
let motd = ["Loading..."]; let motd = ["Loading..."];
if (meta.customMOTD.length > 0) { if (meta.customMOTD.length > 0) {
motd = meta.customMOTD; motd = meta.customMOTD;
@ -26,7 +26,7 @@ export function metaToPugArgs(meta: Meta) : object {
themeColor: meta.themeColor, themeColor: meta.themeColor,
randomMOTD: motd[Math.floor(Math.random() * motd.length)], randomMOTD: motd[Math.floor(Math.random() * motd.length)],
privateMode: meta.privateMode, privateMode: meta.privateMode,
} };
} }
export async function fetchMeta(noCache = false): Promise<Meta> { export async function fetchMeta(noCache = false): Promise<Meta> {

14
packages/backend/src/server/web/index.ts
View File

@ -367,7 +367,7 @@ const userPage: Router.Middleware = async (ctx, next) => {
profile, profile,
me, me,
avatarUrl: await Users.getAvatarUrl(user), avatarUrl: await Users.getAvatarUrl(user),
sub: subParam sub: subParam,
}; };
await ctx.render("user", userDetail); await ctx.render("user", userDetail);
@ -446,7 +446,7 @@ router.get("/posts/:note", async (ctx, next) => {
await Users.findOneByOrFail({ id: note.userId }), await Users.findOneByOrFail({ id: note.userId }),
), ),
// TODO: Let locale changeable by instance setting // TODO: Let locale changeable by instance setting
summary: getNoteSummary(_note) summary: getNoteSummary(_note),
}); });
ctx.set("Cache-Control", "public, max-age=15"); ctx.set("Cache-Control", "public, max-age=15");
@ -482,7 +482,7 @@ router.get("/@:user/pages/:page", async (ctx, next) => {
profile, profile,
avatarUrl: await Users.getAvatarUrl( avatarUrl: await Users.getAvatarUrl(
await Users.findOneByOrFail({ id: page.userId }), await Users.findOneByOrFail({ id: page.userId }),
) ),
}); });
if (["public"].includes(page.visibility)) { if (["public"].includes(page.visibility)) {
@ -514,7 +514,7 @@ router.get("/clips/:clip", async (ctx, next) => {
profile, profile,
avatarUrl: await Users.getAvatarUrl( avatarUrl: await Users.getAvatarUrl(
await Users.findOneByOrFail({ id: clip.userId }), await Users.findOneByOrFail({ id: clip.userId }),
) ),
}); });
ctx.set("Cache-Control", "public, max-age=15"); ctx.set("Cache-Control", "public, max-age=15");
@ -539,7 +539,7 @@ router.get("/gallery/:post", async (ctx, next) => {
profile, profile,
avatarUrl: await Users.getAvatarUrl( avatarUrl: await Users.getAvatarUrl(
await Users.findOneByOrFail({ id: post.userId }), await Users.findOneByOrFail({ id: post.userId }),
) ),
}); });
ctx.set("Cache-Control", "public, max-age=15"); ctx.set("Cache-Control", "public, max-age=15");
@ -561,7 +561,7 @@ router.get("/channels/:channel", async (ctx, next) => {
const meta = await fetchMeta(); const meta = await fetchMeta();
await ctx.render("channel", { await ctx.render("channel", {
...metaToPugArgs(meta), ...metaToPugArgs(meta),
channel: _channel channel: _channel,
}); });
ctx.set("Cache-Control", "public, max-age=15"); ctx.set("Cache-Control", "public, max-age=15");
@ -614,7 +614,7 @@ router.get("(.*)", async (ctx) => {
const meta = await fetchMeta(); const meta = await fetchMeta();
await ctx.render("base", { await ctx.render("base", {
...metaToPugArgs(meta) ...metaToPugArgs(meta),
}); });
ctx.set("Cache-Control", "public, max-age=3"); ctx.set("Cache-Control", "public, max-age=3");
}); });

6
packages/client/src/components/MkMenu.vue
View File

@ -128,7 +128,11 @@
<button <button
v-else-if="!item.hidden" v-else-if="!item.hidden"
class="_button item" class="_button item"
:class="{ danger: item.danger, accent: item.accent, active: item.active }" :class="{
danger: item.danger,
accent: item.accent,
active: item.active,
}"
:disabled="item.active" :disabled="item.active"
@click="clicked(item.action, $event)" @click="clicked(item.action, $event)"
@mouseenter.passive="onItemMouseEnter(item)" @mouseenter.passive="onItemMouseEnter(item)"

5
packages/client/src/pages/messaging/messaging-room.message.vue
View File

@ -14,7 +14,10 @@
:title="i18n.ts.delete" :title="i18n.ts.delete"
@click="del" @click="del"
> >
<i style="color: var(--accentLighten)" class="ph-x-circle ph-fill ph-lg"></i> <i
style="color: var(--accentLighten)"
class="ph-x-circle ph-fill ph-lg"
></i>
</button> </button>
<div v-if="!message.isDeleted" class="content"> <div v-if="!message.isDeleted" class="content">
<Mfm <Mfm