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

chore: formatting

This commit is contained in:
Kainoa Kanter 2023-05-12 20:11:41 -07:00
parent 26aa19c9cc
commit 8877598799
11 changed files with 1101 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/backend/migration/1683682889948-PreventAiLearning.js
View File

@ -1,11 +1,15 @@
export class PreventAiLearning1683682889948 {
name = 'PreventAiLearning1683682889948'
name = "PreventAiLearning1683682889948";
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "user_profile" ADD "preventAiLearning" boolean NOT NULL DEFAULT true`);
}
async up(queryRunner) {
await queryRunner.query(
`ALTER TABLE "user_profile" ADD "preventAiLearning" boolean NOT NULL DEFAULT true`,
);
}
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "preventAiLearning"`);
}
async down(queryRunner) {
await queryRunner.query(
`ALTER TABLE "user_profile" DROP COLUMN "preventAiLearning"`,
);
}
}

3
packages/backend/src/server/api/endpoints/i/update.ts
View File

@ -192,7 +192,8 @@ export default define(meta, paramDef, async (ps, _user, token) => {
if (typeof ps.autoAcceptFollowed === "boolean")
profileUpdates.autoAcceptFollowed = ps.autoAcceptFollowed;
if (typeof ps.noCrawle === "boolean") profileUpdates.noCrawle = ps.noCrawle;
if (typeof ps.preventAiLearning === "boolean") profileUpdates.preventAiLearning = ps.preventAiLearning;
if (typeof ps.preventAiLearning === "boolean")
profileUpdates.preventAiLearning = ps.preventAiLearning;
if (typeof ps.isCat === "boolean") updates.isCat = ps.isCat;
if (typeof ps.speakAsCat === "boolean") updates.speakAsCat = ps.speakAsCat;
if (typeof ps.injectFeaturedNote === "boolean")

1445
packages/backend/test/e2e/users.ts
View File

File diff suppressed because it is too large Load Diff

14
packages/client/src/components/MkFolder.vue
View File

@ -146,8 +146,18 @@ export default defineComponent({
backdrop-filter: var(--blur, blur(20px));
margin-inline: -12px;
padding-inline: 12px;
mask: linear-gradient(to right, transparent, black 12px calc(100% - 12px), transparent);
-webkit-mask: linear-gradient(to right, transparent, black 12px calc(100% - 12px), transparent);
mask: linear-gradient(
to right,
transparent,
black 12px calc(100% - 12px),
transparent
);
-webkit-mask: linear-gradient(
to right,
transparent,
black 12px calc(100% - 12px),
transparent
);
> .title {
margin: 0;

13
packages/client/src/components/MkSubNoteContent.vue
View File

@ -33,7 +33,12 @@
<div class="wrmlmaau">
<div
class="content"
:class="{ collapsed, isLong, showContent: note.cw && !showContent, disableAnim: disableMfm }"
:class="{
collapsed,
isLong,
showContent: note.cw && !showContent,
disableAnim: disableMfm,
}"
>
<XCwButton
ref="cwButton"
@ -179,7 +184,9 @@ const urls = props.note.text
let showContent = $ref(false);
const mfms = props.note.text ? extractMfmWithAnimation(mfm.parse(props.note.text)) : null;
const mfms = props.note.text
? extractMfmWithAnimation(mfm.parse(props.note.text))
: null;
const hasMfm = $ref(mfms.length > 0);
@ -193,7 +200,7 @@ async function toggleMfm() {
text: i18n.ts._mfm.warn,
});
if (canceled) return;
defaultStore.set("animatedMfmWarnShown", true);
}

4
packages/client/src/components/MkTutorialDialog.vue
View File

@ -49,7 +49,7 @@
</h2>
<h3>{{ i18n.ts._tutorial.step1_1 }}</h3>
<div>{{ i18n.ts._tutorial.step1_2 }}</div>
<!-- TODO: move to new slide -->
<!-- TODO: move to own slide -->
<!-- <FormSwitch v-model="autoplayMfm" class="_formBlock">
{{ i18n.ts._mfm.alwaysPlay }}
<template #caption>
@ -191,7 +191,7 @@
primary
show-only-to-register
/>
</div>
</section>
</Transition>
</div>
</div>

7
packages/client/src/components/global/MkPageHeader.vue
View File

@ -14,9 +14,7 @@
@touchstart="preventDrag"
v-tooltip.noDelay="i18n.ts.goBack"
>
<i
class="ph-caret-left ph-bold ph-lg"
></i>
<i class="ph-caret-left ph-bold ph-lg"></i>
</button>
<div v-if="narrow" class="buttons left" @click="openAccountMenu">
<MkAvatar
@ -382,7 +380,8 @@ onUnmounted(() => {
display: none;
}
> .button/*, @at-root .backButton*/ { /* I don't know how to get this to work */
> .button/*, @at-root .backButton*/ {
/* I don't know how to get this to work */
display: flex;
align-items: center;
justify-content: center;

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

@ -95,7 +95,10 @@
<FormSwitch v-model="autoplayMfm" class="_formBlock">
{{ i18n.ts._mfm.alwaysPlay }}
<template #caption>
<i class="ph-warning ph-bold ph-lg" style="color: var(--warn)"></i>
<i
class="ph-warning ph-bold ph-lg"
style="color: var(--warn)"
></i>
{{ i18n.ts._mfm.warn }}
</template>
</FormSwitch>

7
packages/client/src/pages/settings/privacy.vue
View File

@ -61,8 +61,11 @@
<template #caption>{{ i18n.ts.noCrawleDescription }}</template>
</FormSwitch>
<FormSwitch v-model="preventAiLearning" @update:model-value="save()">
{{ i18n.ts.preventAiLearning }}<span class="_beta">{{ i18n.ts.beta }}</span>
<template #caption>{{ i18n.ts.preventAiLearningDescription }}</template>
{{ i18n.ts.preventAiLearning
}}<span class="_beta">{{ i18n.ts.beta }}</span>
<template #caption>{{
i18n.ts.preventAiLearningDescription
}}</template>
</FormSwitch>
<FormSwitch
v-model="isExplorable"

19
packages/client/src/scripts/extract-mfm.ts
View File

@ -1,14 +1,19 @@
import * as mfm from "mfm-js";
const animatedMfm = ["tada", "jelly", "twitch", "shake", "spin", "jump", "bounce", "rainbow"];
const animatedMfm = [
"tada",
"jelly",
"twitch",
"shake",
"spin",
"jump",
"bounce",
"rainbow",
];
export function extractMfmWithAnimation(
nodes: mfm.MfmNode[],
): string[] {
export function extractMfmWithAnimation(nodes: mfm.MfmNode[]): string[] {
const mfmNodes = mfm.extract(nodes, (node) => {
return (
node.type === "fn" && animatedMfm.indexOf(node.props.name) > -1
);
return node.type === "fn" && animatedMfm.indexOf(node.props.name) > -1;
});
const mfms = mfmNodes.map((x) => x.props.fn);

19
packages/client/src/ui/classic.vue
View File

@ -13,7 +13,7 @@
class="columns"
:class="{ fullView, withGlobalHeader: showMenuOnTop }"
>
<XSidebar v-if="!showMenuOnTop"/>
<XSidebar v-if="!showMenuOnTop" />
<div v-else ref="widgetsLeft" class="widgets left">
<XWidgets
:place="'left'"
@ -243,7 +243,8 @@ onMounted(() => {
background: var(--acrylicBg) !important;
backdrop-filter: blur(12px);
}
:deep(.tl), :deep(.notes) {
:deep(.tl),
:deep(.notes) {
background: none !important;
}
}
@ -279,7 +280,9 @@ onMounted(() => {
box-sizing: content-box;
.banner {
pointer-events: none;
mask: radial-gradient(farthest-side at top, hsl(0, 0%, 0%) 0%,
mask: radial-gradient(
farthest-side at top,
hsl(0, 0%, 0%) 0%,
hsla(0, 0%, 0%, 0.987) 0.3%,
hsla(0, 0%, 0%, 0.951) 1.4%,
hsla(0, 0%, 0%, 0.896) 3.2%,
@ -294,8 +297,11 @@ onMounted(() => {
hsla(0, 0%, 0%, 0.104) 60.8%,
hsla(0, 0%, 0%, 0.049) 72.6%,
hsla(0, 0%, 0%, 0.013) 85.7%,
hsla(0, 0%, 0%, 0) 100%) !important;
-webkit-mask: radial-gradient(farthest-side at top, hsl(0, 0%, 0%) 0%,
hsla(0, 0%, 0%, 0) 100%
) !important;
-webkit-mask: radial-gradient(
farthest-side at top,
hsl(0, 0%, 0%) 0%,
hsla(0, 0%, 0%, 0.987) 0.3%,
hsla(0, 0%, 0%, 0.951) 1.4%,
hsla(0, 0%, 0%, 0.896) 3.2%,
@ -310,7 +316,8 @@ onMounted(() => {
hsla(0, 0%, 0%, 0.104) 60.8%,
hsla(0, 0%, 0%, 0.049) 72.6%,
hsla(0, 0%, 0%, 0.013) 85.7%,
hsla(0, 0%, 0%, 0) 100%) !important;
hsla(0, 0%, 0%, 0) 100%
) !important;
width: 125% !important;
left: -12.5% !important;
height: 125% !important;