Skip to content

Commit

Permalink
Fix major issues
Browse files Browse the repository at this point in the history
- μ€‘κ΄„ν˜Έ(bracelets)κ°€ μ œλŒ€λ‘œ λ‹«νžˆμ§€ μ•Šμ•„ μ½”λ“œ 전체가 κ³ μž₯λ‚˜λŠ” 이슈 μˆ˜μ •
- scss ν˜•μ‹μ˜ css 파트의 breaking changes 반영
  • Loading branch information
HotoRas committed Aug 10, 2024
1 parent c49a348 commit 779a994
Show file tree
Hide file tree
Showing 12 changed files with 69 additions and 47 deletions.
7 changes: 7 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@
"build": "pnpm build-pre && pnpm -r build && pnpm build-assets",
"build-storybook": "pnpm --filter frontend build-storybook",
"build-misskey-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json --no-build && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api",
"update-misskey-js-and-build": "pnpm build-misskey-js-with-types && pnpm -r build && pnpm build-assets",
"update-mjs": "pnpm update-misskey-js-and-build",

"backend:build": "pnpm build-pre && pnpm --filter backend build",
"frontend:build": "pnpm build-pre && pnpm build-storybook && pnpm --filter frontend build && pnpm build-assets",
"misskey-js:build": "pnpm build-misskey-js-with-types",

