Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong insertion point; append changelog directly in 2026.6.0

Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## Unreleased

### General
-

### Client
-

### Server
- Enhance: ActivityPub の画像添付に width/height を含めるように

## 2026.6.0

### General
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/core/activitypub/ApRendererService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ export class ApRendererService {
mediaType: file.webpublicType ?? file.type,
url: this.driveFileEntityService.getPublicUrl(file),
name: file.comment,
width: file.properties?.width,
height: file.properties?.height,
sensitive: file.isSensitive,
};
}
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/core/activitypub/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ export interface IObject {
href?: string;
tag?: IObject | IObject[];
sensitive?: boolean;
width?: number;
height?: number;
}

/**
Expand Down
23 changes: 23 additions & 0 deletions packages/backend/test/unit/activitypub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { Test } from '@nestjs/testing';
import { MockResolver } from '../misc/mock-resolver.js';
import type { IActor, IApDocument, ICollection, IObject, IPost } from '@/core/activitypub/type.js';
import type { MiRemoteUser } from '@/models/User.js';
import type { MiDriveFile } from '@/models/DriveFile.js';
import { ApImageService } from '@/core/activitypub/models/ApImageService.js';
import { ApNoteService } from '@/core/activitypub/models/ApNoteService.js';
import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
Expand Down Expand Up @@ -399,6 +400,28 @@ describe('ActivityPub', () => {
});

describe('Images', () => {
test('Render image document with dimensions', () => {
const rendered = rendererService.renderDocument({
id: genAidx(Date.now()),
type: 'image/png',
webpublicType: null,
url: 'https://example.test/files/image.png',
webpublicUrl: null,
comment: null,
isSensitive: false,
properties: { width: 3600, height: 1890 },
uri: null,
userHost: null,
isLink: false,
webpublicAccessKey: null,
} as MiDriveFile);

assert.strictEqual(rendered.type, 'Document');
assert.strictEqual(rendered.mediaType, 'image/png');
assert.strictEqual(rendered.width, 3600);
assert.strictEqual(rendered.height, 1890);
});

test('Create images', async () => {
const imageObject: IApDocument = {
type: 'Document',
Expand Down