mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-10-31 22:40:01 +00:00
[bugfix] Fix incorrect field name for status source, add helpful message (#2854)
* [bugfix] Fix incorrect field name for status source, add helpful message * swagger * yyammm
This commit is contained in:
parent
431505b3e4
commit
b7c629a18a
4 changed files with 11 additions and 7 deletions
|
@ -2433,14 +2433,14 @@ definitions:
|
|||
example: 01FBVD42CQ3ZEEVMW180SBX03B
|
||||
type: string
|
||||
x-go-name: ID
|
||||
source:
|
||||
description: Plain-text source of a status.
|
||||
type: string
|
||||
x-go-name: Text
|
||||
spoiler_text:
|
||||
description: Plain-text version of spoiler text.
|
||||
type: string
|
||||
x-go-name: SpoilerText
|
||||
text:
|
||||
description: Plain-text source of a status.
|
||||
type: string
|
||||
x-go-name: Text
|
||||
type: object
|
||||
x-go-name: StatusSource
|
||||
x-go-package: github.com/superseriousbusiness/gotosocial/internal/api/model
|
||||
|
|
|
@ -91,7 +91,7 @@ func (suite *StatusSourceTestSuite) TestGetSource() {
|
|||
|
||||
suite.Equal(`{
|
||||
"id": "01F8MHAMCHF6Y650WCRSCP4WMY",
|
||||
"source": "hello everyone!",
|
||||
"text": "**STATUS EDITS ARE NOT CURRENTLY SUPPORTED IN GOTOSOCIAL (coming in 2024)**\nYou can review the original text of your status below, but you will not be able to submit this edit.\n\n---\n\nhello everyone!",
|
||||
"spoiler_text": "introduction post"
|
||||
}`, dst.String())
|
||||
}
|
||||
|
|
|
@ -259,7 +259,7 @@ type StatusSource struct {
|
|||
// example: 01FBVD42CQ3ZEEVMW180SBX03B
|
||||
ID string `json:"id"`
|
||||
// Plain-text source of a status.
|
||||
Text string `json:"source"`
|
||||
Text string `json:"text"`
|
||||
// Plain-text version of spoiler text.
|
||||
SpoilerText string `json:"spoiler_text"`
|
||||
}
|
||||
|
|
|
@ -796,9 +796,13 @@ func (c *Converter) StatusToWebStatus(
|
|||
// Callers should check beforehand whether a requester has permission to view the
|
||||
// source of the status, and ensure they're passing only a local status into this function.
|
||||
func (c *Converter) StatusToAPIStatusSource(ctx context.Context, s *gtsmodel.Status) (*apimodel.StatusSource, error) {
|
||||
// TODO: remove this when edit support is added.
|
||||
text := "**STATUS EDITS ARE NOT CURRENTLY SUPPORTED IN GOTOSOCIAL (coming in 2024)**\n" +
|
||||
"You can review the original text of your status below, but you will not be able to submit this edit.\n\n---\n\n" + s.Text
|
||||
|
||||
return &apimodel.StatusSource{
|
||||
ID: s.ID,
|
||||
Text: s.Text,
|
||||
Text: text,
|
||||
SpoilerText: s.ContentWarning,
|
||||
}, nil
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue