From 605f1492350c6f90108018d895e47fbc37197c4a Mon Sep 17 00:00:00 2001
From: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>
Date: Thu, 13 Apr 2023 13:17:32 +0900
Subject: [PATCH 1/9] =?UTF-8?q?feat:=20=E8=87=AA=E5=88=86=E7=94=A8?=
=?UTF-8?q?=E3=83=A1=E3=83=A2=E6=A9=9F=E8=83=BD=20(#10516)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* 自分用メモを作成する機能
* 不要なCSSを削除
* メモ: デザイン調整
* デザイン崩れを修正
* fix: メモ機能のe2eテストで見つかった不具合を修正
* デザイン調整
* fix(frontend): 自分用メモtextareaにline-heightが適用されない問題を修正
---
locales/ja-JP.yml | 1 +
.../migration/1680702787050-UserMemo.js | 18 ++++
.../src/core/entities/UserEntityService.ts | 14 ++-
packages/backend/src/di-symbols.ts | 1 +
.../backend/src/models/RepositoryModule.ts | 10 +-
.../backend/src/models/entities/UserMemo.ts | 42 ++++++++
packages/backend/src/models/index.ts | 3 +
.../backend/src/models/json-schema/user.ts | 4 +
packages/backend/src/postgres.ts | 2 +
.../backend/src/server/api/EndpointsModule.ts | 4 +
packages/backend/src/server/api/endpoints.ts | 2 +
.../server/api/endpoints/users/update-memo.ts | 85 +++++++++++++++++
packages/backend/test/e2e/endpoints.ts | 80 ++++++++++++++++
packages/frontend/src/pages/user/home.vue | 95 ++++++++++++++++++-
14 files changed, 358 insertions(+), 3 deletions(-)
create mode 100644 packages/backend/migration/1680702787050-UserMemo.js
create mode 100644 packages/backend/src/models/entities/UserMemo.ts
create mode 100644 packages/backend/src/server/api/endpoints/users/update-memo.ts
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 092a4aed32..83186dc729 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -993,6 +993,7 @@ noteIdOrUrl: "ノートIDまたはURL"
accountMigration: "アカウントの引っ越し"
accountMoved: "このユーザーは新しいアカウントに引っ越しました："
forceShowAds: "常に広告を表示する"
+addMemo: "メモを追加"
_accountMigration:
moveTo: "このアカウントを新しいアカウントに引っ越す"
diff --git a/packages/backend/migration/1680702787050-UserMemo.js b/packages/backend/migration/1680702787050-UserMemo.js
new file mode 100644
index 0000000000..7446bf8da5
--- /dev/null
+++ b/packages/backend/migration/1680702787050-UserMemo.js
@@ -0,0 +1,18 @@
+export class UserMemo1680702787050 {
+ name = 'UserMemo1680702787050'
+
+ async up(queryRunner) {
+ await queryRunner.query(`CREATE TABLE "user_memo" ("id" character varying(32) NOT NULL, "userId" character varying(32) NOT NULL, "targetUserId" character varying(32) NOT NULL, "memo" character varying(2048) NOT NULL, CONSTRAINT "PK_e9aaa58f7d3699a84d79078f4d9" PRIMARY KEY ("id")); COMMENT ON COLUMN "user_memo"."userId" IS 'The ID of author.'; COMMENT ON COLUMN "user_memo"."targetUserId" IS 'The ID of target user.'; COMMENT ON COLUMN "user_memo"."memo" IS 'Memo.'`);
+ await queryRunner.query(`CREATE INDEX "IDX_650b49c5639b5840ee6a2b8f83" ON "user_memo" ("userId") `);
+ await queryRunner.query(`CREATE INDEX "IDX_66ac4a82894297fd09ba61f3d3" ON "user_memo" ("targetUserId") `);
+ await queryRunner.query(`CREATE UNIQUE INDEX "IDX_faef300913c738265638ba3ebc" ON "user_memo" ("userId", "targetUserId") `);
+ await queryRunner.query(`ALTER TABLE "user_memo" ADD CONSTRAINT "FK_650b49c5639b5840ee6a2b8f83e" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+ await queryRunner.query(`ALTER TABLE "user_memo" ADD CONSTRAINT "FK_66ac4a82894297fd09ba61f3d35" FOREIGN KEY ("targetUserId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+ }
+
+ async down(queryRunner) {
+ await queryRunner.query(`ALTER TABLE "user_memo" DROP CONSTRAINT "FK_66ac4a82894297fd09ba61f3d35"`);
+ await queryRunner.query(`ALTER TABLE "user_memo" DROP CONSTRAINT "FK_650b49c5639b5840ee6a2b8f83e"`);
+ await queryRunner.query(`DROP TABLE "user_memo"`);
+ }
+}
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index e02f7535d4..3f8254bb6c 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -12,7 +12,7 @@ import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD } from '@/const.js';
import type { Instance } from '@/models/entities/Instance.js';
import type { LocalUser, RemoteUser, User } from '@/models/entities/User.js';
import { birthdaySchema, descriptionSchema, localUsernameSchema, locationSchema, nameSchema, passwordSchema } from '@/models/entities/User.js';
-import type { UsersRepository, UserSecurityKeysRepository, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, DriveFilesRepository, NoteUnreadsRepository, ChannelFollowingsRepository, UserNotePiningsRepository, UserProfilesRepository, InstancesRepository, AnnouncementReadsRepository, AnnouncementsRepository, PagesRepository, UserProfile, RenoteMutingsRepository } from '@/models/index.js';
+import type { UsersRepository, UserSecurityKeysRepository, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, DriveFilesRepository, NoteUnreadsRepository, ChannelFollowingsRepository, UserNotePiningsRepository, UserProfilesRepository, InstancesRepository, AnnouncementReadsRepository, AnnouncementsRepository, PagesRepository, UserProfile, RenoteMutingsRepository, UserMemoRepository } from '@/models/index.js';
import { bindThis } from '@/decorators.js';
import { RoleService } from '@/core/RoleService.js';
import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
@@ -113,6 +113,9 @@ export class UserEntityService implements OnModuleInit {
@Inject(DI.pagesRepository)
private pagesRepository: PagesRepository,
+
+ @Inject(DI.userMemoRepository)
+ private userMemoRepository: UserMemoRepository,
//private noteEntityService: NoteEntityService,
//private driveFileEntityService: DriveFileEntityService,
@@ -337,6 +340,11 @@ export class UserEntityService implements OnModuleInit {
const falsy = opts.detail ? false : undefined;
+ const memo = meId == null ? null : await this.userMemoRepository.findOneBy({
+ userId: meId,
+ targetUserId: user.id,
+ }).then(row => row?.memo ?? null);
+
const packed = {
id: user.id,
name: user.name,
@@ -476,6 +484,10 @@ export class UserEntityService implements OnModuleInit {
isMuted: relation.isMuted,
isRenoteMuted: relation.isRenoteMuted,
} : {}),
+
+ ...(memo ? {
+ memo,
+ } : {}),
} as Promiseable<Packed<'User'>> as Promiseable<IsMeAndIsUserDetailed<ExpectsMe, D>>;
return await awaitAll(packed);
diff --git a/packages/backend/src/di-symbols.ts b/packages/backend/src/di-symbols.ts
index d4b1fb31b1..b93ba899fb 100644
--- a/packages/backend/src/di-symbols.ts
+++ b/packages/backend/src/di-symbols.ts
@@ -70,5 +70,6 @@ export const DI = {
roleAssignmentsRepository: Symbol('roleAssignmentsRepository'),
flashsRepository: Symbol('flashsRepository'),
flashLikesRepository: Symbol('flashLikesRepository'),
+ userMemoRepository: Symbol('userMemoRepository'),
//#endregion
};
diff --git a/packages/backend/src/models/RepositoryModule.ts b/packages/backend/src/models/RepositoryModule.ts
index 7be7b81904..a415e37904 100644
--- a/packages/backend/src/models/RepositoryModule.ts
+++ b/packages/backend/src/models/RepositoryModule.ts
@@ -1,6 +1,6 @@
import { Module } from '@nestjs/common';
import { DI } from '@/di-symbols.js';
-import { User, Note, Announcement, AnnouncementRead, App, NoteFavorite, NoteThreadMuting, NoteReaction, NoteUnread, Poll, PollVote, UserProfile, UserKeypair, UserPending, AttestationChallenge, UserSecurityKey, UserPublickey, UserList, UserListJoining, UserNotePining, UserIp, UsedUsername, Following, FollowRequest, Instance, Emoji, DriveFile, DriveFolder, Meta, Muting, RenoteMuting, Blocking, SwSubscription, Hashtag, AbuseUserReport, RegistrationTicket, AuthSession, AccessToken, Signin, Page, PageLike, GalleryPost, GalleryLike, ModerationLog, Clip, ClipNote, Antenna, PromoNote, PromoRead, Relay, MutedNote, Channel, ChannelFollowing, ChannelFavorite, RegistryItem, Webhook, Ad, PasswordResetRequest, RetentionAggregation, FlashLike, Flash, Role, RoleAssignment, ClipFavorite } from './index.js';
+import { User, Note, Announcement, AnnouncementRead, App, NoteFavorite, NoteThreadMuting, NoteReaction, NoteUnread, Poll, PollVote, UserProfile, UserKeypair, UserPending, AttestationChallenge, UserSecurityKey, UserPublickey, UserList, UserListJoining, UserNotePining, UserIp, UsedUsername, Following, FollowRequest, Instance, Emoji, DriveFile, DriveFolder, Meta, Muting, RenoteMuting, Blocking, SwSubscription, Hashtag, AbuseUserReport, RegistrationTicket, AuthSession, AccessToken, Signin, Page, PageLike, GalleryPost, GalleryLike, ModerationLog, Clip, ClipNote, Antenna, PromoNote, PromoRead, Relay, MutedNote, Channel, ChannelFollowing, ChannelFavorite, RegistryItem, Webhook, Ad, PasswordResetRequest, RetentionAggregation, FlashLike, Flash, Role, RoleAssignment, ClipFavorite, UserMemo } from './index.js';
import type { DataSource } from 'typeorm';
import type { Provider } from '@nestjs/common';
@@ -388,6 +388,12 @@ const $roleAssignmentsRepository: Provider = {
inject: [DI.db],
};
+const $userMemoRepository: Provider = {
+ provide: DI.userMemoRepository,
+ useFactory: (db: DataSource) => db.getRepository(UserMemo),
+ inject: [DI.db],
+};
+
@Module({
imports: [
],
@@ -456,6 +462,7 @@ const $roleAssignmentsRepository: Provider = {
$roleAssignmentsRepository,
$flashsRepository,
$flashLikesRepository,
+ $userMemoRepository,
],
exports: [
$usersRepository,
@@ -522,6 +529,7 @@ const $roleAssignmentsRepository: Provider = {
$roleAssignmentsRepository,
$flashsRepository,
$flashLikesRepository,
+ $userMemoRepository,
],
})
export class RepositoryModule {}
diff --git a/packages/backend/src/models/entities/UserMemo.ts b/packages/backend/src/models/entities/UserMemo.ts
new file mode 100644
index 0000000000..7dc34b4346
--- /dev/null
+++ b/packages/backend/src/models/entities/UserMemo.ts
@@ -0,0 +1,42 @@
+import { Column, Entity, Index, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm';
+import { id } from '../id.js';
+import { User } from './User.js';
+
+@Entity()
+@Index(['userId', 'targetUserId'], { unique: true })
+export class UserMemo {
+ @PrimaryColumn(id())
+ public id: string;
+
+ @Index()
+ @Column({
+ ...id(),
+ comment: 'The ID of author.',
+ })
+ public userId: User['id'];
+
+ @ManyToOne(type => User, {
+ onDelete: 'CASCADE',
+ })
+ @JoinColumn()
+ public user: User | null;
+
+ @Index()
+ @Column({
+ ...id(),
+ comment: 'The ID of target user.',
+ })
+ public targetUserId: User['id'];
+
+ @ManyToOne(type => User, {
+ onDelete: 'CASCADE',
+ })
+ @JoinColumn()
+ public targetUser: User | null;
+
+ @Column('varchar', {
+ length: 2048,
+ comment: 'Memo.',
+ })
+ public memo: string;
+}
diff --git a/packages/backend/src/models/index.ts b/packages/backend/src/models/index.ts
index 48d6e15f2a..b8ba28db9b 100644
--- a/packages/backend/src/models/index.ts
+++ b/packages/backend/src/models/index.ts
@@ -55,6 +55,7 @@ import { UserPending } from '@/models/entities/UserPending.js';
import { UserProfile } from '@/models/entities/UserProfile.js';
import { UserPublickey } from '@/models/entities/UserPublickey.js';
import { UserSecurityKey } from '@/models/entities/UserSecurityKey.js';
+import { UserMemo } from '@/models/entities/UserMemo.js';
import { Webhook } from '@/models/entities/Webhook.js';
import { Channel } from '@/models/entities/Channel.js';
import { RetentionAggregation } from '@/models/entities/RetentionAggregation.js';
@@ -129,6 +130,7 @@ export {
RoleAssignment,
Flash,
FlashLike,
+ UserMemo,
};
export type AbuseUserReportsRepository = Repository<AbuseUserReport>;
@@ -195,3 +197,4 @@ export type RolesRepository = Repository<Role>;
export type RoleAssignmentsRepository = Repository<RoleAssignment>;
export type FlashsRepository = Repository<Flash>;
export type FlashLikesRepository = Repository<FlashLike>;
+export type UserMemoRepository = Repository<UserMemo>;
diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index 7d40979e3d..836368886e 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -250,6 +250,10 @@ export const packedUserDetailedNotMeOnlySchema = {
type: 'boolean',
nullable: false, optional: true,
},
+ memo: {
+ type: 'string',
+ nullable: false, optional: true,
+ },
//#endregion
},
} as const;
diff --git a/packages/backend/src/postgres.ts b/packages/backend/src/postgres.ts
index bb21ed827e..f3d404e6c9 100644
--- a/packages/backend/src/postgres.ts
+++ b/packages/backend/src/postgres.ts
@@ -70,6 +70,7 @@ import { Role } from '@/models/entities/Role.js';
import { RoleAssignment } from '@/models/entities/RoleAssignment.js';
import { Flash } from '@/models/entities/Flash.js';
import { FlashLike } from '@/models/entities/FlashLike.js';
+import { UserMemo } from '@/models/entities/UserMemo.js';
import { Config } from '@/config.js';
import MisskeyLogger from '@/logger.js';
@@ -183,6 +184,7 @@ export const entities = [
RoleAssignment,
Flash,
FlashLike,
+ UserMemo,
...charts,
];
diff --git a/packages/backend/src/server/api/EndpointsModule.ts b/packages/backend/src/server/api/EndpointsModule.ts
index 689f90287e..737bf0c84c 100644
--- a/packages/backend/src/server/api/EndpointsModule.ts
+++ b/packages/backend/src/server/api/EndpointsModule.ts
@@ -330,6 +330,7 @@ import * as ep___users_search from './endpoints/users/search.js';
import * as ep___users_show from './endpoints/users/show.js';
import * as ep___users_stats from './endpoints/users/stats.js';
import * as ep___users_achievements from './endpoints/users/achievements.js';
+import * as ep___users_updateMemo from './endpoints/users/update-memo.js';
import * as ep___fetchRss from './endpoints/fetch-rss.js';
import * as ep___retention from './endpoints/retention.js';
import { GetterService } from './GetterService.js';
@@ -665,6 +666,7 @@ const $users_search: Provider = { provide: 'ep:users/search', useClass: ep___use
const $users_show: Provider = { provide: 'ep:users/show', useClass: ep___users_show.default };
const $users_stats: Provider = { provide: 'ep:users/stats', useClass: ep___users_stats.default };
const $users_achievements: Provider = { provide: 'ep:users/achievements', useClass: ep___users_achievements.default };
+const $users_updateMemo: Provider = { provide: 'ep:users/update-memo', useClass: ep___users_updateMemo.default };
const $fetchRss: Provider = { provide: 'ep:fetch-rss', useClass: ep___fetchRss.default };
const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention.default };
@@ -1004,6 +1006,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$users_show,
$users_stats,
$users_achievements,
+ $users_updateMemo,
$fetchRss,
$retention,
],
@@ -1335,6 +1338,7 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
$users_show,
$users_stats,
$users_achievements,
+ $users_updateMemo,
$fetchRss,
$retention,
],
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index d0fe6a57c1..dc82c04e4e 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -330,6 +330,7 @@ import * as ep___users_search from './endpoints/users/search.js';
import * as ep___users_show from './endpoints/users/show.js';
import * as ep___users_stats from './endpoints/users/stats.js';
import * as ep___users_achievements from './endpoints/users/achievements.js';
+import * as ep___users_updateMemo from './endpoints/users/update-memo.js';
import * as ep___fetchRss from './endpoints/fetch-rss.js';
import * as ep___retention from './endpoints/retention.js';
@@ -663,6 +664,7 @@ const eps = [
['users/show', ep___users_show],
['users/stats', ep___users_stats],
['users/achievements', ep___users_achievements],
+ ['users/update-memo', ep___users_updateMemo],
['fetch-rss', ep___fetchRss],
['retention', ep___retention],
];
diff --git a/packages/backend/src/server/api/endpoints/users/update-memo.ts b/packages/backend/src/server/api/endpoints/users/update-memo.ts
new file mode 100644
index 0000000000..300435b9ff
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/users/update-memo.ts
@@ -0,0 +1,85 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { IdService } from '@/core/IdService.js';
+import type { UserMemoRepository } from '@/models/index.js';
+import { DI } from '@/di-symbols.js';
+import { GetterService } from '@/server/api/GetterService.js';
+import { ApiError } from '../../error.js';
+
+export const meta = {
+ tags: ['account'],
+
+ requireCredential: true,
+
+ kind: 'write:account',
+
+ errors: {
+ noSuchUser: {
+ message: 'No such user.',
+ code: 'NO_SUCH_USER',
+ id: '6fef56f3-e765-4957-88e5-c6f65329b8a5',
+ },
+ },
+} as const;
+
+export const paramDef = {
+ type: 'object',
+ properties: {
+ userId: { type: 'string', format: 'misskey:id' },
+ memo: {
+ type: 'string',
+ nullable: true,
+ description: 'A personal memo for the target user. If null or empty, delete the memo.',
+ },
+ },
+ required: ['userId', 'memo'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> {
+ constructor(
+ @Inject(DI.userMemoRepository)
+ private userMemoRepository: UserMemoRepository,
+ private getterService: GetterService,
+ private idService: IdService,
+ ) {
+ super(meta, paramDef, async (ps, me) => {
+ // Get target
+ const target = await this.getterService.getUser(ps.userId).catch(err => {
+ if (err.id === '15348ddd-432d-49c2-8a5a-8069753becff') throw new ApiError(meta.errors.noSuchUser);
+ throw err;
+ });
+
+ // 引数がnullか空文字であれば、パーソナルメモを削除する
+ if (ps.memo === '' || ps.memo == null) {
+ await this.userMemoRepository.delete({
+ userId: me.id,
+ targetUserId: target.id,
+ });
+ return;
+ }
+
+ // 以前に作成されたパーソナルメモがあるかどうか確認
+ const previousMemo = await this.userMemoRepository.findOneBy({
+ userId: me.id,
+ targetUserId: target.id,
+ });
+
+ if (!previousMemo) {
+ await this.userMemoRepository.insert({
+ id: this.idService.genId(),
+ userId: me.id,
+ targetUserId: target.id,
+ memo: ps.memo,
+ });
+ } else {
+ await this.userMemoRepository.update(previousMemo.id, {
+ userId: me.id,
+ targetUserId: target.id,
+ memo: ps.memo,
+ });
+ }
+ });
+ }
+}
diff --git a/packages/backend/test/e2e/endpoints.ts b/packages/backend/test/e2e/endpoints.ts
index afb72c84d4..07a4ceb91f 100644
--- a/packages/backend/test/e2e/endpoints.ts
+++ b/packages/backend/test/e2e/endpoints.ts
@@ -849,4 +849,84 @@ describe('Endpoints', () => {
assert.strictEqual(res.body.error.code, 'URL_PREVIEW_FAILED');
});
});
+
+ describe('パーソナルメモ機能のテスト', () => {
+ test('他者に関するメモを更新できる', async () => {
+ const memo = '10月まで低浮上とのこと。';
+
+ const res1 = await api('/users/update-memo', {
+ memo,
+ userId: bob.id,
+ }, alice);
+
+ const res2 = await api('/users/show', {
+ userId: bob.id,
+ }, alice);
+ assert.strictEqual(res1.status, 204);
+ assert.strictEqual(res2.body?.memo, memo);
+ });
+
+ test('自分に関するメモを更新できる', async () => {
+ const memo = 'チケットを月末までに買う。';
+
+ const res1 = await api('/users/update-memo', {
+ memo,
+ userId: alice.id,
+ }, alice);
+
+ const res2 = await api('/users/show', {
+ userId: alice.id,
+ }, alice);
+ assert.strictEqual(res1.status, 204);
+ assert.strictEqual(res2.body?.memo, memo);
+ });
+
+ test('メモを削除できる', async () => {
+ const memo = '10月まで低浮上とのこと。';
+
+ await api('/users/update-memo', {
+ memo,
+ userId: bob.id,
+ }, alice);
+
+ await api('/users/update-memo', {
+ memo: '',
+ userId: bob.id,
+ }, alice);
+
+ const res = await api('/users/show', {
+ userId: bob.id,
+ }, alice);
+
+ assert.strictEqual('memo' in res.body, false);
+ });
+
+ test('メモは個人ごとに独立して保存される', async () => {
+ const memoAliceToBob = '10月まで低浮上とのこと。';
+ const memoCarolToBob = '例の件について今度問いただす。';
+
+ await Promise.all([
+ api('/users/update-memo', {
+ memo: memoAliceToBob,
+ userId: bob.id,
+ }, alice),
+ api('/users/update-memo', {
+ memo: memoCarolToBob,
+ userId: bob.id,
+ }, carol),
+ ]);
+
+ const [resAlice, resCarol] = await Promise.all([
+ api('/users/show', {
+ userId: bob.id,
+ }, alice),
+ api('/users/show', {
+ userId: bob.id,
+ }, carol),
+ ]);
+
+ assert.strictEqual(resAlice.body.memo, memoAliceToBob);
+ assert.strictEqual(resCarol.body.memo, memoCarolToBob);
+ });
+ });
});
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 69fb4b93be..0f9145e974 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -21,6 +21,9 @@
<span v-if="user.isAdmin" :title="i18n.ts.isAdmin" style="color: var(--badge);"><i class="ti ti-shield"></i></span>
<span v-if="user.isLocked" :title="i18n.ts.isLocked"><i class="ti ti-lock"></i></span>
<span v-if="user.isBot" :title="i18n.ts.isBot"><i class="ti ti-robot"></i></span>
+ <button v-if="!isEditingMemo && !memoDraft" class="_button add-note-button" @click="showMemoTextarea">
+ <i class="ti ti-edit"/> {{ i18n.ts.addMemo }}
+ </button>
</div>
</div>
<span v-if="$i && $i.id != user.id && user.isFollowed" class="followed">{{ i18n.ts.followsYou }}</span>
@@ -39,6 +42,17 @@
<span v-if="user.isBot" :title="i18n.ts.isBot"><i class="ti ti-robot"></i></span>
</div>
</div>
+ <div v-if="isEditingMemo || memoDraft" class="memo" :class="{'no-memo': !memoDraft}">
+ <div class="heading" v-text="i18n.ts.memo"/>
+ <textarea
+ ref="memoTextareaEl"
+ v-model="memoDraft"
+ rows="1"
+ @focus="isEditingMemo = true"
+ @blur="updateMemo"
+ @input="adjustMemoTextarea"
+ />
+ </div>
<div v-if="user.roles.length > 0" class="roles">
<span v-for="role in user.roles" :key="role.id" v-tooltip="role.description" class="role" :style="{ '--color': role.color }">
<img v-if="role.iconUrl" style="height: 1.3em; vertical-align: -22%;" :src="role.iconUrl"/>
@@ -113,7 +127,7 @@
</template>
<script lang="ts" setup>
-import { defineAsyncComponent, computed, onMounted, onUnmounted } from 'vue';
+import { defineAsyncComponent, computed, onMounted, onUnmounted, nextTick, watch } from 'vue';
import calcAge from 's-age';
import * as misskey from 'misskey-js';
import MkNote from '@/components/MkNote.vue';
@@ -133,6 +147,7 @@ import { $i } from '@/account';
import { dateString } from '@/filters/date';
import { confetti } from '@/scripts/confetti';
import MkNotes from '@/components/MkNotes.vue';
+import { api } from '@/os';
const XPhotos = defineAsyncComponent(() => import('./index.photos.vue'));
const XActivity = defineAsyncComponent(() => import('./index.activity.vue'));
@@ -151,6 +166,10 @@ let parallaxAnimationId = $ref<null | number>(null);
let narrow = $ref<null | boolean>(null);
let rootEl = $ref<null | HTMLElement>(null);
let bannerEl = $ref<null | HTMLElement>(null);
+let memoTextareaEl = $ref<null | HTMLElement>(null);
+let memoDraft = $ref(props.user.memo);
+
+let isEditingMemo = $ref(false);
const pagination = {
endpoint: 'users/notes' as const,
@@ -193,6 +212,31 @@ function parallax() {
banner.style.backgroundPosition = `center calc(50% - ${pos}px)`;
}
+function showMemoTextarea() {
+ isEditingMemo = true;
+ nextTick(() => {
+ memoTextareaEl?.focus();
+ });
+}
+
+function adjustMemoTextarea() {
+ if (!memoTextareaEl) return;
+ memoTextareaEl.style.height = '0px';
+ memoTextareaEl.style.height = `${memoTextareaEl.scrollHeight}px`;
+}
+
+async function updateMemo() {
+ await api('users/update-memo', {
+ memo: memoDraft,
+ userId: props.user.id,
+ });
+ isEditingMemo = false;
+}
+
+watch([props.user], () => {
+ memoDraft = props.user.memo;
+});
+
onMounted(() => {
window.requestAnimationFrame(parallaxLoop);
narrow = rootEl!.clientWidth < 1000;
@@ -208,6 +252,9 @@ onMounted(() => {
});
}
}
+ nextTick(() => {
+ adjustMemoTextarea();
+ });
});
onUnmounted(() => {
@@ -323,6 +370,16 @@ onUnmounted(() => {
font-weight: bold;
}
}
+
+ > .add-note-button {
+ background: rgba(0, 0, 0, 0.2);
+ color: #fff;
+ -webkit-backdrop-filter: var(--blur, blur(8px));
+ backdrop-filter: var(--blur, blur(8px));
+ border-radius: 24px;
+ padding: 4px 8px;
+ font-size: 80%;
+ }
}
}
}
@@ -369,6 +426,38 @@ onUnmounted(() => {
}
}
+ > .memo {
+ margin: 12px 24px 0 154px;
+ background: transparent;
+ color: var(--fg);
+ border: 1px solid var(--divider);
+ border-radius: 8px;
+ padding: 8px;
+ line-height: 0;
+
+ > .heading {
+ text-align: left;
+ color: var(--fgTransparent);
+ line-height: 1.5;
+ }
+
+ textarea {
+ margin: 0;
+ padding: 0;
+ resize: none;
+ border: none;
+ outline: none;
+ width: 100%;
+ height: auto;
+ min-height: 0;
+ line-height: 1.5;
+ color: var(--fg);
+ overflow: hidden;
+ background: transparent;
+ font-family: inherit;
+ }
+ }
+
> .description {
padding: 24px 24px 24px 154px;
font-size: 0.95em;
@@ -504,6 +593,10 @@ onUnmounted(() => {
justify-content: center;
}
+ > .memo {
+ margin: 16px 16px 0 16px;
+ }
+
> .description {
padding: 16px;
text-align: center;
From 97abfd48ceaebaa0f8e5ee60fcc0a656a3eb13c7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 13 Apr 2023 13:31:54 +0900
Subject: [PATCH 2/9] refactor(backend): tweak repository name
---
.../backend/src/core/entities/UserEntityService.ts | 6 +++---
packages/backend/src/di-symbols.ts | 2 +-
packages/backend/src/models/RepositoryModule.ts | 8 ++++----
.../src/server/api/endpoints/users/update-memo.ts | 12 ++++++------
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 3f8254bb6c..68d30fe174 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -114,8 +114,8 @@ export class UserEntityService implements OnModuleInit {
@Inject(DI.pagesRepository)
private pagesRepository: PagesRepository,
- @Inject(DI.userMemoRepository)
- private userMemoRepository: UserMemoRepository,
+ @Inject(DI.userMemosRepository)
+ private userMemosRepository: UserMemoRepository,
//private noteEntityService: NoteEntityService,
//private driveFileEntityService: DriveFileEntityService,
@@ -340,7 +340,7 @@ export class UserEntityService implements OnModuleInit {
const falsy = opts.detail ? false : undefined;
- const memo = meId == null ? null : await this.userMemoRepository.findOneBy({
+ const memo = meId == null ? null : await this.userMemosRepository.findOneBy({
userId: meId,
targetUserId: user.id,
}).then(row => row?.memo ?? null);
diff --git a/packages/backend/src/di-symbols.ts b/packages/backend/src/di-symbols.ts
index b93ba899fb..190d8d65c2 100644
--- a/packages/backend/src/di-symbols.ts
+++ b/packages/backend/src/di-symbols.ts
@@ -70,6 +70,6 @@ export const DI = {
roleAssignmentsRepository: Symbol('roleAssignmentsRepository'),
flashsRepository: Symbol('flashsRepository'),
flashLikesRepository: Symbol('flashLikesRepository'),
- userMemoRepository: Symbol('userMemoRepository'),
+ userMemosRepository: Symbol('userMemosRepository'),
//#endregion
};
diff --git a/packages/backend/src/models/RepositoryModule.ts b/packages/backend/src/models/RepositoryModule.ts
index a415e37904..588c98b58d 100644
--- a/packages/backend/src/models/RepositoryModule.ts
+++ b/packages/backend/src/models/RepositoryModule.ts
@@ -388,8 +388,8 @@ const $roleAssignmentsRepository: Provider = {
inject: [DI.db],
};
-const $userMemoRepository: Provider = {
- provide: DI.userMemoRepository,
+const $userMemosRepository: Provider = {
+ provide: DI.userMemosRepository,
useFactory: (db: DataSource) => db.getRepository(UserMemo),
inject: [DI.db],
};
@@ -462,7 +462,7 @@ const $userMemoRepository: Provider = {
$roleAssignmentsRepository,
$flashsRepository,
$flashLikesRepository,
- $userMemoRepository,
+ $userMemosRepository,
],
exports: [
$usersRepository,
@@ -529,7 +529,7 @@ const $userMemoRepository: Provider = {
$roleAssignmentsRepository,
$flashsRepository,
$flashLikesRepository,
- $userMemoRepository,
+ $userMemosRepository,
],
})
export class RepositoryModule {}
diff --git a/packages/backend/src/server/api/endpoints/users/update-memo.ts b/packages/backend/src/server/api/endpoints/users/update-memo.ts
index 300435b9ff..ca7756ef75 100644
--- a/packages/backend/src/server/api/endpoints/users/update-memo.ts
+++ b/packages/backend/src/server/api/endpoints/users/update-memo.ts
@@ -39,8 +39,8 @@ export const paramDef = {
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> {
constructor(
- @Inject(DI.userMemoRepository)
- private userMemoRepository: UserMemoRepository,
+ @Inject(DI.userMemosRepository)
+ private userMemosRepository: UserMemoRepository,
private getterService: GetterService,
private idService: IdService,
) {
@@ -53,7 +53,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
// 引数がnullか空文字であれば、パーソナルメモを削除する
if (ps.memo === '' || ps.memo == null) {
- await this.userMemoRepository.delete({
+ await this.userMemosRepository.delete({
userId: me.id,
targetUserId: target.id,
});
@@ -61,20 +61,20 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
}
// 以前に作成されたパーソナルメモがあるかどうか確認
- const previousMemo = await this.userMemoRepository.findOneBy({
+ const previousMemo = await this.userMemosRepository.findOneBy({
userId: me.id,
targetUserId: target.id,
});
if (!previousMemo) {
- await this.userMemoRepository.insert({
+ await this.userMemosRepository.insert({
id: this.idService.genId(),
userId: me.id,
targetUserId: target.id,
memo: ps.memo,
});
} else {
- await this.userMemoRepository.update(previousMemo.id, {
+ await this.userMemosRepository.update(previousMemo.id, {
userId: me.id,
targetUserId: target.id,
memo: ps.memo,
From 5cac1515fd791b5f6ef3bc427369a0271a403a2b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 13 Apr 2023 13:34:54 +0900
Subject: [PATCH 3/9] =?UTF-8?q?fix(backend):=20user.memo=E3=81=AFdetail?=
=?UTF-8?q?=E3=81=8Ctrue=E3=81=AA=E6=99=82=E3=81=A0=E3=81=91=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../backend/src/core/entities/UserEntityService.ts | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index 68d30fe174..51e6b1d7ab 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -340,11 +340,6 @@ export class UserEntityService implements OnModuleInit {
const falsy = opts.detail ? false : undefined;
- const memo = meId == null ? null : await this.userMemosRepository.findOneBy({
- userId: meId,
- targetUserId: user.id,
- }).then(row => row?.memo ?? null);
-
const packed = {
id: user.id,
name: user.name,
@@ -417,6 +412,10 @@ export class UserEntityService implements OnModuleInit {
isAdministrator: role.isAdministrator,
displayOrder: role.displayOrder,
}))),
+ memo: meId == null ? null : await this.userMemosRepository.findOneBy({
+ userId: meId,
+ targetUserId: user.id,
+ }).then(row => row?.memo ?? null),
} : {}),
...(opts.detail && isMe ? {
@@ -484,10 +483,6 @@ export class UserEntityService implements OnModuleInit {
isMuted: relation.isMuted,
isRenoteMuted: relation.isRenoteMuted,
} : {}),
-
- ...(memo ? {
- memo,
- } : {}),
} as Promiseable<Packed<'User'>> as Promiseable<IsMeAndIsUserDetailed<ExpectsMe, D>>;
return await awaitAll(packed);
From e014c91899ba899fe85ce23ee6d5b2074891a2d9 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Thu, 13 Apr 2023 13:50:17 +0900
Subject: [PATCH 4/9] =?UTF-8?q?enhance(frontend):=20=E3=83=A6=E3=83=BC?=
=?UTF-8?q?=E3=82=B6=E3=83=BC=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=8B?=
=?UTF-8?q?=E3=82=89=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=83=A1=E3=83=A2?=
=?UTF-8?q?=E3=82=92=E7=B7=A8=E9=9B=86=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?=
=?UTF-8?q?=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
locales/ja-JP.yml | 1 +
.../frontend/src/scripts/get-user-menu.ts | 27 +++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 83186dc729..5f5bcfd879 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -994,6 +994,7 @@ accountMigration: "アカウントの引っ越し"
accountMoved: "このユーザーは新しいアカウントに引っ越しました："
forceShowAds: "常に広告を表示する"
addMemo: "メモを追加"
+editMemo: "メモを編集"
_accountMigration:
moveTo: "このアカウントを新しいアカウントに引っ越す"
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index fe941c77b2..6ff9fb63f1 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -98,6 +98,27 @@ export function getUserMenu(user: misskey.entities.UserDetailed, router: Router
});
}
+ async function editMemo(): Promise<void> {
+ const userDetailed = await os.api('users/show', {
+ userId: user.id,
+ });
+ const { canceled, result } = await os.form(i18n.ts.editMemo, {
+ memo: {
+ type: 'string',
+ required: true,
+ multiline: true,
+ label: i18n.ts.memo,
+ default: userDetailed.memo,
+ },
+ });
+ if (canceled) return;
+
+ os.apiWithDialog('users/update-memo', {
+ memo: result.memo,
+ userId: user.id,
+ });
+ }
+
let menu = [{
icon: 'ti ti-at',
text: i18n.ts.copyUsername,
@@ -123,6 +144,12 @@ export function getUserMenu(user: misskey.entities.UserDetailed, router: Router
os.post({ specified: user, initialText: `@${user.username} ` });
},
}, null, {
+ icon: 'ti ti-pencil',
+ text: i18n.ts.editMemo,
+ action: () => {
+ editMemo();
+ },
+ }, {
type: 'parent',
icon: 'ti ti-list',
text: i18n.ts.addToList,
From dffefdad95ffe1018293f85a6eb9bdf9ee3eed53 Mon Sep 17 00:00:00 2001
From: happo31 <happo31@gmail.com>
Date: Thu, 13 Apr 2023 15:43:10 +0900
Subject: [PATCH 5/9] =?UTF-8?q?fix:=20#9998=20MkNote.vue,=20MkNoteDetailed?=
=?UTF-8?q?.vue=20=E3=81=A7=E3=80=81=E7=89=B9=E5=AE=9A=E3=81=AEMFM?=
=?UTF-8?q?=E3=81=AB=E3=82=88=E3=81=A3=E3=81=A6=E3=83=95=E3=83=83=E3=82=BF?=
=?UTF-8?q?=E3=83=BC=E3=81=AE=E3=83=9C=E3=82=BF=E3=83=B3=E3=81=8C=E6=8A=BC?=
=?UTF-8?q?=E3=81=9B=E3=81=AA=E3=81=8F=E3=81=AA=E3=82=8B=20(#9999)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix(client): add `overflow: clip;`
* fix(client): add `overflow: clip;`
* Revert "fix(client): add `overflow: clip;`"
This reverts commit c43226afde4741d61088192cbbab09fe97e1f2fb.
Revert "fix(client): add `overflow: clip;`"
This reverts commit c7225151056ff15b953aae806e7a07fa13fab746.
* feat(client): add z-index to .footer
---
packages/frontend/src/components/MkNote.vue | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 36ec778a14..cb4bb8f23e 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -484,6 +484,11 @@ function showReactions(): void {
}
}
+ .footer {
+ position: relative;
+ z-index: 1;
+ }
+
&:hover > .article > .main > .footer > .footerButton {
opacity: 1;
}
From 463446795dd04b274072a7ddcfdcb77c6f661b1e Mon Sep 17 00:00:00 2001
From: KokiSakano <61353435+KokiSakano@users.noreply.github.com>
Date: Thu, 13 Apr 2023 18:47:49 +0900
Subject: [PATCH 6/9] =?UTF-8?q?refactor:=20init.ts=E5=91=A8=E3=82=8A?=
=?UTF-8?q?=E3=81=AEeslint=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=A8=E5=9E=8B?=
=?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3=20(#10157)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* refactor/miLocalStorageのメソッドに戻り値追加
* refactor/miLocalStorageのキーとしてdebugがconfig.tsに存在するので追加
* fix/JSON.parseにnullは入らないのでnullの時は分岐させてnullにする
* refactor/修正したファイルの型調整+記法の統一
* fix/型のためにlangがnullの時はhtmlの言語の設定をしない
* refactor/catchで何もしないと警告が出るので修正
* refactor/細かい点の修正
* refactor/変数の二重定義になっていた二重定義になっていたので修正
* refactor/importの整理(通常のimportは最初に処理されるので影響はない想定)
* fix/vueファイルに型を与えてインポート時の型エラーを防ぐ
* refactor/開発環境のみで利用するので,eslintの設定を変更する
* fix/vueの定義を最小限にする
* fallback language to 'en-US'
* remove accounts migration
* fix:vueの型定義ファイルを消す
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
---
packages/frontend/src/config.ts | 11 ++++---
packages/frontend/src/init.ts | 45 ++++++++++----------------
packages/frontend/src/local-storage.ts | 7 ++--
3 files changed, 27 insertions(+), 36 deletions(-)
diff --git a/packages/frontend/src/config.ts b/packages/frontend/src/config.ts
index 073b21a0ae..24f60910d1 100644
--- a/packages/frontend/src/config.ts
+++ b/packages/frontend/src/config.ts
@@ -1,21 +1,22 @@
-import { miLocalStorage } from "./local-storage";
+import { miLocalStorage } from './local-storage';
const address = new URL(location.href);
-const siteName = (document.querySelector('meta[property="og:site_name"]') as HTMLMetaElement)?.content;
+const siteName = document.querySelector<HTMLMetaElement>('meta[property="og:site_name"]')?.content;
export const host = address.host;
export const hostname = address.hostname;
export const url = address.origin;
export const apiUrl = url + '/api';
export const wsUrl = url.replace('http://', 'ws://').replace('https://', 'wss://') + '/streaming';
-export const lang = miLocalStorage.getItem('lang');
+export const lang = miLocalStorage.getItem('lang') ?? 'en-US';
export const langs = _LANGS_;
-export let locale = JSON.parse(miLocalStorage.getItem('locale'));
+const preParseLocale = miLocalStorage.getItem('locale');
+export let locale = preParseLocale ? JSON.parse(preParseLocale) : null;
export const version = _VERSION_;
export const instanceName = siteName === 'Misskey' ? host : siteName;
export const ui = miLocalStorage.getItem('ui');
export const debug = miLocalStorage.getItem('debug') === 'true';
-export function updateLocale(newLocale) {
+export function updateLocale(newLocale): void {
locale = newLocale;
}
diff --git a/packages/frontend/src/init.ts b/packages/frontend/src/init.ts
index 5b3e7ec932..91cdc15ef9 100644
--- a/packages/frontend/src/init.ts
+++ b/packages/frontend/src/init.ts
@@ -6,18 +6,6 @@ import 'vite/modulepreload-polyfill';
import '@/style.scss';
-//#region account indexedDB migration
-import { set } from '@/scripts/idb-proxy';
-
-{
- const accounts = miLocalStorage.getItem('accounts');
- if (accounts) {
- set('accounts', JSON.parse(accounts));
- miLocalStorage.removeItem('accounts');
- }
-}
-//#endregion
-
import { computed, createApp, watch, markRaw, version as vueVersion, defineAsyncComponent } from 'vue';
import { compareVersions } from 'compare-versions';
import JSON5 from 'json5';
@@ -42,11 +30,11 @@ import { reloadChannel } from '@/scripts/unison-reload';
import { reactionPicker } from '@/scripts/reaction-picker';
import { getUrlWithoutLoginId } from '@/scripts/login-id';
import { getAccountFromId } from '@/scripts/get-account-from-id';
-import { deckStore } from './ui/deck/deck-store';
-import { miLocalStorage } from './local-storage';
-import { claimAchievement, claimedAchievements } from './scripts/achievements';
-import { fetchCustomEmojis } from './custom-emojis';
-import { mainRouter } from './router';
+import { deckStore } from '@/ui/deck/deck-store';
+import { miLocalStorage } from '@/local-storage';
+import { claimAchievement, claimedAchievements } from '@/scripts/achievements';
+import { fetchCustomEmojis } from '@/custom-emojis';
+import { mainRouter } from '@/router';
console.info(`Misskey v${version}`);
@@ -55,7 +43,9 @@ if (_DEV_) {
console.info(`vue ${vueVersion}`);
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
(window as any).$i = $i;
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
(window as any).$store = defaultStore;
window.addEventListener('error', event => {
@@ -184,7 +174,7 @@ fetchInstanceMetaPromise.then(() => {
try {
await fetchCustomEmojis();
-} catch (err) {}
+} catch (err) { /* empty */ }
const app = createApp(
new URLSearchParams(window.location.search).has('zen') ? defineAsyncComponent(() => import('@/ui/zen.vue')) :
@@ -212,20 +202,20 @@ await deckStore.ready;
// https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
// なぜかinit.tsの内容が2回実行されることがあるため、mountするdivを1つに制限する
-const rootEl = (() => {
+const rootEl = ((): HTMLElement => {
const MISSKEY_MOUNT_DIV_ID = 'misskey_app';
- const currentEl = document.getElementById(MISSKEY_MOUNT_DIV_ID);
+ const currentRoot = document.getElementById(MISSKEY_MOUNT_DIV_ID);
- if (currentEl) {
+ if (currentRoot) {
console.warn('multiple import detected');
- return currentEl;
+ return currentRoot;
}
- const rootEl = document.createElement('div');
- rootEl.id = MISSKEY_MOUNT_DIV_ID;
- document.body.appendChild(rootEl);
- return rootEl;
+ const root = document.createElement('div');
+ root.id = MISSKEY_MOUNT_DIV_ID;
+ document.body.appendChild(root);
+ return root;
})();
app.mount(rootEl);
@@ -256,8 +246,7 @@ if (lastVersion !== version) {
popup(defineAsyncComponent(() => import('@/components/MkUpdated.vue')), {}, {}, 'closed');
}
}
- } catch (err) {
- }
+ } catch (err) { /* empty */ }
}
await defaultStore.ready;
diff --git a/packages/frontend/src/local-storage.ts b/packages/frontend/src/local-storage.ts
index 9a288f264c..441a35747a 100644
--- a/packages/frontend/src/local-storage.ts
+++ b/packages/frontend/src/local-storage.ts
@@ -24,6 +24,7 @@ type Keys =
'customCss' |
'message_drafts' |
'scratchpad' |
+ 'debug' |
`miux:${string}` |
`ui:folder:${string}` |
`themes:${string}` |
@@ -32,7 +33,7 @@ type Keys =
'emojis' // DEPRECATED, stored in indexeddb (13.9.0~);
export const miLocalStorage = {
- getItem: (key: Keys) => window.localStorage.getItem(key),
- setItem: (key: Keys, value: string) => window.localStorage.setItem(key, value),
- removeItem: (key: Keys) => window.localStorage.removeItem(key),
+ getItem: (key: Keys): string | null => window.localStorage.getItem(key),
+ setItem: (key: Keys, value: string): void => window.localStorage.setItem(key, value),
+ removeItem: (key: Keys): void => window.localStorage.removeItem(key),
};
From 2423fb8d38c3267dd606270a8d4f3e28901f373d Mon Sep 17 00:00:00 2001
From: CGsama <CGsama@outlook.com>
Date: Thu, 13 Apr 2023 05:48:38 -0400
Subject: [PATCH 7/9] fix: proper expire remote user drivefile over limits at
adding time (#9426)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* delete remote user drivefile over limits at adding
* refactor
* delete → expire
* speed up by batch find
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
---
packages/backend/src/core/DriveService.ts | 24 ++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts
index c6258474ec..bfe3816e36 100644
--- a/packages/backend/src/core/DriveService.ts
+++ b/packages/backend/src/core/DriveService.ts
@@ -396,8 +396,9 @@ export class DriveService {
);
}
+ // Expire oldest file (without avatar or banner) of remote user
@bindThis
- private async deleteOldFile(user: RemoteUser) {
+ private async expireOldFile(user: RemoteUser, driveCapacity: number) {
const q = this.driveFilesRepository.createQueryBuilder('file')
.where('file.userId = :userId', { userId: user.id })
.andWhere('file.isLink = FALSE');
@@ -410,12 +411,16 @@ export class DriveService {
q.andWhere('file.id != :bannerId', { bannerId: user.bannerId });
}
+ //This selete is hard coded, be careful if change database schema
+ q.addSelect('SUM("file"."size") OVER (ORDER BY "file"."id" DESC ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)', 'acc_usage');
q.orderBy('file.id', 'ASC');
- const oldFile = await q.getOne();
+ const fileList = await q.getRawMany();
+ const exceedFileIds = fileList.filter((x: any) => x.acc_usage > driveCapacity).map((x: any) => x.file_id);
- if (oldFile) {
- this.deleteFile(oldFile, true);
+ for (const fileId of exceedFileIds) {
+ const file = await this.driveFilesRepository.findOneBy({ id: fileId });
+ this.deleteFile(file, true);
}
}
@@ -489,22 +494,19 @@ export class DriveService {
//#region Check drive usage
if (user && !isLink) {
const usage = await this.driveFileEntityService.calcDriveUsageOf(user);
+ const isLocalUser = this.userEntityService.isLocalUser(user);
const policies = await this.roleService.getUserPolicies(user.id);
const driveCapacity = 1024 * 1024 * policies.driveCapacityMb;
this.registerLogger.debug('drive capacity override applied');
this.registerLogger.debug(`overrideCap: ${driveCapacity}bytes, usage: ${usage}bytes, u+s: ${usage + info.size}bytes`);
- this.registerLogger.debug(`drive usage is ${usage} (max: ${driveCapacity})`);
-
// If usage limit exceeded
- if (usage + info.size > driveCapacity) {
- if (this.userEntityService.isLocalUser(user)) {
+ if (driveCapacity < usage + info.size) {
+ if (isLocalUser) {
throw new IdentifiableError('c6244ed2-a39a-4e1c-bf93-f0fbd7764fa6', 'No free space.');
- } else {
- // (アバターまたはバナーを含まず)最も古いファイルを削除する
- this.deleteOldFile(await this.usersRepository.findOneByOrFail({ id: user.id }) as RemoteUser);
}
+ await this.expireOldFile(await this.usersRepository.findOneByOrFail({ id: user.id }) as RemoteUser, driveCapacity - info.size);
}
}
//#endregion
From 93dcd1c98e8e8329ee63cb4b06249990c0f2b595 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 13 Apr 2023 11:27:05 +0000
Subject: [PATCH 8/9] fix DriveService.ts
---
packages/backend/src/core/DriveService.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/packages/backend/src/core/DriveService.ts b/packages/backend/src/core/DriveService.ts
index bfe3816e36..65b4c24ca6 100644
--- a/packages/backend/src/core/DriveService.ts
+++ b/packages/backend/src/core/DriveService.ts
@@ -420,6 +420,7 @@ export class DriveService {
for (const fileId of exceedFileIds) {
const file = await this.driveFilesRepository.findOneBy({ id: fileId });
+ if (file == null) continue;
this.deleteFile(file, true);
}
}
From 55c10d0d88b5e2aa5e35565f5df552b180230f1e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 13 Apr 2023 11:27:21 +0000
Subject: [PATCH 9/9] fix(client): fix narrow style of MkPostForm
---
packages/frontend/src/components/MkPostForm.vue | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 42a3748d9a..6f7db13e30 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -900,27 +900,28 @@ defineExpose({
}
.headerLeft {
- display: grid;
- grid-template-columns: repeat(2, minmax(36px, 50px));
- grid-template-rows: minmax(40px, 100%);
+ display: flex;
+ flex: 0 1 100px;
}
.cancel {
padding: 0;
font-size: 1em;
height: 100%;
+ flex: 0 1 50px;
}
.account {
height: 100%;
display: inline-flex;
vertical-align: bottom;
+ flex: 0 1 50px;
}
.avatar {
width: 28px;
height: 28px;
- margin: auto 0;
+ margin: auto;
}
.headerRight {