e2net/iceshrimp-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Activity

chore: formatting

Browse source
This commit is contained in:
ThatOneCalculator 2023-05-25 19:47:10 -07:00
parent ceae7341d4
commit 911704d6a8
No known key found for this signature in database
GPG key ID: 8703CACD01000000
19 changed files with 96 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "calckey", "name": "calckey",
"version": "14.0.0-dev19", "version": "14.0.0-dev22",
"codename": "aqua", "codename": "aqua",
"repository": { "repository": {
"type": "git", "type": "git",

2
packages/backend/src/models/repositories/note.ts
View file

@ -240,7 +240,7 @@ export const NoteRepository = db.getRepository(Note).extend({
...(meId ...(meId
? { ? {
myReaction: populateMyReaction(note, meId, options?._hint_), myReaction: populateMyReaction(note, meId, options?._hint_),
} }
: {}), : {}),
...(opts.detail ...(opts.detail

33
packages/client/src/components/MkNote.vue
View file

@ -256,7 +256,6 @@ import { useNoteCapture } from "@/scripts/use-note-capture";
import { notePage } from "@/filters/note"; import { notePage } from "@/filters/note";
import { deepClone } from "@/scripts/clone"; import { deepClone } from "@/scripts/clone";
const router = useRouter(); const router = useRouter();
const props = defineProps<{ const props = defineProps<{
@ -401,13 +400,15 @@ function onContextmenu(ev: MouseEvent): void {
os.pageWindow(notePage(appearNote)); os.pageWindow(notePage(appearNote));
}, },
}, },
notePage(appearNote) != location.pathname ? { notePage(appearNote) != location.pathname
icon: "ph-arrows-out-simple ph-bold ph-lg", ? {
text: i18n.ts.showInPage, icon: "ph-arrows-out-simple ph-bold ph-lg",
action: () => { text: i18n.ts.showInPage,
router.push(notePage(appearNote), "forcePage"); action: () => {
}, router.push(notePage(appearNote), "forcePage");
} : undefined, },
}
: undefined,
null, null,
{ {
type: "a", type: "a",
@ -423,13 +424,15 @@ function onContextmenu(ev: MouseEvent): void {
copyToClipboard(`${url}${notePage(appearNote)}`); copyToClipboard(`${url}${notePage(appearNote)}`);
}, },
}, },
note.user.host != null ? { note.user.host != null
type: "a", ? {
icon: "ph-arrow-square-up-right ph-bold ph-lg", type: "a",
text: i18n.ts.showOnRemote, icon: "ph-arrow-square-up-right ph-bold ph-lg",
href: note.url ?? note.uri ?? "", text: i18n.ts.showOnRemote,
target: "_blank", href: note.url ?? note.uri ?? "",
} : undefined, target: "_blank",
}
: undefined,
], ],
ev ev
); );

2
packages/client/src/components/MkNoteDetailed.vue
View file

