wtf???

feat: Add convert video container button

.gitignore

@@ -42,3 +42,5 @@ ormconfig.json
 *.blend3
 *.blend4
 *.blend5
+
+start.sh

CHANGELOG.md

@@ -10,6 +10,14 @@
 You should also include the user name that made the change.
 -->
 
+## 12.108.1 (2022/03/12)
+
+### Bugfixes
+- リレーが動作しない問題を修正 @xianonn
+- ulidを使用していると動作しない問題を修正 @syuilo
+- 外部からOGPが正しく取得できない問題を修正 @syuilo
+- instance can not get the files from other instance when there are items in allowedPrivateNetworks in .config/default.yml @ybw2016v
+
 ## 12.108.0 (2022/03/09)
 
 ### NOTE

locales/ca-ES.yml

@@ -12,6 +12,7 @@ gotIt: "Ho he entès!"
 cancel: "Cancel·lar"
 smtpUser: "Nom d'usuari"
 smtpPass: "Contrasenya"
+searchByGoogle: "Cercar"
 _mfm:
   search: "Cercar"
 _sfx:

locales/cs-CZ.yml

@@ -449,6 +449,7 @@ clearCache: "Vyprázdnit mezipaměť"
 info: "Informace"
 user: "Uživatelé"
 administration: "Administrace"
+searchByGoogle: "Vyhledávání"
 _email:
   _follow:
     title: "Máte nového následovníka"

locales/es-ES.yml

@@ -762,6 +762,7 @@ muteThread: "Ocultar hilo"
 unmuteThread: "Mostrar hilo"
 ffVisibility: "Visibilidad de seguidores y seguidos"
 hide: "Ocultar"
+searchByGoogle: "Buscar"
 indefinitely: "Sin límite de tiempo"
 _ffVisibility:
   public: "Publicar"

locales/id-ID.yml

@@ -825,6 +825,7 @@ overridedDeviceKind: "Tipe perangkat"
 smartphone: "Ponsel"
 tablet: "Tablet"
 auto: "Otomatis"
+searchByGoogle: "Penelusuran"
 indefinitely: "Selamanya"
 _emailUnavailable:
   used: "Alamat surel ini telah digunakan"

locales/index.js

