Merge branch 'develop' into hazelnoot/following-timeline

packages/backend/src/core/activitypub/ApRendererService.ts

@@ -526,6 +526,7 @@ export class ApRendererService {
 			publicKey: this.renderKey(user, keypair, '#main-key'),
 			isCat: user.isCat,
 			noindex: user.noindex,
+			indexable: !user.noindex,
 			speakAsCat: user.speakAsCat,
 			attachment: attachment.length ? attachment : undefined,
 		};

packages/backend/src/core/activitypub/misc/contexts.ts

@@ -545,6 +545,7 @@ const extension_context_definition = {
 	Emoji: 'toot:Emoji',
 	featured: 'toot:featured',
 	discoverable: 'toot:discoverable',
+	indexable: 'toot:indexable',
 	// schema
 	schema: 'http://schema.org#',
 	PropertyValue: 'schema:PropertyValue',

packages/backend/src/core/activitypub/models/ApNoteService.ts

@@ -587,7 +587,7 @@ export class ApNoteService {
 			// ここでuriの代わりに添付されてきたNote Objectが指定されていると、サーバーフェッチを経ずにノートが生成されるが
 			// 添付されてきたNote Objectは偽装されている可能性があるため、常にuriを指定してサーバーフェッチを行う。
 			const createFrom = options.sentFrom?.origin === new URL(uri).origin ? value : uri;
-			return await this.createNote(createFrom, options.resolver, true);
+			return await this.createNote(createFrom, options.resolver, false);
 		} finally {
 			unlock();
 		}

packages/backend/src/core/entities/UserEntityService.ts

@@ -525,6 +525,7 @@ export class UserEntityService implements OnModuleInit {
 				flipH: ud.flipH || undefined,
 				offsetX: ud.offsetX || undefined,
 				offsetY: ud.offsetY || undefined,
+				showBelow: ud.showBelow || undefined,
 				url: decorations.find(d => d.id === ud.id)!.url,
 			}))) : [],
 			isBot: user.isBot,

packages/backend/src/models/User.ts

@@ -170,6 +170,7 @@ export class MiUser {
 		flipH?: boolean;
 		offsetX?: number;
 		offsetY?: number;
+		showBelow?: boolean;
 	}[];
 
 	@Index()

packages/backend/src/models/json-schema/user.ts

@@ -104,6 +104,10 @@ export const packedUserLiteSchema = {
 						type: 'number',
 						nullable: false, optional: true,
 					},
+					showBelow: {
+						type: 'boolean',
+						nullable: false, optional: true,
+					},
 				},
 			},
 		},

packages/backend/src/server/api/endpoints/i/update.ts

@@ -159,6 +159,7 @@ export const paramDef = {
 				flipH: { type: 'boolean', nullable: true },
 				offsetX: { type: 'number', nullable: true, maximum: 0.25, minimum: -0.25 },
 				offsetY: { type: 'number', nullable: true, maximum: 0.25, minimum: -0.25 },
+				showBelow: { type: 'boolean', nullable: true },
 			},
 			required: ['id'],
 		} },
@@ -417,6 +418,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 					flipH: d.flipH ?? false,
 					offsetX: d.offsetX ?? 0,
 					offsetY: d.offsetY ?? 0,
+					showBelow: d.showBelow ?? false,
 				}));
 			}
 

packages/backend/src/server/web/ClientServerService.ts

@@ -193,9 +193,9 @@ export class ClientServerService {
 			icon: meta.iconUrl,
 			appleTouchIcon: meta.app512IconUrl,
 			themeColor: meta.themeColor,
-			serverErrorImageUrl: meta.serverErrorImageUrl ?? 'https://launcher.moe/error.png',
-			infoImageUrl: meta.infoImageUrl ?? 'https://launcher.moe/nothinghere.png',
-			notFoundImageUrl: meta.notFoundImageUrl ?? 'https://launcher.moe/missingpage.webp',
+			serverErrorImageUrl: meta.serverErrorImageUrl ?? '/status/error.png',
+			infoImageUrl: meta.infoImageUrl ?? '/status/nothinghere.png',
+			notFoundImageUrl: meta.notFoundImageUrl ?? '/status/missingpage.webp',
 			instanceUrl: this.config.url,
 			randomMOTD: this.config.customMOTD ? this.config.customMOTD[Math.floor(Math.random() * this.config.customMOTD.length)] : undefined,
 			metaJson: htmlSafeJsonStringify(await this.metaEntityService.packDetailed(meta)),