diff options
| author | dakkar <dakkar@thenautilus.net> | 2024-03-24 11:26:36 +0000 |
|---|---|---|
| committer | dakkar <dakkar@thenautilus.net> | 2024-03-24 11:26:36 +0000 |
| commit | beb00789dff0e85eb2be21f613edcb8036ba9e14 (patch) | |
| tree | 38cd1f654b90e321a774b31e3c9ae238bbf62ef3 /packages | |
| parent | Merge remote-tracking branch 'misskey/develop' into future-2024-03-14 (diff) | |
| parent | merge: always align code to the left - fixes #436 (!453) (diff) | |
| download | sharkey-beb00789dff0e85eb2be21f613edcb8036ba9e14.tar.gz sharkey-beb00789dff0e85eb2be21f613edcb8036ba9e14.tar.bz2 sharkey-beb00789dff0e85eb2be21f613edcb8036ba9e14.zip | |
Merge branch 'develop' into future-2024-03-23
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/backend/ormconfig.js | 6 | ||||
| -rw-r--r-- | packages/frontend/src/account.ts | 3 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkCode.core.vue | 6 | ||||
| -rw-r--r-- | packages/frontend/src/pages/welcome.timeline.vue | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/packages/backend/ormconfig.js b/packages/backend/ormconfig.js index 229e5bf1fe..c88b3b3d65 100644 --- a/packages/backend/ormconfig.js +++ b/packages/backend/ormconfig.js @@ -11,7 +11,11 @@ export default new DataSource({ username: config.db.user, password: config.db.pass, database: config.db.db, - extra: config.db.extra, + extra: { + ...config.db.extra, + // migrations may be very slow, give them longer to run (that 10*1000 comes from postgres.ts) + statement_timeout: (config.db.extra?.statement_timeout ?? 1000 * 10) * 10, + }, entities: entities, migrations: ['migration/*.js'], }); diff --git a/packages/frontend/src/account.ts b/packages/frontend/src/account.ts index 171826c9d8..90cc2e51c9 100644 --- a/packages/frontend/src/account.ts +++ b/packages/frontend/src/account.ts @@ -43,6 +43,7 @@ export async function signout() { waiting(); miLocalStorage.removeItem('account'); await removeAccount($i.id); + document.cookie = `token=; path=/; max-age=0${ location.protocol === 'https:' ? '; Secure' : ''}`; const accounts = await getAccounts(); //#region Remove service worker registration @@ -200,7 +201,7 @@ export async function login(token: Account['token'], redirect?: string) { throw reason; }); miLocalStorage.setItem('account', JSON.stringify(me)); - document.cookie = `token=${token}; path=/; max-age=31536000`; // bull dashboardの認証とかで使う + document.cookie = `token=${token}; path=/; max-age=31536000${ location.protocol === 'https:' ? '; Secure' : ''}`; // bull dashboardの認証とかで使う await addAccount(me.id, token); if (redirect) { diff --git a/packages/frontend/src/components/MkCode.core.vue b/packages/frontend/src/components/MkCode.core.vue index f9aaf4eff3..a23b4dc3b2 100644 --- a/packages/frontend/src/components/MkCode.core.vue +++ b/packages/frontend/src/components/MkCode.core.vue @@ -72,12 +72,16 @@ watch(() => props.lang, (to) => { </script> <style module lang="scss"> +.codeBlockRoot { + text-align: left; +} + .codeBlockRoot :global(.shiki) > code { counter-reset: step; counter-increment: step 0; } -.codeBlockRoot :global(.shiki) > code > .line::before { +.codeBlockRoot :global(.shiki) > code > span::before { content: counter(step); counter-increment: step; width: 1rem; diff --git a/packages/frontend/src/pages/welcome.timeline.vue b/packages/frontend/src/pages/welcome.timeline.vue index 59f91e8b4c..be4cb2d2de 100644 --- a/packages/frontend/src/pages/welcome.timeline.vue +++ b/packages/frontend/src/pages/welcome.timeline.vue @@ -40,7 +40,7 @@ const isScrolling = ref(false); const scrollEl = shallowRef<HTMLElement>(); misskeyApiGet('notes/featured').then(_notes => { - notes.value = _notes; + notes.value = _notes.filter(n => n.cw == null); }); onUpdated(() => { |