mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-22 06:21:27 +00:00
Merge branch 'staging' into patch-4
This commit is contained in:
commit
027b0a7115
8 changed files with 23 additions and 26 deletions
|
@ -9,6 +9,8 @@
|
|||
- Hardcode UTC application timezone to prevent timezone issues ([b0d2c5e1](https://github.com/pixelfed/pixelfed/commit/b0d2c5e1))
|
||||
- Remove arbitrary metro url redirect timeout ([84209c24](https://github.com/pixelfed/pixelfed/commit/84209c24))
|
||||
- Add trusted proxies flag to admin dashboard diagnostics ([#3450](https://github.com/pixelfed/pixelfed/pull/3450))
|
||||
- Fix json-ld attributes, fixes #3423 ([95f902b1](https://github.com/pixelfed/pixelfed/commit/95f902b1))
|
||||
- Update exp config, enforce mastoapi compatibility by default ([a160b233](https://github.com/pixelfed/pixelfed/commit/a160b233))
|
||||
|
||||
## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)
|
||||
|
||||
|
|
|
@ -60,10 +60,10 @@ class CreateNote extends Fractal\TransformerAbstract
|
|||
'Hashtag' => 'as:Hashtag',
|
||||
'sensitive' => 'as:sensitive',
|
||||
'commentsEnabled' => 'sc:Boolean',
|
||||
'capabilities' => [
|
||||
'announce' => ['@type' => '@id'],
|
||||
'like' => ['@type' => '@id'],
|
||||
'reply' => ['@type' => '@id']
|
||||
'@capabilities' => [
|
||||
'@announce' => '@id',
|
||||
'@like' => '@id',
|
||||
'@reply' => '@id',
|
||||
],
|
||||
'toot' => 'http://joinmastodon.org/ns#',
|
||||
'Emoji' => 'toot:Emoji'
|
||||
|
|
|
@ -23,11 +23,11 @@ class CreateQuestion extends Fractal\TransformerAbstract
|
|||
'Hashtag' => 'as:Hashtag',
|
||||
'sensitive' => 'as:sensitive',
|
||||
'commentsEnabled' => 'sc:Boolean',
|
||||
'capabilities' => [
|
||||
'announce' => ['@type' => '@id'],
|
||||
'like' => ['@type' => '@id'],
|
||||
'reply' => ['@type' => '@id']
|
||||
]
|
||||
'@capabilities' => [
|
||||
'@announce' => '@id',
|
||||
'@like' => '@id',
|
||||
'@reply' => '@id',
|
||||
],
|
||||
]
|
||||
],
|
||||
'id' => $status->permalink(),
|
||||
|
|
|
@ -10,10 +10,7 @@ class DeleteNote extends Fractal\TransformerAbstract
|
|||
public function transform(Status $status)
|
||||
{
|
||||
return [
|
||||
'@context' => [
|
||||
'https://www.w3.org/ns/activitystreams',
|
||||
'https://w3id.org/security/v1',
|
||||
],
|
||||
'@context' => 'https://www.w3.org/ns/activitystreams',
|
||||
'id' => $status->permalink('#delete'),
|
||||
'type' => 'Delete',
|
||||
'actor' => $status->profile->permalink(),
|
||||
|
@ -24,4 +21,4 @@ class DeleteNote extends Fractal\TransformerAbstract
|
|||
];
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -61,10 +61,10 @@ class Note extends Fractal\TransformerAbstract
|
|||
'Hashtag' => 'as:Hashtag',
|
||||
'sensitive' => 'as:sensitive',
|
||||
'commentsEnabled' => 'sc:Boolean',
|
||||
'capabilities' => [
|
||||
'announce' => ['@type' => '@id'],
|
||||
'like' => ['@type' => '@id'],
|
||||
'reply' => ['@type' => '@id'],
|
||||
'@capabilities' => [
|
||||
'@announce' => '@id',
|
||||
'@like' => '@id',
|
||||
'@reply' => '@id',
|
||||
],
|
||||
'toot' => 'http://joinmastodon.org/ns#',
|
||||
'Emoji' => 'toot:Emoji'
|
||||
|
|
|
@ -40,11 +40,11 @@ class Question extends Fractal\TransformerAbstract
|
|||
'Hashtag' => 'as:Hashtag',
|
||||
'sensitive' => 'as:sensitive',
|
||||
'commentsEnabled' => 'sc:Boolean',
|
||||
'capabilities' => [
|
||||
'announce' => ['@type' => '@id'],
|
||||
'like' => ['@type' => '@id'],
|
||||
'reply' => ['@type' => '@id']
|
||||
]
|
||||
'@capabilities' => [
|
||||
'@announce' => '@id',
|
||||
'@like' => '@id',
|
||||
'@reply' => '@id',
|
||||
],
|
||||
]
|
||||
],
|
||||
'id' => $status->url(),
|
||||
|
|
|
@ -38,7 +38,6 @@ class StatusTransformer extends Fractal\TransformerAbstract
|
|||
'website' => null
|
||||
],
|
||||
'mentions' => [],
|
||||
'tags' => [],
|
||||
'emojis' => [],
|
||||
'card' => null,
|
||||
'poll' => null,
|
||||
|
|
|
@ -32,6 +32,5 @@ return [
|
|||
'spa' => true,
|
||||
|
||||
// Enforce Mastoapi Compatibility (alpha)
|
||||
// Note: this may break 3rd party apps who use non-mastodon compliant fields
|
||||
'emc' => env('EXP_EMC', false),
|
||||
'emc' => env('EXP_EMC', true),
|
||||
];
|
||||
|
|
Loading…
Reference in a new issue