Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update host #643

Merged
merged 56 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
2ff90a8
fix(backend): add detailed schema to `fetch-rss` endpoint (#13764)
zyoshoka Apr 29, 2024
2017f91
refactor(frontend): 非ログイン画面でのmeta取得を減らす (#13776)
kakkokari-gtyih May 1, 2024
8c5e564
fix type error
kakkokari-gtyih May 1, 2024
ef630df
enhance(frontend): add contact page
syuilo May 1, 2024
9f66f22
fix(frontend): 連合なしの状態の読み書きができない問題 (#13777)
taiyme May 1, 2024
d2a5bb3
Merge pull request from GHSA-2vxv-pv3m-3wvj
tesaguri May 1, 2024
9c057e6
fix(frontend): fix Storybook type errors (#13779)
zyoshoka May 1, 2024
c530a46
enhance(backend): ドライブのファイルがNSFWかどうか個別に連合されるように (#13756)
KisaragiEffective May 1, 2024
1a243d8
Merge remote-tracking branch 'misskey-dev/develop' into io
u1-liquid May 4, 2024
ea88f85
Merge pull request MisskeyIO#627 from merge-upstream
u1-liquid May 4, 2024
053e762
enhance(frontend_ais): PostForm系の設定項目を追加 (#13788)
kakkokari-gtyih May 4, 2024
eef7fcd
chore(frontend): ui tweak
syuilo May 4, 2024
2b21c19
update deps (#13624)
syuilo May 4, 2024
fc77ad9
refactor(frontend): provide linkNavigationBehavior
syuilo May 6, 2024
c639f30
Update CHANGELOG.md
syuilo May 6, 2024
f5d57c0
dev: modify release manager to set indent type
tamaina May 7, 2024
f2743a0
Merge remote-tracking branch 'misskey-dev/develop' into io
u1-liquid May 8, 2024
dd71706
chore(deps): bump pnpm/action-setup from 3 to 4 (MisskeyIO#628)
dependabot[bot] May 8, 2024
3b41cfe
Merge pull request MisskeyIO#629 from merge-upstream
u1-liquid May 8, 2024
b298897
fix(backend): 不要なUserProfileの取得を修正 (#13812)
samunohito May 10, 2024
f6af6d9
fix(backend): UserEntityService.getRelationsの取得処理を軽量化 (#13811)
samunohito May 10, 2024
12ae9a2
feat: DevContainerにpnpmをインストールする際、corepackを使うようにする (#13821)
frfs May 13, 2024
9b0fc31
Update FUNDING.yml
syuilo May 14, 2024
acfe1cb
Merge remote-tracking branch 'misskey-dev/develop' into io
u1-liquid May 16, 2024
23a12b9
Merge pull request MisskeyIO#631 from merge-upstream
u1-liquid May 16, 2024
f4fbc22
spec(frontend): kawaii モード (MisskeyIO#632)
u1-liquid May 17, 2024
def7b8c
fix(frontend): fix Chromatic test fails (#13826)
zyoshoka May 18, 2024
ba62b73
fix(storybook): fix wrong `tabler-icons` CSS path (#13828)
zyoshoka May 18, 2024
acf84a2
FTTが有効かつsinceIdのみを指定した場合に帰って来るレスポンスが逆順である問題を修正 (#13837)
anatawa12 May 19, 2024
4d0db37
fix notification limit with exclude/include types (#13836)
anatawa12 May 20, 2024
f6df940
Exclude channel notes from featured polls (#13838)
anatawa12 May 20, 2024
ed74f7b
ci: use pnpm version from packageManager field in the package.json. (…
anatawa12 May 20, 2024
5836bd8
fix: 複数idを指定する`users/show`が関係ないユーザを返すことがある問題を修正 (#13765)
anatawa12 May 20, 2024
367bf0c
fix: `/share` with unicode characters in the URL (#13846)
anatawa12 May 20, 2024
1d4e639
ci: verify locale data (#13849)
acid-chicken May 21, 2024
3fba768
New Crowdin updates (#13500)
syuilo May 21, 2024
7bde630
`/tags` と `/user-tags` が検索エンジンにインデックスされないように (#13847)
anatawa12 May 21, 2024
37f2952
Update about-misskey.vue
syuilo May 21, 2024
3340631
Update about-misskey.vue
syuilo May 21, 2024
126383d
deps: AiScript VSCodeのバージョンを上げる (#13851)
kakkokari-gtyih May 21, 2024
6a637db
enhance(frontend): 通常のノートでも、お気に入りに登録したチャンネルにリノートできるように (#13855)
kakkokari-gtyih May 21, 2024
20c0bd9
happy-domにメモリリークがありそう
syuilo May 21, 2024
c69de6b
fix(l10n): fix wrong description of server silence (#13857)
Sayamame-beans May 21, 2024
ed432d0
New Crowdin updates (#13850)
syuilo May 21, 2024
38c1075
enhance(frontend): センシティブとして設定されたURLのプレビューサムネイルのblur調整 (MisskeyIO#633)
u1-liquid May 22, 2024
557601f
enhance(backend): 投票の選択肢に対してもセンシティブワード検出を行うように (MisskeyIO#630)
CyberRex0 May 22, 2024
0f70bf5
Merge remote-tracking branch 'misskey-dev/develop' into io
u1-liquid May 22, 2024
c523c86
Merge pull request MisskeyIO#636 from merge-upstream
u1-liquid May 22, 2024
3aa09e7
Bump up version to 2024.5.0-io.1 (MisskeyIO#637)
u1-liquid May 23, 2024
0b207e0
chore(frontend): CSSのwarning解消、i18n (MisskeyIO#640)
u1-liquid May 24, 2024
2b7f438
fix(backend): pnpm devが動作しない問題を修正 (MisskeyIO#641)
u1-liquid May 24, 2024
9e4ff38
enhance(backend): MisskeyIO#615 のパフォーマンス改善 (MisskeyIO#638)
u1-liquid May 24, 2024
f6bf7f9
feat(announcement): 個別のお知らせにリンクで飛べるように (MisskeyIO#639)
u1-liquid May 24, 2024
dff3853
enhance(frontend): 通報のカテゴリーの調整・説明文の追加 (MisskeyIO#642)
u1-liquid May 24, 2024
93ffb1b
spec: Remove Misskey.io related customization
u1-liquid May 24, 2024
6aa0b2c
Merge branch 'io' into host
u1-liquid May 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
spec(frontend): kawaii モード (#632)
  • Loading branch information
u1-liquid committed May 17, 2024
commit f4fbc220d53905ef1cb8ace455aa2d6bdd663bdd
18 changes: 18 additions & 0 deletions packages/frontend/assets/kawaii/LICENSE_SAWARATSUKI_KawaiiLogos
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
LICENSE
-------

Copyright (c) by [さわらつき](https://github.com/SAWARATSUKI)

The following files:

- misskey-io.png
- about-icon.png

are licensed under proprietary license. To view a copy of this license, visit https://github.com/SAWARATSUKI/KawaiiLogos/blob/main/README_EN.md#license
AND SHOULD NOT be considered as part of this project, which is licensed under AGPL-3.0-only.

The following files:

- about-icon.png (uwl.png)

were copied from [misskey-dev/misskey-hub-next](https://github.com/misskey-dev/misskey-hub-next/tree/221a89760e80d75a00600c4e37e22c0f226a6017/public/img/uwu)
Binary file added packages/frontend/assets/kawaii/about-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/frontend/assets/kawaii/misskey-io.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 12 additions & 1 deletion packages/frontend/src/boot/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ export async function common(createVue: () => App<Element>) {
miLocalStorage.setItem('v', instance.version);
});

//#region loginId
const params = new URLSearchParams(location.search);
//#region loginId
const loginId = params.get('loginId');

if (loginId) {
Expand All @@ -142,6 +142,17 @@ export async function common(createVue: () => App<Element>) {
}
//#endregion

//#region kawaii
if (params.has('kawaii') || params.has('uwu')) {
const v = params.get('kawaii') ?? params.get('uwu');
if (v === 'false' || v === '0' || v === 'no' || v === 'off') {
miLocalStorage.removeItem('kawaii');
} else {
miLocalStorage.setItem('kawaii', 'true');
}
}
//#endregion

// NOTE: この処理は必ずクライアント更新チェック処理より後に来ること(テーマ再構築のため)
watch(defaultStore.reactiveState.darkMode, (darkMode) => {
applyTheme(darkMode ? ColdDeviceStorage.get('darkTheme') : ColdDeviceStorage.get('lightTheme'));
Expand Down
11 changes: 10 additions & 1 deletion packages/frontend/src/components/MkVisitorDashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<template>
<div v-if="instance" :class="$style.root">
<div :class="[$style.main, $style.panel]">
<img :src="instance.iconUrl || '/favicon.ico'" alt="" :class="$style.mainIcon"/>
<img v-if="miLocalStorage.getItem('kawaii')" src="/client-assets/kawaii/misskey-io.png" alt="Logo by @sawaratsuki@misskey.io" :class="$style.mainIconAlt"/>
<img v-else :src="instance.iconUrl || '/favicon.ico'" alt="" :class="$style.mainIcon"/>
<button class="_button _acrylic" :class="$style.mainMenu" @click="showMenu"><i class="ti ti-dots"></i></button>
<div :class="$style.mainFg">
<h1 :class="$style.mainTitle">
Expand Down Expand Up @@ -81,6 +82,7 @@ import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import { miLocalStorage } from '@/local-storage.js';
import MkNumber from '@/components/MkNumber.vue';
import XActiveUsersChart from '@/components/MkVisitorDashboard.ActiveUsersChart.vue';
import { openInstanceMenu } from '@/ui/_common_/common';
Expand Down Expand Up @@ -139,6 +141,13 @@ function exploreOtherServers() {
filter: drop-shadow(0 2px 5px rgba(0, 0, 0, 0.5));
}

.mainIconAlt {
width: 85%;
margin-top: -47px;
vertical-align: bottom;
filter: drop-shadow(0 2px 5px rgba(0, 0, 0, 0.5));
}

.mainMenu {
position: absolute;
top: 16px;
Expand Down
3 changes: 2 additions & 1 deletion packages/frontend/src/local-storage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ type Keys =
`aiscript:${string}` |
'lastEmojisFetchedAt' | // DEPRECATED, stored in indexeddb (13.9.0~)
'emojis' | // DEPRECATED, stored in indexeddb (13.9.0~);
`channelLastReadedAt:${string}`
`channelLastReadedAt:${string}` |
'kawaii'

export const miLocalStorage = {
getItem: (key: Keys): string | null => window.localStorage.getItem(key),
Expand Down
20 changes: 19 additions & 1 deletion packages/frontend/src/pages/about-misskey.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_gaps_m znqjceqz">
<div v-panel class="about">
<div ref="containerEl" class="container" :class="{ playing: easterEggEngine != null }">
<img src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
<img v-if="miLocalStorage.getItem('kawaii')" src="/client-assets/kawaii/about-icon.png" alt="" class="iconAlt" draggable="false" @load="iconLoaded" @click="gravity"/>
<img v-else src="/client-assets/about-icon.png" alt="" class="icon" draggable="false" @load="iconLoaded" @click="gravity"/>
<Mfm v-if="miLocalStorage.getItem('kawaii')" text="Logo by @sawaratsuki@misskey.io" class="iconCredit"/>
<div class="misskey">Misskey</div>
<div class="version">v{{ version }}</div>
<span v-for="emoji in easterEggEmojis" :key="emoji.id" class="emoji" :data-physics-x="emoji.left" :data-physics-y="emoji.top" :class="{ _physics_circle_: !emoji.emoji.startsWith(':') }">
Expand Down Expand Up @@ -137,6 +139,7 @@ import { physics } from '@/scripts/physics.js';
import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import { defaultStore } from '@/store.js';
import { miLocalStorage } from '@/local-storage.js';
import * as os from '@/os.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
import { claimAchievement, claimedAchievements } from '@/scripts/achievements.js';
Expand Down Expand Up @@ -443,6 +446,21 @@ definePageMetadata(() => ({
z-index: 1;
}

> .iconAlt {
display: block;
width: 85%;
margin: 0 auto;
position: relative;
z-index: 1;
}

> .iconCredit {
margin: 0 auto;
width: max-content;
position: relative;
z-index: 1;
}

> .misskey {
margin: 0.75em auto 0 auto;
width: max-content;
Expand Down
18 changes: 17 additions & 1 deletion packages/frontend/src/pages/about.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ SPDX-License-Identifier: AGPL-3.0-only
<div class="_gaps_m">
<div :class="$style.banner" :style="{ backgroundImage: `url(${ instance.bannerUrl })` }">
<div style="overflow: clip;">
<img :src="instance.iconUrl ?? instance.faviconUrl ?? '/favicon.ico'" alt="" :class="$style.bannerIcon"/>
<img v-if="miLocalStorage.getItem('kawaii')" src="/client-assets/kawaii/misskey-io.png" alt="" :class="$style.bannerIconAlt"/>
<img v-else :src="instance.iconUrl ?? instance.faviconUrl ?? '/favicon.ico'" alt="" :class="$style.bannerIcon"/>
<Mfm v-if="miLocalStorage.getItem('kawaii')" text="Logo by @sawaratsuki@misskey.io" :class="$style.iconCredit"/>
<div :class="$style.bannerName">
<b>{{ instance.name ?? host }}</b>
</div>
Expand Down Expand Up @@ -168,6 +170,7 @@ import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
import { claimAchievement } from '@/scripts/achievements.js';
import { instance } from '@/instance.js';
import { miLocalStorage } from '@/local-storage.js';

const props = withDefaults(defineProps<{
initialTab?: string;
Expand Down Expand Up @@ -230,6 +233,12 @@ definePageMetadata(() => ({
border-radius: 8px;
}

.bannerIconAlt {
display: block;
margin: 16px auto 0 auto;
width: 85%;
}

.bannerName {
display: block;
padding: 16px;
Expand All @@ -238,6 +247,13 @@ definePageMetadata(() => ({
background: linear-gradient(transparent, rgba(0, 0, 0, 0.7));
}

> .iconCredit {
margin: 0 auto;
width: max-content;
position: relative;
z-index: 1;
}

.rules {
counter-reset: item;
list-style: none;
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/pages/user/home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<!--
*** LICENSE NOTICE ***
* This SVG is derived from the https://skeb.jp/ website, All rights reserved to *Skeb Inc.* https://skeb.co.jp/
* This resource SHOULD NOT be considered as a part of the this project that has licensed under AGPL-3.0-only
* This resource SHOULD NOT be considered as a part of this project that has licensed under AGPL-3.0-only
-->
<svg class="ti ti-fw" viewBox="0 0 40 40" xmlns="http://www.w3.org/2000/svg">
<linearGradient id="a" x1="14.645309%" x2="85.354691%" y1="14.645309%" y2="85.363492%">
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/scripts/rate-limiter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: ISC
*
* This file is derived from the project that has licensed under the ISC license.
* This file SHOULD NOT be considered as a part of the this project that has licensed under AGPL-3.0-only
* This file SHOULD NOT be considered as a part of this project that has licensed under AGPL-3.0-only
* Adapted from https://github.com/isaacs/ttlcache/blob/b6002f971e122e3b35e23d00ac6a8365d505c14d/examples/rate-limiter-window.ts
*/

Expand Down
9 changes: 8 additions & 1 deletion packages/frontend/src/ui/_common_/navbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ SPDX-License-Identifier: AGPL-3.0-only
<div :class="$style.top">
<div :class="$style.banner" :style="{ backgroundImage: `url(${ instance.bannerUrl })` }"></div>
<button v-tooltip.noDelay.right="instance.name ?? i18n.ts.instance" class="_button" :class="$style.instance" @click="openInstanceMenu">
<img :src="instance.iconUrl || instance.faviconUrl || '/favicon.ico'" alt="" :class="$style.instanceIcon"/>
<img v-if="miLocalStorage.getItem('kawaii')" src="/client-assets/kawaii/misskey-io.png" alt="" :class="$style.instanceIconAlt"/>
<img v-else :src="instance.iconUrl || instance.faviconUrl || '/favicon.ico'" alt="" :class="$style.instanceIcon"/>
</button>
</div>
<div :class="$style.middle">
Expand Down Expand Up @@ -68,6 +69,7 @@ import { $i, openAccountMenu as openAccountMenu_ } from '@/account.js';
import { defaultStore } from '@/store.js';
import { i18n } from '@/i18n.js';
import { instance } from '@/instance.js';
import { miLocalStorage } from '@/local-storage.js';

const iconOnly = ref(false);

Expand Down Expand Up @@ -173,6 +175,11 @@ function more(ev: MouseEvent) {
aspect-ratio: 1;
}

.instanceIconAlt {
display: inline-block;
width: 85%;
}

.bottom {
position: sticky;
bottom: 0;
Expand Down
Loading