@ -627,7 +627,7 @@ onUnmounted(() => {
background: none; background: none;
} }
} }
&.max-width_450px { &.max-width_450px {
> .reply-to:first-child { > .reply-to:first-child {
padding-top: 14px; padding-top: 14px;

34
packages/client/src/components/MkNoteSub.vue
View file

@ -337,7 +337,7 @@ function onContextmenu(ev: MouseEvent): void {
} else { } else {
os.contextMenu( os.contextMenu(
[ [
{ {
type: "label", type: "label",
text: notePage(appearNote), text: notePage(appearNote),
}, },
@ -348,13 +348,15 @@ function onContextmenu(ev: MouseEvent): void {
os.pageWindow(notePage(appearNote)); os.pageWindow(notePage(appearNote));
}, },
}, },
notePage(appearNote) != location.pathname ? { notePage(appearNote) != location.pathname
icon: "ph-arrows-out-simple ph-bold ph-lg", ? {
text: i18n.ts.showInPage, icon: "ph-arrows-out-simple ph-bold ph-lg",
action: () => { text: i18n.ts.showInPage,
router.push(notePage(appearNote), "forcePage"); action: () => {
}, router.push(notePage(appearNote), "forcePage");
} : undefined, },
}
: undefined,
null, null,
{ {
type: "a", type: "a",
@ -370,13 +372,15 @@ function onContextmenu(ev: MouseEvent): void {
copyToClipboard(`${url}${notePage(appearNote)}`); copyToClipboard(`${url}${notePage(appearNote)}`);
}, },
}, },
note.user.host != null ? { note.user.host != null
type: "a", ? {
icon: "ph-arrow-square-up-right ph-bold ph-lg", type: "a",
text: i18n.ts.showOnRemote, icon: "ph-arrow-square-up-right ph-bold ph-lg",
href: note.url ?? note.uri ?? "", text: i18n.ts.showOnRemote,
target: "_blank", href: note.url ?? note.uri ?? "",
} : undefined, target: "_blank",
}
: undefined,
], ],
ev ev
); );

5
packages/client/src/pages/about.vue
View file

@ -7,7 +7,10 @@
:tabs="headerTabs" :tabs="headerTabs"
/></template> /></template>
<MkSpacer :content-max="600" :margin-min="20"> <MkSpacer :content-max="600" :margin-min="20">
<swiper :touch-angle="25" :threshold="10" :centeredSlides="true" <swiper
:touch-angle="25"
:threshold="10"
:centeredSlides="true"
:modules="[Virtual]" :modules="[Virtual]"
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"

5
packages/client/src/pages/admin-file.vue
View file

@ -7,7 +7,10 @@
:tabs="headerTabs" :tabs="headerTabs"
/></template> /></template>
<MkSpacer :content-max="600" :margin-min="16" :margin-max="32"> <MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
<swiper :touch-angle="25" :threshold="10" :centeredSlides="true" <swiper
:touch-angle="25"
:threshold="10"
:centeredSlides="true"
:modules="[Virtual]" :modules="[Virtual]"
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"

5
packages/client/src/pages/channels.vue
View file

@ -7,7 +7,10 @@
:tabs="headerTabs" :tabs="headerTabs"
/></template> /></template>
<MkSpacer :content-max="700"> <MkSpacer :content-max="700">
<swiper :touch-angle="25" :threshold="10" :centeredSlides="true" <swiper
:touch-angle="25"
:threshold="10"
:centeredSlides="true"
:modules="[Virtual]" :modules="[Virtual]"
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"

5
packages/client/src/pages/explore.vue
View file

@ -8,7 +8,10 @@
/></template> /></template>
<div class="lznhrdub"> <div class="lznhrdub">
<MkSpacer :content-max="1200"> <MkSpacer :content-max="1200">
<swiper :touch-angle="25" :threshold="10" :centeredSlides="true" <swiper
:touch-angle="25"
:threshold="10"
:centeredSlides="true"
:modules="[Virtual]" :modules="[Virtual]"
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"

5
packages/client/src/pages/gallery/index.vue
View file

@ -8,7 +8,10 @@
:display-back-button="true" :display-back-button="true"
/></template> /></template>
<MkSpacer :content-max="1200"> <MkSpacer :content-max="1200">
<swiper :touch-angle="25" :threshold="10" :centeredSlides="true" <swiper
:touch-angle="25"
:threshold="10"
:centeredSlides="true"
:modules="[Virtual]" :modules="[Virtual]"
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"

5
packages/client/src/pages/instance-info.vue
View file

@ -12,7 +12,10 @@
:margin-min="16" :margin-min="16"
:margin-max="32" :margin-max="32"
> >
<swiper :touch-angle="25" :threshold="10" :centeredSlides="true" <swiper
:touch-angle="25"
:threshold="10"
:centeredSlides="true"
:modules="[Virtual]" :modules="[Virtual]"
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"

5
packages/client/src/pages/messaging/index.vue
View file

@ -8,7 +8,10 @@
/></template> /></template>
<div> <div>
<MkSpacer :content-max="800"> <MkSpacer :content-max="800">
<swiper :touch-angle="25" :threshold="10" :centeredSlides="true" <swiper
:touch-angle="25"
:threshold="10"
:centeredSlides="true"
:modules="[Virtual]" :modules="[Virtual]"
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"

8
packages/client/src/pages/note.vue
View file

@ -162,12 +162,16 @@ definePageMetadata(
computed(() => computed(() =>
note note
? { ? {
title: i18n.t("noteOf", { user: note.user.name || note.user.username }), title: i18n.t("noteOf", {
user: note.user.name || note.user.username,
}),
subtitle: new Date(note.createdAt).toLocaleString(), subtitle: new Date(note.createdAt).toLocaleString(),
avatar: note.user, avatar: note.user,
path: `/notes/${note.id}`, path: `/notes/${note.id}`,
share: { share: {
title: i18n.t("noteOf", { user: note.user.name || note.user.username }), title: i18n.t("noteOf", {
user: note.user.name || note.user.username,
}),
text: note.text, text: note.text,
}, },
} }

5
packages/client/src/pages/notifications.vue
View file

@ -9,7 +9,10 @@
/> />
</template> </template>
<MkSpacer :content-max="800"> <MkSpacer :content-max="800">
<swiper :touch-angle="25" :threshold="10" :centeredSlides="true" <swiper
:touch-angle="25"
:threshold="10"
:centeredSlides="true"
:modules="[Virtual]" :modules="[Virtual]"
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"

5
packages/client/src/pages/pages.vue
View file

@ -7,7 +7,10 @@
:tabs="headerTabs" :tabs="headerTabs"
/></template> /></template>
<MkSpacer :content-max="700"> <MkSpacer :content-max="700">
<swiper :touch-angle="25" :threshold="10" :centeredSlides="true" <swiper
:touch-angle="25"
:threshold="10"
:centeredSlides="true"
:modules="[Virtual]" :modules="[Virtual]"
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"

5
packages/client/src/pages/search.vue
View file

@ -8,7 +8,10 @@
:display-back-button="true" :display-back-button="true"
/></template> /></template>
<MkSpacer :content-max="800"> <MkSpacer :content-max="800">
<swiper :touch-angle="25" :threshold="10" :centeredSlides="true" <swiper
:touch-angle="25"
:threshold="10"
:centeredSlides="true"
:modules="[Virtual]" :modules="[Virtual]"
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"

5
packages/client/src/pages/tag.vue
View file

@ -8,7 +8,10 @@
:display-back-button="true" :display-back-button="true"
/></template> /></template>
<MkSpacer :content-max="800"> <MkSpacer :content-max="800">
<swiper :touch-angle="25" :threshold="10" :centeredSlides="true" <swiper
:touch-angle="25"
:threshold="10"
:centeredSlides="true"
:modules="[Virtual]" :modules="[Virtual]"
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"

5
packages/client/src/pages/timeline.vue
View file

@ -32,7 +32,10 @@
/> />
</div> *v-else on next div* --> </div> *v-else on next div* -->
<div class="tl _block"> <div class="tl _block">
<swiper :touch-angle="25" :threshold="10" :centeredSlides="true" <swiper
:touch-angle="25"
:threshold="10"
:centeredSlides="true"
:modules="[Virtual]" :modules="[Virtual]"
:space-between="20" :space-between="20"
:virtual="true" :virtual="true"

4
packages/client/src/ui/universal.vue
View file

@ -461,7 +461,7 @@ console.log(mainRouter.currentRoute.value.name);
} }
&:not(.isMobile) { &:not(.isMobile) {
> .contents { > .contents {
border-right: .5px solid var(--divider); border-right: 0.5px solid var(--divider);
} }
} }
&.wallpaper { &.wallpaper {
@ -473,7 +473,7 @@ console.log(mainRouter.currentRoute.value.name);
&:not(.isMobile) { &:not(.isMobile) {
--navBg: transparent; --navBg: transparent;
> .contents { > .contents {
border-inline: .5px solid var(--divider); border-inline: 0.5px solid var(--divider);
margin-inline: -1px; margin-inline: -1px;
} }
} }