Skip to content
Projects
Groups
Snippets
Help
Sign in / Register
Toggle navigation
Minds Backend - Engine
Project overview
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
294
Merge Requests
40
CI / CD
Security & Compliance
Packages
Wiki
Snippets
Members
Collapse sidebar
Close sidebar
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Backend - Engine
Commits
572a567e
Commit
572a567e
authored
1 hour ago
by
Ben Hayward
Browse files
Options
Download
Lint
parent
3a6eb800
fix/blog-media-nsfw-update-1936
1 merge request
!384
[Sprint/QuietQuail](fix): Blog & media edit updated to new nsfw system #1936
Pipeline
#100614162
passed with stages
in 7 minutes and 15 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
Controllers/api/v1/newsfeed.php
View file @
572a567e
...
...
@@ -364,7 +364,7 @@ class newsfeed implements Interfaces\Api
'full_hd'
=>
$embeded
->
getFlag
(
'full_hd'
)
??
false
,
])
->
setTitle
(
$embeded
->
title
)
->
setNsfw
(
$embeded
->
getNSFW
())
->
setNsfw
(
$embeded
->
getNSFW
())
->
setBlurb
(
$embeded
->
description
)
->
setMessage
(
$message
);
}
else
{
...
...
@@ -379,7 +379,7 @@ class newsfeed implements Interfaces\Api
'mature'
=>
$embeded
instanceof
Flaggable
?
$embeded
->
getFlag
(
'mature'
)
:
false
])
->
setMature
(
$embeded
instanceof
Flaggable
?
$embeded
->
getFlag
(
'mature'
)
:
false
)
->
setNsfw
(
$embeded
->
getNSFW
())
->
setNsfw
(
$embeded
->
getNSFW
())
->
setTitle
(
$embeded
->
title
)
->
setBlurb
(
$embeded
->
description
)
->
export
()
...
...
@@ -400,7 +400,7 @@ class newsfeed implements Interfaces\Api
'gif'
=>
(
bool
)
$embeded
->
gif
??
false
,
]])
->
setMature
(
$embeded
instanceof
Flaggable
?
$embeded
->
getFlag
(
'mature'
)
:
false
)
->
setNsfw
(
$embeded
->
getNSFW
())
->
setNsfw
(
$embeded
->
getNSFW
())
->
setFromEntity
(
$embeded
)
->
setTitle
(
$embeded
->
title
)
->
setBlurb
(
$embeded
->
description
)
...
...
This diff is collapsed.
Entities/Image.php
View file @
572a567e
...
...
@@ -347,7 +347,7 @@ class Image extends File
'src'
=>
\elgg_get_site_url
()
.
'fs/v1/thumbnail/'
.
$this
->
guid
,
'href'
=>
\elgg_get_site_url
()
.
'media/'
.
(
$this
->
container_guid
?
$this
->
container_guid
.
'/'
:
''
)
.
$this
->
guid
,
'mature'
=>
$this
->
getFlag
(
'mature'
),
'nsfw'
=>
$this
->
getFlag
(
'nsfw'
)
,
'nsfw'
=>
$this
->
nsfw
?:
[]
,
'width'
=>
$this
->
width
??
0
,
'height'
=>
$this
->
height
??
0
,
'gif'
=>
(
bool
)
(
$this
->
gif
??
false
),
...
...
This diff is collapsed.
Please
register
or
sign in
to comment