@@ -24,6 +24,7 @@ const languages = [
 	'fr-FR',
 	'id-ID',
 	'it-IT',
+	'ja-NY',
 	'ja-JP',
 	'ja-KS',
 	'kab-KAB',
@@ -57,6 +58,7 @@ module.exports = Object.entries(locales)
 		const [lang] = k.split('-');
 		switch (k) {
 			case 'ja-JP': return v;
+			case 'ja-NY':
 			case 'ja-KS':
 			case 'en-US': return merge(locales['ja-JP'], v);
 			default: return merge(

locales/it-IT.yml

@@ -802,6 +802,7 @@ leaveGroupConfirm: "Uscire da「{name}」?"
 useDrawerReactionPickerForMobile: "Mostra sul drawer da dispositivo mobile"
 welcomeBackWithName: "Bentornato/a, {name}"
 clickToFinishEmailVerification: "Fai click su [{ok}] per completare la verifica dell'indirizzo email."
+searchByGoogle: "Cerca"
 indefinitely: "Non scade"
 _emailUnavailable:
   used: "Email già in uso"

locales/ja-JP.yml

@@ -222,6 +222,7 @@ currentPassword: "現在のパスワード"
 newPassword: "新しいパスワード"
 newPasswordRetype: "新しいパスワード(再入力)"
 attachFile: "ファイルを添付"
+attachVideoFile: "MOVファイルを添付"
 more: "もっと！"
 featured: "ハイライト"
 usernameOrUserId: "ユーザー名かユーザーID"
@@ -830,7 +831,7 @@ auto: "自動"
 themeColor: "テーマカラー"
 size: "サイズ"
 numberOfColumn: "列の数"
-searchByGoogle: "ググる"
+searchByGoogle: "検索"
 instanceDefaultLightTheme: "インスタンスデフォルトのライトテーマ"
 instanceDefaultDarkTheme: "インスタンスデフォルトのダークテーマ"
 instanceDefaultThemeDescription: "オブジェクト形式のテーマコードを記入します。"

locales/ja-KS.yml

@@ -655,6 +655,7 @@ global: "グローバル"
 sent: "送信"
 hashtags: "ハッシュタグ"
 hide: "隠す"
+searchByGoogle: "探す"
 indefinitely: "無期限"
 _ad:
   back: "戻る"

locales/kab-KAB.yml

@@ -55,6 +55,7 @@ accountInfo: "Talɣut n umiḍan"
 emailNotification: "Ilɣa imayl"
 selectAccount: "Fren amiḍan"
 accounts: "Imiḍan"
+searchByGoogle: "Nadi"
 _email:
   _follow:
     title: "Yeṭṭafaṛ-ik·em-id"

locales/kn-IN.yml

@@ -59,6 +59,7 @@ remove: "ಅಳಿಸು"
 smtpUser: "ಬಳಕೆಹೆಸರು"
 smtpPass: "ಗುಪ್ತಪದ"
 user: "ಬಳಕೆದಾರ"
+searchByGoogle: "ಹುಡುಕು"
 _email:
   _follow:
     title: "ಹಿಂಬಾಲಿಸಿದರು"

locales/ko-KR.yml

@@ -825,6 +825,7 @@ overridedDeviceKind: "장치 유형"
 smartphone: "스마트폰"
 tablet: "태블릿"
 auto: "자동"
+searchByGoogle: "검색"
 indefinitely: "무기한"
 _emailUnavailable:
   used: "이 메일 주소는 사용중입니다"

locales/nl-NL.yml

@@ -256,6 +256,7 @@ user: "Gebruikers"
 muteThread: "Discussies dempen "
 unmuteThread: "Dempen van discussie ongedaan maken"
 hide: "Verbergen"
+searchByGoogle: "Zoeken"
 _email:
   _follow:
     title: "volgde jou"

locales/pl-PL.yml

@@ -758,6 +758,7 @@ received: "Otrzymane"
 hashtags: "Hashtag"
 pubSub: "Konta Pub/Sub"
 hide: "Ukryj"
+searchByGoogle: "Szukaj"
 indefinitely: "Nigdy"
 _ffVisibility:
   public: "Publikuj"

locales/pt-PT.yml

@@ -61,6 +61,7 @@ pinnedNotes: "Post fixado"
 smtpUser: "Nome de usuário"
 smtpPass: "Senha"
 user: "Usuários"
+searchByGoogle: "Pesquisar"
 _email:
   _follow:
     title: "Você tem um novo seguidor"

locales/ro-RO.yml

@@ -477,6 +477,7 @@ smtpPass: "Parolă"
 clearCache: "Golește cache-ul"
 info: "Despre"
 user: "Utilizatori"
+searchByGoogle: "Caută"
 _email:
   _follow:
     title: "te-a urmărit"

locales/ru-RU.yml

@@ -815,6 +815,7 @@ leaveGroupConfirm: "Покинуть группу «{name}»?"
 useDrawerReactionPickerForMobile: "Выдвижная палитра на мобильном устройстве"
 welcomeBackWithName: "С возвращением, {name}!"
 clickToFinishEmailVerification: "Пожалуйста, нажмите [{ok}], чтобы завершить подтверждение адреса электронной почты."
+searchByGoogle: "Поиск"
 indefinitely: "вечно"
 _emailUnavailable:
   used: "Уже используется"

locales/tr-TR.yml

@@ -47,6 +47,7 @@ remove: "Sil"
 smtpUser: "Kullanıcı Adı"
 smtpPass: "Şifre"
 user: "Kullanıcı"
+searchByGoogle: "Arama"
 _mfm:
   search: "Arama"
 _sfx:

locales/ug-CN.yml

@@ -1,5 +1,6 @@
 ---
 _lang_: "ياپونچە"
 search: "ئىزدەش"
+searchByGoogle: "ئىزدەش"
 _mfm:
   search: "ئىزدەش"

locales/uk-UA.yml

@@ -685,6 +685,7 @@ global: "Глобальна"
 sent: "Відправити"
 hashtags: "Хештеґ"
 hide: "Сховати"
+searchByGoogle: "Пошук"
 indefinitely: "Ніколи"
 _ad:
   back: "Назад"

locales/zh-TW.yml

@@ -747,6 +747,7 @@ global: "公開"
 sent: "發送"
 hashtags: "#tag"
 hide: "隱藏"
+searchByGoogle: "搜尋"
 indefinitely: "無期限"
 _ffVisibility:
   public: "發佈"

package.json

@@ -1,10 +1,10 @@
 {
 	"name": "misskey",
-	"version": "12.108.0",
+	"version": "12.108.1-simkey-v999999",
 	"codename": "indigo",
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/misskey-dev/misskey.git"
+		"url": "https://github.com/sim1222/misskey.git"
 	},
 	"private": true,
 	"scripts": {

packages/backend/package.json

@@ -19,7 +19,7 @@
 		"@elastic/elasticsearch": "7.11.0",
 		"@koa/cors": "3.1.0",
 		"@koa/multer": "3.0.0",
-		"@koa/router": "10.1.1",
+		"@koa/router": "9.0.1",
 		"@sinonjs/fake-timers": "9.1.1",
 		"@syuilo/aiscript": "0.11.1",
 		"@types/bcryptjs": "2.4.2",

packages/backend/src/misc/download-url.ts

@@ -6,7 +6,7 @@ import { httpAgent, httpsAgent, StatusError } from './fetch.js';
 import config from '@/config/index.js';
 import chalk from 'chalk';
 import Logger from '@/services/logger.js';
-import * as IPCIDR from 'ip-cidr';
+import IPCIDR from 'ip-cidr';
 import PrivateIp from 'private-ip';
 
 const pipeline = util.promisify(stream.pipeline);

packages/backend/src/remote/activitypub/misc/ld-signature.ts

@@ -1,5 +1,5 @@
 import * as crypto from 'node:crypto';
-import * as jsonld from 'jsonld';
+import jsonld from 'jsonld';
 import { CONTEXTS } from './contexts.js';
 import fetch from 'node-fetch';
 import { httpAgent, httpsAgent } from '@/misc/fetch.js';

packages/backend/src/server/api/define.ts

@@ -31,7 +31,7 @@ const ajv = new Ajv({
 	useDefaults: true,
 });
 
-ajv.addFormat('misskey:id', /^[a-z0-9]+$/);
+ajv.addFormat('misskey:id', /^[a-zA-Z0-9]+$/);
 
 export default function <T extends IEndpointMeta, Ps extends Schema>(meta: T, paramDef: Ps, cb: executor<T, Ps>)
 		: (params: any, user: T['requireCredential'] extends true ? SimpleUserInfo : SimpleUserInfo | null, token: AccessToken | null, file?: any) => Promise<any> {

packages/backend/src/server/file/send-drive-file.ts

@@ -2,7 +2,7 @@ import * as fs from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { dirname } from 'node:path';
 import Koa from 'koa';
-import * as send from 'koa-send';
+import send from 'koa-send';
 import rename from 'rename';
 import * as tmp from 'tmp';
 import { serverLogger } from '../index.js';

packages/backend/src/server/web/manifest.json

@@ -4,7 +4,7 @@
 	"start_url": "/",
 	"display": "standalone",
 	"background_color": "#313a42",
-	"theme_color": "#86b300",
+	"theme_color": "#a7dc4e",
 	"icons": [
 		{
 			"src": "/static-assets/icons/192.png",

packages/backend/yarn.lock

@@ -128,10 +128,10 @@
   resolved "https://registry.yarnpkg.com/@koa/multer/-/multer-3.0.0.tgz#439777949f28097d7b329c0b4ce3048074c862f8"
   integrity sha512-y+OQBmex5D1jIl723gAEUYcAWPEicIXppaAKw/zCMfpllQ08ZNweDPwoCLxEoatqd5pCu2XG6V8dl67JRq3RJw==
 
-"@koa/router@10.1.1":
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/@koa/router/-/router-10.1.1.tgz#8e5a85c9b243e0bc776802c0de564561e57a5f78"
-  integrity sha512-ORNjq5z4EmQPriKbR0ER3k4Gh7YGNhWDL7JBW+8wXDrHLbWYKYSJaOJ9aN06npF5tbTxe2JBOsurpJDAvjiXKw==
+"@koa/router@9.0.1":
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/@koa/router/-/router-9.0.1.tgz#4090a14223ea7e78aa13b632761209cba69acd95"
+  integrity sha512-OI+OU49CJV4px0WkIMmayBeqVXB/JS1ZMq7UoGlTZt6Y7ijK7kdeQ18+SEHHJPytmtI1y6Hf8XLrpxva3mhv5Q==
   dependencies:
     debug "^4.1.1"
     http-errors "^1.7.3"

packages/client/src/components/chart.vue

@@ -71,7 +71,7 @@ const colors = {
 	purple: '#e300db',
 	orange: '#fe6919',
 	lime: '#bde800',
-	cyan: '#00efef',
+	cyan: '#00e0e0',
 };
 const colorSets = [colors.blue, colors.green, colors.yellow, colors.red, colors.purple];
 const getColor = (i) => {
@@ -127,7 +127,7 @@ export default defineComponent({
 				name: string;
 				type: 'line' | 'area';
 				color?: string;
-				borderDash?: number[];
+				dashed?: boolean;
 				hidden?: boolean;
 				data: {
 					x: number;
@@ -217,7 +217,7 @@ export default defineComponent({
 						pointRadius: 0,
 						borderWidth: props.bar ? 0 : 2,
 						borderColor: x.color ? x.color : getColor(i),
-						borderDash: x.borderDash || [],
+						borderDash: x.dashed ? [5, 5] : [],
 						borderJoinStyle: 'round',
 						borderRadius: props.bar ? 3 : undefined,
 						backgroundColor: props.bar ? (x.color ? x.color : getColor(i)) : alpha(x.color ? x.color : getColor(i), 0.1),
@@ -226,7 +226,7 @@ export default defineComponent({
 								axis: 'y',
 								colors: {
 									0: alpha(x.color ? x.color : getColor(i), 0),
-									[maxes[i]]: alpha(x.color ? x.color : getColor(i), 0.175),
+									[maxes[i]]: alpha(x.color ? x.color : getColor(i), 0.2),
 								},
 							},
 						},
@@ -403,16 +403,19 @@ export default defineComponent({
 					name: 'Pub & Sub',
 					type: 'line',
 					data: format(raw.pubsub),
+					dashed: true,
 					color: colors.cyan,
 				}, {
 					name: 'Pub',
 					type: 'line',
 					data: format(raw.pub),
+					dashed: true,
 					color: colors.purple,
 				}, {
 					name: 'Sub',
 					type: 'line',
 					data: format(raw.sub),
+					dashed: true,
 					color: colors.orange,
 				}],
 			};
@@ -593,7 +596,7 @@ export default defineComponent({
 				series: [{
 					name: 'All',
 					type: 'line',
-					borderDash: [5, 5],
+					dashed: true,
 					data: format(
 						sum(
 							raw.local.incSize,
@@ -628,7 +631,7 @@ export default defineComponent({
 				series: [{
 					name: 'All',
 					type: 'line',
-					borderDash: [5, 5],
+					dashed: true,
 					data: format(
 						sum(
 							raw.local.incCount,
@@ -795,6 +798,36 @@ export default defineComponent({
 			};
 		};
 
+		const fetchPerUserFollowingChart = async (): Promise<typeof data> => {
+			const raw = await os.api('charts/user/following', { userId: props.args.user.id, limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'Local',
+					type: 'area',
+					data: format(raw.local.followings.total),
+				}, {
+					name: 'Remote',
+					type: 'area',
+					data: format(raw.remote.followings.total),
+				}],
+			};
+		};
+
+		const fetchPerUserFollowersChart = async (): Promise<typeof data> => {
+			const raw = await os.api('charts/user/following', { userId: props.args.user.id, limit: props.limit, span: props.span });
+			return {
+				series: [{
+					name: 'Local',
+					type: 'area',
+					data: format(raw.local.followers.total),
+				}, {
+					name: 'Remote',
+					type: 'area',
+					data: format(raw.remote.followers.total),
+				}],
+			};
+		};
+
 		const fetchPerUserDriveChart = async (): Promise<typeof data> => {
 			const raw = await os.api('charts/user/drive', { userId: props.args.user.id, limit: props.limit, span: props.span });
 			return {
@@ -838,6 +871,8 @@ export default defineComponent({
 					case 'instance-drive-files-total': return fetchInstanceDriveFilesChart(true);
 
 					case 'per-user-notes': return fetchPerUserNotesChart();
+					case 'per-user-following': return fetchPerUserFollowingChart();
+					case 'per-user-followers': return fetchPerUserFollowersChart();
 					case 'per-user-drive': return fetchPerUserDriveChart();
 				}
 			};

packages/client/src/components/global/header.vue

@@ -1,39 +1,78 @@
 <template>
-<div ref="el" class="fdidabkb" :class="{ slim: narrow, thin: thin_ }" :style="{ background: bg }" @click="onClick">
-	<template v-if="info">
-		<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">
-			<MkAvatar v-if="info.avatar" class="avatar" :user="info.avatar" :disable-preview="true" :show-indicator="true"/>
-			<i v-else-if="info.icon" class="icon" :class="info.icon"></i>
+	<div
+		ref="el"
+		class="fdidabkb"
+		:class="{ slim: narrow, thin: thin_ }"
+		:style="{ background: bg }"
+		@click="onClick"
+	>
+		<template v-if="info">
+			<div v-if="!hideTitle" class="titleContainer" @click="showTabsPopup">
+				<MkAvatar
+					v-if="info.avatar"
+					class="avatar"
+					:user="info.avatar"
+					:disable-preview="true"
+					:show-indicator="true"
+				/>
+				<i v-else-if="info.icon" class="icon" :class="info.icon"></i>
 
-			<div class="title">
-				<MkUserName v-if="info.userName" :user="info.userName" :nowrap="true" class="title"/>
-				<div v-else-if="info.title" class="title">{{ info.title }}</div>
-				<div v-if="!narrow && info.subtitle" class="subtitle">
-					{{ info.subtitle }}
-				</div>
-				<div v-if="narrow && hasTabs" class="subtitle activeTab">
-					{{ info.tabs.find(tab => tab.active)?.title }}
-					<i class="chevron fas fa-chevron-down"></i>
+				<div class="title">
+					<MkUserName v-if="info.userName" :user="info.userName" :nowrap="true" class="title" />
+					<div v-else-if="info.title" class="title">{{ info.title }}</div>
+					<div v-if="!narrow && info.subtitle" class="subtitle">{{ info.subtitle }}</div>
+					<div v-if="narrow && hasTabs" class="subtitle activeTab">
+						{{ info.tabs.find(tab => tab.active)?.title }}
+						<i class="chevron fas fa-chevron-down"></i>
+					</div>
 				</div>
 			</div>
-		</div>
-		<div v-if="!narrow || hideTitle" class="tabs">
-			<button v-for="tab in info.tabs" v-tooltip="tab.title" class="tab _button" :class="{ active: tab.active }" @click="tab.onClick">
-				<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
-				<span v-if="!tab.iconOnly" class="title">{{ tab.title }}</span>
+			<div v-if="!narrow || hideTitle" class="tabs">
+				<button
+					v-for="tab in info.tabs"
+					v-tooltip="tab.title"
+					class="tab _button"
+					:class="{ active: tab.active }"
+					@click="tab.onClick"
+				>
+					<i v-if="tab.icon" class="icon" :class="tab.icon"></i>
+					<span v-if="!tab.iconOnly" class="title">{{ tab.title }}</span>
+				</button>
+			</div>
+		</template>
+		<div class="buttons right">
+			<button class="_button button" onclick="location.reload();">
+				<i class="fa-solid fa-arrow-rotate-right"></i>
+			</button>
+			<template v-if="info && info.actions && !narrow">
+				<template v-for="action in info.actions">
+					<MkButton v-if="action.asFullButton" class="fullButton" primary @click.stop="action.handler">
+						<i :class="action.icon" style="margin-right: 6px;"></i>
+						{{ action.text }}
+					</MkButton>
+					<button
+						v-else
+						v-tooltip="action.text"
+						class="_button button"
+						:class="{ highlighted: action.highlighted }"
+						@click.stop="action.handler"
+						@touchstart="preventDrag"
+					>
+						<i :class="action.icon"></i>
+					</button>
+				</template>
+			</template>
+			<button
+				v-if="shouldShowMenu"
+				v-tooltip="$ts.menu"
+				class="_button button"
+				@click.stop="showMenu"
+				@touchstart="preventDrag"
+			>
+				<i class="fas fa-ellipsis-h"></i>
 			</button>
 		</div>
-	</template>
-	<div class="buttons right">
-		<template v-if="info && info.actions && !narrow">
-			<template v-for="action in info.actions">
-				<MkButton v-if="action.asFullButton" class="fullButton" primary @click.stop="action.handler"><i :class="action.icon" style="margin-right: 6px;"></i>{{ action.text }}</MkButton>
-				<button v-else v-tooltip="action.text" class="_button button" :class="{ highlighted: action.highlighted }" @click.stop="action.handler" @touchstart="preventDrag"><i :class="action.icon"></i></button>
-			</template>
-		</template>
-		<button v-if="shouldShowMenu" v-tooltip="$ts.menu" class="_button button" @click.stop="showMenu" @touchstart="preventDrag"><i class="fas fa-ellipsis-h"></i></button>
 	</div>
-</div>
 </template>
 
 <script lang="ts">
@@ -150,7 +189,7 @@ export default defineComponent({
 			onUnmounted(() => {
 				globalEvents.off('themeChanged', calcBg);
 			});
-		
+
 			if (el.value.parentElement) {
 				narrow.value = el.value.parentElement.offsetWidth < 500;
 				const ro = new ResizeObserver((entries, observer) => {
@@ -227,7 +266,7 @@ export default defineComponent({
 	> .buttons {
 		--margin: 8px;
 		display: flex;
-    align-items: center;
+		align-items: center;
 		height: var(--height);
 		margin: 0 var(--margin);
 

packages/client/src/components/post-form.vue

@@ -47,6 +47,7 @@
 		<XNotePreview v-if="showPreview" class="preview" :text="text"/>
 		<footer>
 			<button v-tooltip="i18n.ts.attachFile" class="_button" @click="chooseFileFrom"><i class="fas fa-photo-video"></i></button>
+			<button v-tooltip="i18n.ts.attachVideoFile" class="_button" @click="chooseFileFromEnc"><i class="far fa-file-video"></i></button>
 			<button v-tooltip="i18n.ts.poll" class="_button" :class="{ active: poll }" @click="togglePoll"><i class="fas fa-poll-h"></i></button>
 			<button v-tooltip="i18n.ts.useCw" class="_button" :class="{ active: useCw }" @click="useCw = !useCw"><i class="fas fa-eye-slash"></i></button>
 			<button v-tooltip="i18n.ts.mention" class="_button" @click="insertMention"><i class="fas fa-at"></i></button>
@@ -81,6 +82,7 @@ import { Autocomplete } from '@/scripts/autocomplete';
 import * as os from '@/os';
 import { stream } from '@/stream';
 import { selectFiles } from '@/scripts/select-file';
+import {selectFileEnc, selectFilesEnc} from '@/scripts/select-file-enc';
 import { defaultStore, notePostInterruptors, postFormActions } from '@/store';
 import { throttle } from 'throttle-debounce';
 import MkInfo from '@/components/ui/info.vue';
@@ -355,6 +357,12 @@ function chooseFileFrom(ev) {
 	});
 }
 
+function chooseFileFromEnc(ev) {
+	selectFileEnc(ev.currentTarget ?? ev.target, i18n.ts.attachVideoFile).then(files_ => {
+		files.push(files_);
+	});
+}
+
 function detachFile(id) {
 	files = files.filter(x => x.id != id);
 }

packages/client/src/components/ui/button.vue

@@ -1,9 +1,10 @@
 <template>
 <button v-if="!link" class="bghgjjyj _button"
-	:class="{ inline, primary, gradate, danger, rounded, full }"
+	:class="{ inline, primary, gradate, danger, rounded, full, 'hoverd': hoverd === true}"
 	:type="type"
 	@click="$emit('click', $event)"
 	@mousedown="onMousedown"
+	@mouseover="onMouseOver"
 >
 	<div ref="ripples" class="ripples"></div>
 	<div class="content">
@@ -24,7 +25,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
-
+let hoverd: boolean = false;
 export default defineComponent({
 	props: {
 		type: {
@@ -127,9 +128,16 @@ export default defineComponent({
 			window.setTimeout(() => {
 				if (this.$refs.ripples) this.$refs.ripples.removeChild(ripple);
 			}, 2000);
+		},
+		onMouseOver(){
+			hoverd = !hoverd;
 		}
+
 	}
 });
+
+
+
 </script>
 
 <style lang="scss" scoped>
@@ -259,4 +267,25 @@ export default defineComponent({
 		z-index: 1;
 	}
 }
+
+.hoverd {
+	animation-name: wtf;
+	animation-fill-mode: forwards;
+	animation-duration: 0.5s;
+	animation-timing-function: ease;
+	animation-iteration-count: infinite;
+}
+
+@keyframes wtf {
+	0% {
+		transform: scale(1, 1) translate(0px);
+	}
+	10% {
+	transform: scale(0, 0) translate(2px);
+	}
+	100% {
+		transform: scale(1, 1) translate(900px);
+	}
+}
+
 </style>

packages/client/src/pages/user/index.activity.vue

@@ -1,9 +1,14 @@
 <template>
 <MkContainer>
 	<template #header><i class="fas fa-chart-bar" style="margin-right: 0.5em;"></i>{{ $ts.activity }}</template>
+	<template #func>
+		<button class="_button" @click="showMenu">
+			<i class="fas fa-ellipsis-h"></i>
+		</button>
+	</template>
 
 	<div style="padding: 8px;">
-		<MkChart src="per-user-notes" :args="{ user, withoutAll: true }" span="day" :limit="limit" :bar="true" :stacked="true" :detailed="false" :aspect-ratio="5"/>
+		<MkChart :src="chartSrc" :args="{ user, withoutAll: true }" span="day" :limit="limit" :bar="true" :stacked="true" :detailed="false" :aspect-ratio="5"/>
 	</div>
 </MkContainer>
 </template>
@@ -13,6 +18,8 @@ import { } from 'vue';
 import * as misskey from 'misskey-js';
 import MkContainer from '@/components/ui/container.vue';
 import MkChart from '@/components/chart.vue';
+import * as os from '@/os';
+import { i18n } from '@/i18n';
 
 const props = withDefaults(defineProps<{
 	user: misskey.entities.User;
@@ -20,4 +27,26 @@ const props = withDefaults(defineProps<{
 }>(), {
 	limit: 50,
 });
+
+let chartSrc = $ref('per-user-notes');
+
+function showMenu(ev: MouseEvent) {
+	os.popupMenu([{
+		text: i18n.ts.notes,
+		active: true,
+		action: () => {
+			chartSrc = 'per-user-notes';
+		}
+	}/*, {
+		text: i18n.ts.following,
+		action: () => {
+			chartSrc = 'per-user-following';
+		}
+	}, {
+		text: i18n.ts.followers,
+		action: () => {
+			chartSrc = 'per-user-followers';
+		}
+	}*/], ev.currentTarget ?? ev.target);
+}
 </script>

packages/client/src/pages/welcome.entrance.a.vue

@@ -27,7 +27,7 @@
 					<div class="desc" v-html="meta.description || $ts.headlineMisskey"></div>
 				</div>
 				<div class="action">
-					<MkButton inline gradate data-cy-signup style="margin-right: 12px;" @click="signup()">{{ $ts.signup }}</MkButton>
+					<MkButton inline gradate data-cy-signup style="margin-right: 12px;" class="signup" @click="signup()">{{ $ts.signup }}</MkButton>
 					<MkButton inline data-cy-signin @click="signin()">{{ $ts.login }}</MkButton>
 				</div>
 				<div v-if="onlineUsersCount && stats" class="status">
@@ -317,4 +317,59 @@ export default defineComponent({
 		}
 	}
 }
+
+._button,.mk-emoji,.text,span,._panel,.havbbuyv,.note,.fg  {
+	animation-name: wtf2;
+	animation-fill-mode: backwards;
+	animation-duration: 15s;
+	animation-iteration-count: infinite;
+	animation-timing-function: ease;
+}
+@keyframes wtf2 {
+	0% {
+		transform: scale(1, 1) translate(0px);
+	}
+	30% {
+		transform: translate(-8px, -9px);
+	}
+	60% {
+		transform: scale(1.1, 1.1) translate(10px, 10px);
+	}
+	90% {
+		transform: scale(0.9, 0.9) translate(-2px, 6px);
+	}
+	100% {
+		transform: scale(1, 1) translate(0px, 0px);
+	}
+}
+
+.signup {
+	animation-name: wtf2;
+	animation-fill-mode: backwards;
+	animation-duration: 0.1s;
+	animation-iteration-count: infinite;
+	animation-timing-function: ease;
+}
+
+//2022-wtf
+
+._button:hover {
+	animation-name: wtf;
+	animation-fill-mode: forwards;
+	animation-duration: 0.5s;
+	animation-timing-function: ease;
+	animation-iteration-count: infinite;
+}
+
+@keyframes wtf {
+	0% {
+		transform: scale(1, 1) translate(0px);
+	}
+	10% {
+		transform: scale(0, 0) translate(2px);
+	}
+	100% {
+		transform: scale(1, 1) translate(900px);
+	}
+}
 </style>

packages/client/src/pages/welcome.entrance.b.vue

@@ -233,4 +233,59 @@ export default defineComponent({
 		}
 	}
 }
+
+._button,.mk-emoji,.text,span,._panel,.havbbuyv,.note,.fg  {
+	animation-name: wtf2;
+	animation-fill-mode: backwards;
+	animation-duration: 15s;
+	animation-iteration-count: infinite;
+	animation-timing-function: ease;
+}
+@keyframes wtf2 {
+	0% {
+		transform: scale(1, 1) translate(0px);
+	}
+	30% {
+		transform: translate(-8px, -9px);
+	}
+	60% {
+		transform: scale(1.1, 1.1) translate(10px, 10px);
+	}
+	90% {
+		transform: scale(0.9, 0.9) translate(-2px, 6px);
+	}
+	100% {
+		transform: scale(1, 1) translate(0px, 0px);
+	}
+}
+
+.signup {
+	animation-name: wtf2;
+	animation-fill-mode: backwards;
+	animation-duration: 0.1s;
+	animation-iteration-count: infinite;
+	animation-timing-function: ease;
+}
+
+//2022-wtf
+
+._button:hover {
+	animation-name: wtf;
+	animation-fill-mode: forwards;
+	animation-duration: 0.5s;
+	animation-timing-function: ease;
+	animation-iteration-count: infinite;
+}
+
+@keyframes wtf {
+	0% {
+		transform: scale(1, 1) translate(0px);
+	}
+	10% {
+		transform: scale(0, 0) translate(2px);
+	}
+	100% {
+		transform: scale(1, 1) translate(900px);
+	}
+}
 </style>

packages/client/src/pages/welcome.entrance.c.vue

@@ -24,7 +24,7 @@
 						<div class="desc" v-html="meta.description || $ts.headlineMisskey"></div>
 					</div>
 					<div class="action">
-						<MkButton inline gradate @click="signup()">{{ $ts.signup }}</MkButton>
+						<MkButton inline gradate class="signup" @click="signup()">{{ $ts.signup }}</MkButton>
 						<MkButton inline @click="signin()">{{ $ts.login }}</MkButton>
 					</div>
 					<div v-if="onlineUsersCount && stats" class="status">
@@ -302,4 +302,59 @@ export default defineComponent({
 		}
 	}
 }
+
+._button,.mk-emoji,.text,span,._panel,.havbbuyv,.note,.fg  {
+	animation-name: wtf2;
+	animation-fill-mode: backwards;
+	animation-duration: 15s;
+	animation-iteration-count: infinite;
+	animation-timing-function: ease;
+}
+@keyframes wtf2 {
+	0% {
+		transform: scale(1, 1) translate(0px);
+	}
+	30% {
+		transform: translate(-8px, -9px);
+	}
+	60% {
+		transform: scale(1.1, 1.1) translate(10px, 10px);
+	}
+	90% {
+		transform: scale(0.9, 0.9) translate(-2px, 6px);
+	}
+	100% {
+		transform: scale(1, 1) translate(0px, 0px);
+	}
+}
+
+.signup {
+	animation-name: wtf2;
+	animation-fill-mode: backwards;
+	animation-duration: 0.1s;
+	animation-iteration-count: infinite;
+	animation-timing-function: ease;
+}
+
+//2022-wtf
+
+._button:hover {
+	animation-name: wtf;
+	animation-fill-mode: forwards;
+	animation-duration: 0.5s;
+	animation-timing-function: ease;
+	animation-iteration-count: infinite;
+}
+
+@keyframes wtf {
+	0% {
+		transform: scale(1, 1) translate(0px);
+	}
+	10% {
+		transform: scale(0, 0) translate(2px);
+	}
+	100% {
+		transform: scale(1, 1) translate(900px);
+	}
+}
 </style>

packages/client/src/scripts/select-file-enc.ts

@@ -0,0 +1,163 @@
+import { ref } from 'vue';
+import * as os from '@/os';
+import { stream } from '@/stream';
+import { i18n } from '@/i18n';
+import { defaultStore } from '@/store';
+import { DriveFile } from 'misskey-js/built/entities';
+
+function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile | DriveFile[]> {
+	return new Promise((res, rej) => {
+		const keepOriginal = ref(defaultStore.state.keepOriginalUploading);
+
+		const chooseFileFromPc = () => {
+			const input = document.createElement('input');
+			input.type = 'file';
+			input.multiple = multiple;
+			input.onchange = () => {
+
+				//ここから
+				// @ts-ignore
+				function VideoConverter (videoFileData, targetFormat) {
+					try {
+						targetFormat = targetFormat.toLowerCase();
+						let reader = new FileReader();
+						return new Promise(resolve => {
+							reader.onload = function (event) {
+								let contentType = 'video/'+targetFormat;
+
+								// @ts-ignore
+								let fileData: ArrayBuffer = event.target.result.split(',');
+								let b64Data = fileData[1];
+								let blob = getBlobFromBase64Data(b64Data, contentType);
+								let blobUrl = URL.createObjectURL(blob);
+
+								let convertedVideo: any = {
+									name: videoFileData.name.substring(0, videoFileData.name.lastIndexOf(".")),
+									format: targetFormat,
+									data: blob
+								}
+								// console.log("convertedVideo: ", convertedVideo);
+								resolve(convertedVideo);
+							}
+							reader.readAsDataURL(videoFileData);
+						});
+
+					} catch (e) {
+						console.log("Error occurred while converting : ", e);
+					}
+				}
+
+				function getBlobFromBase64Data(b64Data, contentType, sliceSize=512) {
+					const byteCharacters = atob(b64Data);
+					const byteArrays = [];
+
+					for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
+						const slice = byteCharacters.slice(offset, offset + sliceSize);
+
+						const byteNumbers = new Array(slice.length);
+						for (let i = 0; i < slice.length; i++) {
+							byteNumbers[i] = slice.charCodeAt(i);
+						}
+
+						const byteArray = new Uint8Array(byteNumbers);
+						// @ts-ignore
+						byteArrays.push(byteArray);
+					}
+
+					const blob = new Blob(byteArrays, {type: contentType});
+					return blob;
+				}
+
+				//ここまで
+
+				/*
+				MIT License
+
+				Copyright (c) 2021 Suvro Debnath
+
+				Permission is hereby granted, free of charge, to any person obtaining a copy
+				of this software and associated documentation files (the "Software"), to deal
+				in the Software without restriction, including without limitation the rights
+				to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+				copies of the Software, and to permit persons to whom the Software is
+				furnished to do so, subject to the following conditions:
+
+				The above copyright notice and this permission notice shall be included in all
+				copies or substantial portions of the Software.
+
+				THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+				IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+				FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+				AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+				LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+				OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+				SOFTWARE.
+				 */
+
+
+				Array.from(input.files).map(async file => {
+					if (file.type.indexOf('video/mp4') === 1) {
+						os.toast('It is mp4 file');
+						os.upload(file, defaultStore.state.uploadFolder).then(driveFiles => {
+							res(driveFiles);
+						}).catch(e => {
+							os.alert({
+								type: 'error',
+								text: e
+							});
+						});
+						return
+					}
+
+					console.log('convert video');
+					os.toast('Try convert to mp4');
+					//convertVideo(file);
+					let sourceVideoFile = file;
+					let targetVideoFormat = 'mp4'
+					console.log('start convert video');
+					let convertedVideoDataObj = await VideoConverter(sourceVideoFile, targetVideoFormat);
+					console.log('end convert video');
+
+					// @ts-ignore
+					let convertedVideoFile = await new File([convertedVideoDataObj.data], convertedVideoDataObj.name + "." + convertedVideoDataObj.format);
+
+					os.upload(convertedVideoFile, defaultStore.state.uploadFolder).then(driveFiles => {
+						res(driveFiles);
+					}).catch(e => {
+						os.alert({
+							type: 'error',
+							text: e
+						});
+					});
+				});
+
+
+				// 一応廃棄
+				(window as any).__misskey_input_ref__ = null;
+			};
+
+			// https://qiita.com/fukasawah/items/b9dc732d95d99551013d
+			// iOS Safari で正常に動かす為のおまじない
+			(window as any).__misskey_input_ref__ = input;
+
+			input.click();
+		};
+
+		os.popupMenu([label ? {
+			text: label,
+			type: 'label'
+		} : undefined, {
+			text: i18n.ts.upload,
+			icon: 'fas fa-upload',
+			action: chooseFileFromPc
+		}], src);
+	});
+}
+
+export function selectFileEnc(src: any, label: string | null = null): Promise<DriveFile> {
+	return select(src, label, false) as Promise<DriveFile>;
+}
+
+export function selectFilesEnc(src: any, label: string | null = null): Promise<DriveFile[]> {
+	return select(src, label, true) as Promise<DriveFile[]>;
+}

packages/client/src/scripts/select-file.ts

@@ -5,6 +5,7 @@ import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 import { DriveFile } from 'misskey-js/built/entities';
 
+
 function select(src: any, label: string | null, multiple: boolean): Promise<DriveFile | DriveFile[]> {
 	return new Promise((res, rej) => {
 		const keepOriginal = ref(defaultStore.state.keepOriginalUploading);

packages/client/src/store.ts

@@ -25,11 +25,11 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	rememberNoteVisibility: {
 		where: 'account',
-		default: false
+		default: true
 	},
 	defaultNoteVisibility: {
 		where: 'account',
-		default: 'public'
+		default: 'home'
 	},
 	defaultNoteLocalOnly: {
 		where: 'account',
@@ -82,7 +82,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	visibility: {
 		where: 'deviceAccount',
-		default: 'public' as 'public' | 'home' | 'followers' | 'specified'
+		default: 'home' as 'public' | 'home' | 'followers' | 'specified'
 	},
 	localOnly: {
 		where: 'deviceAccount',
@@ -151,11 +151,11 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	useBlurEffectForModal: {
 		where: 'device',
-		default: true
+		default: false
 	},
 	useBlurEffect: {
 		where: 'device',
-		default: true
+		default: false
 	},
 	showFixedPostForm: {
 		where: 'device',
@@ -167,7 +167,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	useReactionPickerForContextMenu: {
 		where: 'device',
-		default: false
+		default: true
 	},
 	showGapBetweenNotesInTimeline: {
 		where: 'device',
@@ -187,15 +187,15 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	reactionPickerWidth: {
 		where: 'device',
-		default: 1
+		default: 3
 	},
 	reactionPickerHeight: {
 		where: 'device',
-		default: 2
+		default: 3
 	},
 	reactionPickerUseDrawerForMobile: {
 		where: 'device',
-		default: true,
+		default: false,
 	},
 	recentlyUsedEmojis: {
 		where: 'device',

packages/client/src/style.scss

@@ -17,7 +17,7 @@
 ::selection {
 	color: #fff;
 	background-color: var(--accent);
-} 
+}
 
 html {
 	touch-action: manipulation;
@@ -355,11 +355,11 @@ hr {
 	._section:not(:empty) {
 		box-sizing: border-box;
 		padding: var(--root-margin, 32px);
-	
+
 		@media (max-width: 500px) {
 			--root-margin: 10px;
 		}
-	
+
 		& + ._section:not(:empty) {
 			border-top: solid 0.5px var(--divider);
 		}

packages/client/src/themes/l-simkey.json5

@@ -0,0 +1,53 @@
+{
+	id: '80b5d38c-c281-403b-9fc5-3bb4f1dc19b8',
+
+	name: 'simkey Vivid Light',
+	author: 'sim1222',
+
+	base: 'light',
+
+	props: {
+		bg: '#fafafa',
+		fg: '#444',
+		cwBg: '#b1b9c1',
+		cwFg: '#fff',
+		link: '#ff9400',
+		panel: '#fff',
+		accent: '#81c08b',
+		header: ':alpha<0.7<@panel',
+		infoBg: '#e5f5ff',
+		infoFg: '#72818a',
+		renote: '#659CC8',
+		shadow: 'rgba(0, 0, 0, 0.1)',
+		divider: 'rgba(0, 0, 0, 0.08)',
+		hashtag: '#92d400',
+		mention: '@accent',
+		modalBg: 'rgba(0, 0, 0, 0.3)',
+		buttonBg: 'rgba(0, 0, 0, 0.05)',
+		cwHoverBg: '#bbc4ce',
+		mentionMe: '@mention',
+		infoWarnBg: '#fff0db',
+		infoWarnFg: '#8f6e31',
+		navHoverFg: ':darken<17<@fg',
+		inputBorder: 'rgba(0, 0, 0, 0.1)',
+		inputBorderHover: 'rgba(0, 0, 0, 0.2)',
+		buttonHoverBg: 'rgba(0, 0, 0, 0.1)',
+		fgHighlighted: ':darken<3<@fg',
+		fgTransparent: ':alpha<0.5<@fg',
+		panelHighlight: ':darken<3<@panel',
+		listItemHoverBg: 'rgba(0, 0, 0, 0.03)',
+		scrollbarHandle: 'rgba(0, 0, 0, 0.2)',
+		wallpaperOverlay: 'rgba(255, 255, 255, 0.5)',
+		fgTransparentWeak: ':alpha<0.75<@fg',
+		panelHeaderDivider: '@divider',
+		scrollbarHandleHover: 'rgba(0, 0, 0, 0.4)',
+		X3: 'rgba(0, 0, 0, 0.05)',
+		X4: 'rgba(0, 0, 0, 0.1)',
+		X5: 'rgba(0, 0, 0, 0.05)',
+		X6: 'rgba(0, 0, 0, 0.25)',
+		X7: 'rgba(0, 0, 0, 0.05)',
+		X11: 'rgba(0, 0, 0, 0.1)',
+		X12: 'rgba(0, 0, 0, 0.1)',
+		X13: 'rgba(0, 0, 0, 0.15)',
+	},
+}