Merge branch 'acct-parse-url' into lookup-api

CHANGELOG.md

@@ -76,6 +76,7 @@
 - Fix: SystemWebhook設定でsecretを空に出来ない問題を修正
 - Fix: 削除されたユーザーがチャットメッセージにリアクションしている場合`chat/history`などでエラーになる問題を修正
 - Fix: Pageのアイキャッチ画像をドライブから消してもPageごと消えないように
+- Fix: タイムラインAPIの withRenotes: false 時のレスポンスを修正
 
 
 ## 2025.7.0

locales/en-US.yml

@@ -1668,6 +1668,7 @@ _serverSettings:
   restartServerSetupWizardConfirm_text: "Some current settings will be reset."
   entrancePageStyle: "Entrance page style"
   showTimelineForVisitor: "Show timeline"
+  showActivitiesForVisitor: "Show activities"
   _userGeneratedContentsVisibilityForVisitor:
     all: "Everything is public"
     localOnly: "Only local content is published, remote content is kept private"
@@ -3119,6 +3120,7 @@ _serverSetupWizard:
   youCanConfigureMoreFederationSettingsLater: "Advanced settings such as specifying federated servers can be configured later."
   remoteContentsCleaning: "Automatic cleanup of received contents"
   remoteContentsCleaning_description: "Federation may result in a continuous inflow of content. Enabling automatic cleanup will remove outdated and unreferenced content from the server to save storage."
+  remoteContentsCleaning_description2: "Hyperlinks to remote content within the local server may become broken."
   adminInfo: "Administrator information"
   adminInfo_description: "Sets the administrator information used to receive inquiries."
   adminInfo_mustBeFilled: "Must be entered if public server or federation is on."

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.8.0-beta.5",
+	"version": "2025.8.0-beta.6",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

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

@@ -91,6 +91,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					qb.orWhere(new Brackets(qb => {
 						qb.where('note.text IS NOT NULL');
 						qb.orWhere('note.fileIds != \'{}\'');
+						qb.orWhere('0 < (SELECT COUNT(*) FROM poll WHERE poll."noteId" = note.id)');
 					}));
 				}));
 			}

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

@@ -242,6 +242,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				qb.orWhere(new Brackets(qb => {
 					qb.orWhere('note.text IS NOT NULL');
 					qb.orWhere('note.fileIds != \'{}\'');
+					qb.orWhere('0 < (SELECT COUNT(*) FROM poll WHERE poll."noteId" = note.id)');
 				}));
 			}));
 		}

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

@@ -223,6 +223,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				qb.orWhere(new Brackets(qb => {
 					qb.orWhere('note.text IS NOT NULL');
 					qb.orWhere('note.fileIds != \'{}\'');
+					qb.orWhere('0 < (SELECT COUNT(*) FROM poll WHERE poll."noteId" = note.id)');
 				}));
 			}));
 		}

packages/misskey-js/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.8.0-beta.5",
+	"version": "2025.8.0-beta.6",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",