-
{{ i18n.ts.following }}
{{ user.followingCount }}
+
+
{{ i18n.ts.following }}
{{ number(user.followingCount) }}
-
-
{{ i18n.ts.followers }}
{{ user.followersCount }}
+
+
{{ i18n.ts.followers }}
{{ number(user.followersCount) }}
@@ -31,9 +31,11 @@
diff --git a/packages/frontend/src/components/global/i18n.ts b/packages/frontend/src/components/global/i18n.ts
index 2708b759aa84..6706d08f2f9f 100644
--- a/packages/frontend/src/components/global/i18n.ts
+++ b/packages/frontend/src/components/global/i18n.ts
@@ -11,13 +11,13 @@ export default function(props: { src: string; tag?: string; textTag?: string; },
parsed.push(str);
break;
} else {
- if (nextBracketOpen > 0) parsed.push(str.substr(0, nextBracketOpen));
+ if (nextBracketOpen > 0) parsed.push(str.substring(0, nextBracketOpen));
parsed.push({
arg: str.substring(nextBracketOpen + 1, nextBracketClose),
});
}
- str = str.substr(nextBracketClose + 1);
+ str = str.substring(nextBracketClose + 1);
}
return h(props.tag ?? 'span', parsed.map(x => typeof x === 'string' ? (props.textTag ? h(props.textTag, x) : x) : slots[x.arg]()));
diff --git a/packages/frontend/src/const.ts b/packages/frontend/src/const.ts
index ad7fa372e97c..1d883c038ea6 100644
--- a/packages/frontend/src/const.ts
+++ b/packages/frontend/src/const.ts
@@ -57,6 +57,9 @@ export const ROLE_POLICIES = [
'ltlAvailable',
'canPublicNote',
'canInvite',
+ 'inviteLimit',
+ 'inviteLimitCycle',
+ 'inviteExpirationTime',
'canManageCustomEmojis',
'canSearchNotes',
'canHideAds',
diff --git a/packages/frontend/src/directives/adaptive-bg.ts b/packages/frontend/src/directives/adaptive-bg.ts
index 313aad79964c..83bcd7089d5d 100644
--- a/packages/frontend/src/directives/adaptive-bg.ts
+++ b/packages/frontend/src/directives/adaptive-bg.ts
@@ -10,7 +10,7 @@ export default {
return el.parentElement ? getBgColor(el.parentElement) : 'transparent';
}
};
-
+
const parentBg = getBgColor(src.parentElement);
const myBg = window.getComputedStyle(src).backgroundColor;
diff --git a/packages/frontend/src/directives/adaptive-border.ts b/packages/frontend/src/directives/adaptive-border.ts
index 619c9f0b6d50..5bd04024beef 100644
--- a/packages/frontend/src/directives/adaptive-border.ts
+++ b/packages/frontend/src/directives/adaptive-border.ts
@@ -10,7 +10,7 @@ export default {
return el.parentElement ? getBgColor(el.parentElement) : 'transparent';
}
};
-
+
const parentBg = getBgColor(src.parentElement);
const myBg = window.getComputedStyle(src).backgroundColor;
diff --git a/packages/frontend/src/directives/panel.ts b/packages/frontend/src/directives/panel.ts
index d31dc41ed416..8727183d3652 100644
--- a/packages/frontend/src/directives/panel.ts
+++ b/packages/frontend/src/directives/panel.ts
@@ -10,7 +10,7 @@ export default {
return el.parentElement ? getBgColor(el.parentElement) : 'transparent';
}
};
-
+
const parentBg = getBgColor(src.parentElement);
const myBg = getComputedStyle(document.documentElement).getPropertyValue('--panel');
diff --git a/packages/frontend/src/filters/date.ts b/packages/frontend/src/filters/date.ts
index 706b7d60cc12..9bc9bfe8abb7 100644
--- a/packages/frontend/src/filters/date.ts
+++ b/packages/frontend/src/filters/date.ts
@@ -1,4 +1,4 @@
import { dateTimeFormat } from '@/scripts/intl-const';
-export default (d: Date | number | undefined) => dateTimeFormat.format(d);
+export default (d: Date | number | undefined) => dateTimeFormat.format(d);
export const dateString = (d: string) => dateTimeFormat.format(new Date(d));
diff --git a/packages/frontend/src/local-storage.ts b/packages/frontend/src/local-storage.ts
index ca4f21f79b06..f9d04f7950af 100644
--- a/packages/frontend/src/local-storage.ts
+++ b/packages/frontend/src/local-storage.ts
@@ -14,7 +14,7 @@ type Keys =
'wallpaper' |
'theme' |
'colorScheme' |
- 'useSystemFont' |
+ 'useSystemFont' |
'fontSize' |
'ui' |
'ui_temp' |
diff --git a/packages/frontend/src/nirax.ts b/packages/frontend/src/nirax.ts
index 68977ed796fa..3a03444de231 100644
--- a/packages/frontend/src/nirax.ts
+++ b/packages/frontend/src/nirax.ts
@@ -1,8 +1,7 @@
// NIRAX --- A lightweight router
import { EventEmitter } from 'eventemitter3';
-import { Component, shallowRef, ShallowRef } from 'vue';
-import { pleaseLogin } from '@/scripts/please-login';
+import { Component, onMounted, shallowRef, ShallowRef } from 'vue';
import { safeURIDecode } from '@/scripts/safe-uri-decode';
type RouteDef = {
@@ -23,7 +22,7 @@ type ParsedPath = (string | {
optional?: boolean;
})[];
-export type Resolved = { route: RouteDef; props: Map
; child?: Resolved; };
+export type Resolved = { route: RouteDef; props: Map; child?: Resolved; };
function parsePath(path: string): ParsedPath {
const res = [] as ParsedPath;
@@ -75,15 +74,19 @@ export class Router extends EventEmitter<{
public currentRef: ShallowRef = shallowRef();
public currentRoute: ShallowRef = shallowRef();
private currentPath: string;
+ private isLoggedIn: boolean;
+ private notFoundPageComponent: Component;
private currentKey = Date.now().toString();
public navHook: ((path: string, flag?: any) => boolean) | null = null;
- constructor(routes: Router['routes'], currentPath: Router['currentPath']) {
+ constructor(routes: Router['routes'], currentPath: Router['currentPath'], isLoggedIn: boolean, notFoundPageComponent: Component) {
super();
this.routes = routes;
this.currentPath = currentPath;
+ this.isLoggedIn = isLoggedIn;
+ this.notFoundPageComponent = notFoundPageComponent;
this.navigate(currentPath, null, false);
}
@@ -159,11 +162,11 @@ export class Router extends EventEmitter<{
if (route.hash != null && hash != null) {
props.set(route.hash, safeURIDecode(hash));
}
-
+
if (route.query != null && queryString != null) {
const queryObject = [...new URLSearchParams(queryString).entries()]
.reduce((obj, entry) => ({ ...obj, [entry[0]]: entry[1] }), {});
-
+
for (const q in route.query) {
const as = route.query[q];
if (queryObject[q]) {
@@ -171,7 +174,7 @@ export class Router extends EventEmitter<{
}
}
}
-
+
return {
route,
props,
@@ -212,8 +215,9 @@ export class Router extends EventEmitter<{
throw new Error('no route found for: ' + path);
}
- if (res.route.loginRequired) {
- pleaseLogin('/');
+ if (res.route.loginRequired && !this.isLoggedIn) {
+ res.route.component = this.notFoundPageComponent;
+ res.props.set('showLoginPopup', true);
}
const isSamePath = beforePath === path;
@@ -263,13 +267,33 @@ export class Router extends EventEmitter<{
});
}
- public replace(path: string, key?: string | null, emitEvent = true) {
+ public replace(path: string, key?: string | null) {
this.navigate(path, key);
- if (emitEvent) {
- this.emit('replace', {
- path,
- key: this.currentKey,
- });
- }
}
}
+
+export function useScrollPositionManager(getScrollContainer: () => HTMLElement, router: Router) {
+ const scrollPosStore = new Map();
+
+ onMounted(() => {
+ const scrollContainer = getScrollContainer();
+
+ scrollContainer.addEventListener('scroll', () => {
+ scrollPosStore.set(router.getCurrentKey(), scrollContainer.scrollTop);
+ }, { passive: true });
+
+ router.addListener('change', ctx => {
+ const scrollPos = scrollPosStore.get(ctx.key) ?? 0;
+ scrollContainer.scroll({ top: scrollPos, behavior: 'instant' });
+ if (scrollPos !== 0) {
+ window.setTimeout(() => { // 遷移直後はタイミングによってはコンポーネントが復元し切ってない可能性も考えられるため少し時間を空けて再度スクロール
+ scrollContainer.scroll({ top: scrollPos, behavior: 'instant' });
+ }, 100);
+ }
+ });
+
+ router.addListener('same', () => {
+ scrollContainer.scroll({ top: 0, behavior: 'smooth' });
+ });
+ });
+}
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index c44d3480462a..1a5ed90541c9 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -460,11 +460,13 @@ export async function pickEmoji(src: HTMLElement | null, opts) {
export async function cropImage(image: Misskey.entities.DriveFile, options: {
aspectRatio: number;
+ uploadFolder?: string | null;
}): Promise {
return new Promise((resolve, reject) => {
popup(defineAsyncComponent(() => import('@/components/MkCropperDialog.vue')), {
file: image,
aspectRatio: options.aspectRatio,
+ uploadFolder: options.uploadFolder,
}, {
ok: x => {
resolve(x);
diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 0017145fa151..6d2f7e155e44 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -88,10 +88,13 @@
Special thanks
@@ -155,6 +158,30 @@ const patronsWithIcon = [{
}, {
name: 'spinlock',
icon: 'https://misskey-hub.net/patrons/6a1cebc819d540a78bf20e9e3115baa8.jpg',
+}, {
+ name: 'じゅくま',
+ icon: 'https://misskey-hub.net/patrons/3e56bdac69dd42f7a06e0f12cf2fc895.jpg',
+}, {
+ name: '清遊あみ',
+ icon: 'https://misskey-hub.net/patrons/de25195b88e940a388388bea2e7637d8.jpg',
+}, {
+ name: 'Nagi8410',
+ icon: 'https://misskey-hub.net/patrons/31b102ab4fc540ed806b0461575d38be.jpg',
+}, {
+ name: '山岡士郎',
+ icon: 'https://misskey-hub.net/patrons/84b9056341684266bb1eda3e680d094d.jpg',
+}, {
+ name: 'よもやまたろう',
+ icon: 'https://misskey-hub.net/patrons/4273c9cce50d445f8f7d0f16113d6d7f.jpg',
+}, {
+ name: '花咲ももか',
+ icon: 'https://misskey-hub.net/patrons/8c9b2b9128cb4fee99f04bb4f86f2efa.jpg',
+}, {
+ name: 'カガミ',
+ icon: 'https://misskey-hub.net/patrons/226ea3a4617749548580ec2d9a263e24.jpg',
+}, {
+ name: 'フランギ・シュウ',
+ icon: 'https://misskey-hub.net/patrons/3016d37e35f3430b90420176c912d304.jpg',
}];
const patrons = [
@@ -250,6 +277,9 @@ const patrons = [
'binvinyl',
'渡志郎',
'ぷーざ',
+ '越貝鯛丸',
+ 'Nick / pprmint.',
+ 'kino3277',
];
let thereIsTreasure = $ref($i && !claimedAchievements.includes('foundTreasure'));
diff --git a/packages/frontend/src/pages/about.emojis.vue b/packages/frontend/src/pages/about.emojis.vue
index 3744bed10ff6..cc0bf2eed21c 100644
--- a/packages/frontend/src/pages/about.emojis.vue
+++ b/packages/frontend/src/pages/about.emojis.vue
@@ -20,7 +20,7 @@
