Merge tag '2023.10.1' into dev-kakurega

CHANGELOG.md

@@ -12,10 +12,22 @@
 
 -->
 
+## 2023.10.1
+### General
+- Enhance: ローカルタイムライン、ソーシャルタイムラインで返信を含むかどうか設定可能に
+
+### Client
+- Fix: 絵文字ピッカーで横に長いカスタム絵文字が見切れる問題を修正
+
+### Server
+- Fix: フォローしているユーザーからの自分の投稿への返信がタイムラインに含まれない問題を修正
+- Fix: users/notesでセンシティブチャンネルの投稿が含まれる場合がある問題を修正
+
 ## 2023.10.0
 ### NOTE
 - 2023.9.2で導入されたノート編集機能はクオリティの高い実装が困難であることが判明したため撤回されました
 - アップデートを行うと、タイムラインが一時的にリセットされます
+- ソフトミュート設定はクライアントではなくサーバー側に保存されるようになったため、アップデートを行うとソフトミュートの設定がリセットされます
 
 ### Changes
 - API: users/notes, notes/local-timeline で fileType 指定はできなくなりました

locales/zh-TW.yml

@@ -2141,3 +2141,11 @@ _moderationLogTypes:
   createAd: "建立廣告"
   deleteAd: "刪除廣告"
   updateAd: "更新廣告"
+_fileViewer:
+  title: "檔案詳細資訊"
+  type: "檔案類型 "
+  size: "檔案大小"
+  url: "URL"
+  uploadedAt: "加入日期"
+  attachedNotes: "含有附件的貼文"
+  thisPageCanBeSeenFromTheAuthor: "本頁面僅限上傳了這個檔案的使用者可以檢視。"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2023.10.0-kakurega.1.20.0",
+	"version": "2023.10.1-kakurega.1.20.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/src/core/NoteCreateService.ts

@@ -871,8 +871,8 @@ export class NoteCreateService implements OnApplicationShutdown {
 				// 基本的にvisibleUserIdsには自身のidが含まれている前提であること
 				if (note.visibility === 'specified' && !note.visibleUserIds.some(v => v === following.followerId)) continue;
 
-				// 自分自身以外への返信
-				if (note.replyId && note.replyUserId !== note.userId) {
+				// 「自分自身への返信 or そのフォロワーへの返信」のどちらでもない場合
+				if (note.replyId && !(note.replyUserId === note.userId || note.replyUserId === following.followerId)) {
 					if (!following.withReplies) continue;
 				}
 
@@ -889,8 +889,8 @@ export class NoteCreateService implements OnApplicationShutdown {
 					!note.visibleUserIds.some(v => v === userListMembership.userListUserId)
 				) continue;
 
-				// 自分自身以外への返信
-				if (note.replyId && note.replyUserId !== note.userId) {
+				// 「自分自身への返信 or そのリストの作成者への返信」のどちらでもない場合
+				if (note.replyId && !(note.replyUserId === note.userId || note.replyUserId === userListMembership.userListUserId)) {
 					if (!userListMembership.withReplies) continue;
 				}
 
@@ -910,6 +910,10 @@ export class NoteCreateService implements OnApplicationShutdown {
 			// 自分自身以外への返信
 			if (note.replyId && note.replyUserId !== note.userId) {
 				this.redisTimelineService.push(`userTimelineWithReplies:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
+
+				if (note.visibility === 'public' && note.userHost == null) {
+					this.redisTimelineService.push('localTimelineWithReplies', note.id, 300, r);
+				}
 			} else {
 				this.redisTimelineService.push(`userTimeline:${user.id}`, note.id, note.userHost == null ? meta.perLocalUserUserTimelineCacheMax : meta.perRemoteUserUserTimelineCacheMax, r);
 				if (note.fileIds.length > 0) {

packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts

@@ -55,6 +55,7 @@ export const paramDef = {
 		includeLocalRenotes: { type: 'boolean', default: true },
 		withFiles: { type: 'boolean', default: false },
 		withRenotes: { type: 'boolean', default: true },
+		withReplies: { type: 'boolean', default: false },
 	},
 	required: [],
 } as const;
@@ -94,12 +95,29 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				this.cacheService.userBlockedCache.fetch(me.id),
 			]);
 
-			const [htlNoteIds, ltlNoteIds] = await this.redisTimelineService.getMulti([
-				ps.withFiles ? `homeTimelineWithFiles:${me.id}` : `homeTimeline:${me.id}`,
-				ps.withFiles ? 'localTimelineWithFiles' : 'localTimeline',
-			], untilId, sinceId);
+			let noteIds: string[];
+
+			if (ps.withFiles) {
+				const [htlNoteIds, ltlNoteIds] = await this.redisTimelineService.getMulti([
+					`homeTimelineWithFiles:${me.id}`,
+					'localTimelineWithFiles',
+				], untilId, sinceId);
+				noteIds = Array.from(new Set([...htlNoteIds, ...ltlNoteIds]));
+			} else if (ps.withReplies) {
+				const [htlNoteIds, ltlNoteIds, ltlReplyNoteIds] = await this.redisTimelineService.getMulti([
+					`homeTimeline:${me.id}`,
+					'localTimeline',
+					'localTimelineWithReplies',
+				], untilId, sinceId);
+				noteIds = Array.from(new Set([...htlNoteIds, ...ltlNoteIds, ...ltlReplyNoteIds]));
+			} else {
+				const [htlNoteIds, ltlNoteIds] = await this.redisTimelineService.getMulti([
+					`homeTimeline:${me.id}`,
+					'localTimeline',
+				], untilId, sinceId);
+				noteIds = Array.from(new Set([...htlNoteIds, ...ltlNoteIds]));
+			}
 
-			let noteIds = Array.from(new Set([...htlNoteIds, ...ltlNoteIds]));
 			noteIds.sort((a, b) => a > b ? -1 : 1);
 			noteIds = noteIds.slice(0, ps.limit);
 

packages/backend/src/server/api/endpoints/notes/local-timeline.ts

@@ -45,6 +45,7 @@ export const paramDef = {
 	properties: {
 		withFiles: { type: 'boolean', default: false },
 		withRenotes: { type: 'boolean', default: true },
+		withReplies: { type: 'boolean', default: false },
 		excludeNsfw: { type: 'boolean', default: false },
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 		sinceId: { type: 'string', format: 'misskey:id' },
@@ -90,7 +91,19 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				this.cacheService.userBlockedCache.fetch(me.id),
 			]) : [new Set<string>(), new Set<string>(), new Set<string>()];
 
-			let noteIds = await this.redisTimelineService.get(ps.withFiles ? 'localTimelineWithFiles' : 'localTimeline', untilId, sinceId);
+			let noteIds: string[];
+
+			if (ps.withFiles) {
+				noteIds = await this.redisTimelineService.get('localTimelineWithFiles', untilId, sinceId);
+			} else {
+				const [nonReplyNoteIds, replyNoteIds] = await this.redisTimelineService.getMulti([
+					'localTimeline',
+					'localTimelineWithReplies',
+				], untilId, sinceId);
+				noteIds = Array.from(new Set([...nonReplyNoteIds, ...replyNoteIds]));
+				noteIds.sort((a, b) => a > b ? -1 : 1);
+			}
+
 			noteIds = noteIds.slice(0, ps.limit);
 
 			if (noteIds.length === 0) {
@@ -112,6 +125,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				if (me && (note.userId === me.id)) {
 					return true;
 				}
+				if (!ps.withReplies && note.replyId && (me == null || note.replyUserId !== me.id)) return false;
 				if (me && isUserRelated(note, userIdsWhoBlockingMe)) return false;
 				if (me && isUserRelated(note, userIdsWhoMeMuting)) return false;
 				if (note.renoteId) {

packages/backend/src/server/api/endpoints/users/notes.ts

@@ -150,7 +150,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('reply.user', 'replyUser')
 				.leftJoinAndSelect('renote.user', 'renoteUser');
 
-			if (!ps.withChannelNotes) {
+			if (ps.withChannelNotes) {
+				if (!isSelf) query.andWhere('channel.isSensitive = false');
+			} else {
 				query.andWhere('note.channelId IS NULL');
 			}
 

packages/backend/src/server/api/stream/channels/hybrid-timeline.ts

@@ -19,6 +19,7 @@ class HybridTimelineChannel extends Channel {
 	public static shouldShare = false;
 	public static requireCredential = true;
 	private withRenotes: boolean;
+	private withReplies: boolean;
 	private withFiles: boolean;
 
 	constructor(
@@ -39,6 +40,7 @@ class HybridTimelineChannel extends Channel {
 		if (!policies.ltlAvailable) return;
 
 		this.withRenotes = params.withRenotes ?? true;
+		this.withReplies = params.withReplies ?? false;
 		this.withFiles = params.withFiles ?? false;
 
 		// Subscribe events
@@ -87,7 +89,7 @@ class HybridTimelineChannel extends Channel {
 		if (isInstanceMuted(note, new Set<string>(this.userProfile!.mutedInstances ?? []))) return;
 
 		// 関係ない返信は除外
-		if (note.reply && !this.following[note.userId]?.withReplies) {
+		if (note.reply && !this.following[note.userId]?.withReplies && !this.withReplies) {
 			const reply = note.reply;
 			// 「チャンネル接続主への返信」でもなければ、「チャンネル接続主が行った返信」でもなければ、「投稿者の投稿者自身への返信」でもない場合
 			if (reply.userId !== this.user!.id && note.userId !== this.user!.id && reply.userId !== note.userId) return;

packages/backend/src/server/api/stream/channels/local-timeline.ts

@@ -18,6 +18,7 @@ class LocalTimelineChannel extends Channel {
 	public static shouldShare = false;
 	public static requireCredential = false;
 	private withRenotes: boolean;
+	private withReplies: boolean;
 	private withFiles: boolean;
 
 	constructor(
@@ -38,6 +39,7 @@ class LocalTimelineChannel extends Channel {
 		if (!policies.ltlAvailable) return;
 
 		this.withRenotes = params.withRenotes ?? true;
+		this.withReplies = params.withReplies ?? false;
 		this.withFiles = params.withFiles ?? false;
 
 		// Subscribe events
@@ -66,7 +68,7 @@ class LocalTimelineChannel extends Channel {
 		}
 
 		// 関係ない返信は除外
-		if (note.reply && this.user && !this.following[note.userId]?.withReplies) {
+		if (note.reply && this.user && !this.following[note.userId]?.withReplies && !this.withReplies) {
 			const reply = note.reply;
 			// 「チャンネル接続主への返信」でもなければ、「チャンネル接続主が行った返信」でもなければ、「投稿者の投稿者自身への返信」でもない場合
 			if (reply.userId !== this.user.id && note.userId !== this.user.id && reply.userId !== note.userId) return;