"start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js",
"start:test": "cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js",
"init": "pnpm migrate",
Expand Down
9 changes: 5 additions & 4 deletions packages/backend/src/core/NoteUpdateService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ export class NoteUpdateService implements OnApplicationShutdown {
}, note: MiNote, data: Option, tags: string[], emojis: string[]): Promise<MiNote> {
if (data.updatedAt === null || data.updatedAt === undefined) {
data.updatedAt = new Date();
}
const updatedAtHistory = note.updatedAtHistory ?? [];

const values = new MiNote({
Expand Down Expand Up @@ -206,10 +207,10 @@ export class NoteUpdateService implements OnApplicationShutdown {

@bindThis
private async postNoteUpdated (note: MiNote, user: {
id: MiUser['id'],
username: MiUser['username'],
host: MiUser['host'],
isBot: MiUser['isBot'],
id: MiUser['id'];
username: MiUser['username'];
host: MiUser['host'];
isBot: MiUser['isBot'];
}, silent: boolean) {
if (!silent) {
if (this.userEntityService.isLocalUser(user)) this.activeUsersChart.write(user);
Expand Down
1 change: 0 additions & 1 deletion packages/backend/src/core/S3Service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { DI } from '@/di-symbols.js';
import type { Config } from '@/config.js';
import type { MiMeta } from '@/models/Meta.js';
import { HttpRequestService } from '@/core/HttpRequestService.js';
import { bindThis } from '@/decorators.js';
import type { DeleteObjectCommandInput, PutObjectCommandInput } from '@aws-sdk/client-s3';

@Injectable()
Expand Down
6 changes: 4 additions & 2 deletions packages/frontend/src/components/MkModalWindow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,10 @@ defineExpose({
--root-margin: 16px;
}

--headerHeight: 46px;
--headerHeightNarrow: 42px;
& {
--headerHeight: 46px;
--headerHeightNarrow: 42px;
}
}

.header {
Expand Down
6 changes: 4 additions & 2 deletions packages/frontend/src/components/MkSuperMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,10 @@ defineProps<{
border-top: none;
}

margin-left: 0;
margin-right: 0;
& {
margin-left: 0;
margin-right: 0;
}

> .title {
font-size: 1em;
Expand Down
26 changes: 14 additions & 12 deletions packages/frontend/src/components/MkWindow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -512,18 +512,20 @@ defineExpose({
--height: 32px;
}

display: flex;
position: relative;
z-index: 1;
flex-shrink: 0;
user-select: none;
height: var(--height);
background: var(--windowHeader);
-webkit-backdrop-filter: var(--blur, blur(15px));
backdrop-filter: var(--blur, blur(15px));
//border-bottom: solid 1px var(--divider);
font-size: 90%;
font-weight: bold;
& {
display: flex;
position: relative;
z-index: 1;
flex-shrink: 0;
user-select: none;
height: var(--height);
background: var(--windowHeader);
-webkit-backdrop-filter: var(--blur, blur(15px));
backdrop-filter: var(--blur, blur(15px));
//border-bottom: solid 1px var(--divider);
font-size: 90%;
font-weight: bold;
}
}

.headerButton {
Expand Down
8 changes: 5 additions & 3 deletions packages/frontend/src/pages/admin/overview.users.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@ useInterval(fetch, 1000 * 60, {
transition: transform 1s ease;
}

display: grid;
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
grid-gap: 12px;
& {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
grid-gap: 12px;
}

> .user:hover {
text-decoration: none;
Expand Down
8 changes: 5 additions & 3 deletions packages/frontend/src/pages/page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ const otherPostsPagination = {
endpoint: 'users/pages' as const,
limit: 6,
params: computed(() => ({
userId: page.value.user.id,
userId: page.value?.user.id,
})),
};
const path = computed(() => props.username + '/' + props.pageName);
Expand All @@ -155,7 +155,7 @@ function fetchPage() {
if (pageViewInterruptors.length > 0) {
let result = deepClone(_page);
for (const interruptor of pageViewInterruptors) {
result = await interruptor.handler(result);
result = await interruptor.handler(result) as typeof result;
}
page.value = result;
}
Expand Down Expand Up @@ -378,7 +378,9 @@ definePageMetadata(() => ({
width: var(--height);
}

line-height: var(--height);
& {
line-height: var(--height);
}
}

.pageBannerTitleSubActions {
Expand Down
18 changes: 10 additions & 8 deletions packages/frontend/src/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@
--margin: var(--marginHalf);
}

//--ad: rgb(255 169 0 / 10%);
--eventFollow: #36aed2;
--eventRenote: #36d298;
--eventReply: #007aff;
--eventReactionHeart: #dd2e44;
--eventReaction: #e99a0b;
--eventAchievement: #cb9a11;
--eventOther: #88a6b7;
& {
//--ad: rgb(255 169 0 / 10%);
--eventFollow: #36aed2;
--eventRenote: #36d298;
--eventReply: #007aff;
--eventReactionHeart: #dd2e44;
--eventReaction: #e99a0b;
--eventAchievement: #cb9a11;
--eventOther: #88a6b7;
}
}

::selection {
Expand Down
16 changes: 9 additions & 7 deletions packages/frontend/src/ui/_common_/statusbars.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,15 @@ const XUserList = defineAsyncComponent(() => import('./statusbar-user-list.vue')
font-size: 0.9em;
}

display: flex;
vertical-align: bottom;
width: 100%;
line-height: var(--height);
height: var(--height);
overflow: clip;
contain: strict;
& {
display: flex;
vertical-align: bottom;
width: 100%;
line-height: var(--height);
height: var(--height);
overflow: clip;
contain: strict;
}

&.black {
background: #000;
Expand Down
10 changes: 5 additions & 5 deletions packages/frontend/src/ui/deck/column.vue
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ function getMenu() {
icon: 'ti ti-settings',
text: i18n.ts._deck.configureColumn,
action: async () => {
const { canceled, result } = await os.form(props.column.name, {
const { canceled, result } = await os.form(props.column.name ?? '', {
name: {
type: 'string',
label: i18n.ts.name,
Expand All @@ -123,7 +123,7 @@ function getMenu() {
flexible: {
type: 'boolean',
label: i18n.ts._deck.flexible,
default: props.column.flexible,
default: props.column.flexible ?? null,
},
});
if (canceled) return;
Expand Down Expand Up @@ -328,7 +328,7 @@ function onDrop(ev) {
&::-webkit-scrollbar-track {
background: transparent;
}
scrollbar-color: var(--scrollbarHandle) transparent;
& { scrollbar-color: var(--scrollbarHandle) transparent; }
}
}

Expand All @@ -342,7 +342,7 @@ function onDrop(ev) {
&::-webkit-scrollbar-track {
background: inherit;
}
scrollbar-color: var(--scrollbarHandle) transparent;
& { scrollbar-color: var(--scrollbarHandle) transparent; }
}
}
}
Expand Down Expand Up @@ -427,6 +427,6 @@ function onDrop(ev) {
&::-webkit-scrollbar-track {
background: var(--panel);
}
scrollbar-color: var(--scrollbarHandle) var(--panel);
& { scrollbar-color: var(--scrollbarHandle) var(--panel); }
}
</style>
1 change: 1 addition & 0 deletions packages/misskey-js/src/autogen/endpoint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1230,6 +1230,7 @@ export const endpointReqTypes: Record<keyof Endpoints, 'application/json' | 'mul
'notes/clips': 'application/json',
'notes/conversation': 'application/json',
'notes/create': 'application/json',
'notes/update': 'application/json',
'notes/delete': 'application/json',
'notes/favorites/create': 'application/json',
'notes/favorites/delete': 'application/json',
Expand Down

0 comments on commit 779a994

Please sign in to comment.