Skip to content
Next
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
296
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
Compare Revisions
35c8d733d5ea5e7a11938845cee69eac2fb2e736...3d2d8c4c49de637d644b6639fb4f310e23c4aac9
Source
3d2d8c4c49de637d644b6639fb4f310e23c4aac9
...
Target
35c8d733d5ea5e7a11938845cee69eac2fb2e736
Compare
Commits (2)
scheduler-groups
· c8924d50
Juan Manuel Solaro
authored
12 minutes ago
c8924d50
Merge branch 'feat/scheduler-groups' into 'master'
· 3d2d8c4c
Mark Harding
authored
12 minutes ago
scheduler-groups Closes
front#2042
See merge request
!358
3d2d8c4c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
Controllers/api/v2/feeds/scheduled.php
View file @
3d2d8c4c
...
...
@@ -65,7 +65,11 @@ class scheduled implements Interfaces\Api
return
Factory
::
response
([
'status'
=>
'success'
,
'count'
=>
$manager
->
getScheduledCount
([
'container_guid'
=>
$container_guid
,
'type'
=>
$type
])
'count'
=>
$manager
->
getScheduledCount
([
'container_guid'
=>
$container_guid
,
'type'
=>
$type
,
'owner_guid'
=>
$currentUser
->
guid
,
])
]);
default
:
return
Factory
::
response
([
...
...
@@ -148,6 +152,7 @@ class scheduled implements Interfaces\Api
'single_owner_threshold'
=>
0
,
'pinned_guids'
=>
$type
===
'activity'
?
array_reverse
(
$container
->
getPinnedPosts
())
:
null
,
'time_created_upper'
=>
false
,
'owner_guid'
=>
$currentUser
->
guid
,
];
if
(
isset
(
$_GET
[
'nsfw'
]))
{
...
...
This diff is collapsed.
Core/Feeds/Scheduled/Repository.php
View file @
3d2d8c4c
...
...
@@ -28,6 +28,7 @@ class Repository
$opts
=
array_merge
([
'container_guid'
=>
null
,
'type'
=>
null
,
'owner_guid'
=>
null
,
],
$opts
);
if
(
!
$opts
[
'type'
])
{
...
...
@@ -64,6 +65,16 @@ class Repository
]
];
if
(
$opts
[
'owner_guid'
])
{
$ownerGuids
=
Text
::
buildArray
(
$opts
[
'owner_guid'
]);
$query
[
'body'
][
'query'
][
'bool'
][
'must'
][]
=
[
'terms'
=>
[
'owner_guid'
=>
$ownerGuids
,
],
];
}
$prepared
=
new
Prepared\Count
();
$prepared
->
query
(
$query
);
...
...
This diff is collapsed.