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
39
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
256265c6
Commit
256265c6
authored
12 minutes ago
by
Ben Hayward
Browse files
Options
Download
Update for feedback
parent
ba297a25
fix/blog-media-nsfw-update-1936
1 merge request
!384
[Sprint/QuietQuail](fix): Blog & media edit updated to new nsfw system #1936
Pipeline
#100449205
failed with stages
in 2 minutes and 57 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
8 deletions
+7
-8
Controllers/api/v1/newsfeed.php
View file @
256265c6
...
...
@@ -338,7 +338,7 @@ class newsfeed implements Interfaces\Api
->
setThumbnail
(
$embeded
->
getIconUrl
())
->
setFromEntity
(
$embeded
)
->
setMessage
(
$message
)
->
setNsfw
(
$embeded
instanceof
Flaggable
?
$embeded
->
getFlag
(
'nsfw'
)
:
false
);
->
setNsfw
(
$embeded
->
getNSFW
()
);
}
else
{
$activity
->
setRemind
((
new
Activity
())
->
setTimeCreated
(
$embeded
->
time_created
)
...
...
@@ -349,7 +349,7 @@ class newsfeed implements Interfaces\Api
->
setFromEntity
(
$embeded
)
->
export
())
->
setMessage
(
$message
)
->
setNsfw
(
$embeded
instanceof
Flaggable
?
$embeded
->
getFlag
(
'nsfw'
)
:
false
);
->
setNsfw
(
$embeded
->
getNSFW
()
);
}
$save
->
setEntity
(
$activity
)
->
save
();
...
...
@@ -364,7 +364,7 @@ class newsfeed implements Interfaces\Api
'full_hd'
=>
$embeded
->
getFlag
(
'full_hd'
)
??
false
,
])
->
setTitle
(
$embeded
->
title
)
->
setNsfw
(
$embeded
instanceof
Flaggable
?
$embeded
->
getFlag
(
'nsfw'
)
:
false
)
->
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
instanceof
Flaggable
?
$embeded
->
getFlag
(
'nsfw'
)
:
false
)
->
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
instanceof
Flaggable
?
$embeded
->
getFlag
(
'nsfw'
)
:
false
)
->
setNsfw
(
$embeded
->
getNSFW
())
->
setFromEntity
(
$embeded
)
->
setTitle
(
$embeded
->
title
)
->
setBlurb
(
$embeded
->
description
)
...
...
@@ -418,6 +418,7 @@ class newsfeed implements Interfaces\Api
'gif'
=>
(
bool
)
$embeded
->
gif
??
false
,
]])
->
setMature
(
$embeded
instanceof
Flaggable
?
$embeded
->
getFlag
(
'mature'
)
:
false
)
->
setNsfw
(
$embeded
->
getNSFW
())
->
setFromEntity
(
$embeded
)
->
setTitle
(
$embeded
->
title
)
->
setBlurb
(
$embeded
->
description
)
...
...
This diff is collapsed.
Core/Blogs/Delegates/CreateActivity.php
View file @
256265c6
...
...
@@ -52,6 +52,7 @@ class CreateActivity
}
$owner
=
$blog
->
getOwnerEntity
();
$activity
=
(
new
Activity
())
->
setTitle
(
$blog
->
getTitle
())
->
setBlurb
(
strip_tags
(
$blog
->
getBody
()))
...
...
This diff is collapsed.
Entities/Image.php
View file @
256265c6
...
...
@@ -299,9 +299,6 @@ class Image extends File
if
(
$field
==
'access_id'
)
{
$data
[
$field
]
=
(
int
)
$data
[
$field
];
}
elseif
(
$field
==
'nsfw'
)
{
$this
->
nsfw
=
!
is_array
(
$data
[
'nsfw'
])
?
json_decode
(
$data
[
'nsfw'
])
:
$data
[
'nsfw'
];
continue
;
}
elseif
(
$field
==
'mature'
)
{
$this
->
setFlag
(
'mature'
,
!!
$data
[
'mature'
]);
}
...
...
This diff is collapsed.
Please
register
or
sign in
to comment