Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix Recently Added Series
  • Loading branch information
da3dsoul committed Jun 15, 2019
1 parent 76d97a4 commit d63ff7d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 20 deletions.
Expand Up @@ -523,23 +523,8 @@ public List<CL_AnimeSeries_User> GetSeriesRecentlyAdded(int maxRecords, int user
SVR_JMMUser user = RepoFactory.JMMUser.GetByID(userID);
if (user == null) return retSeries;

List<SVR_AnimeSeries> series = RepoFactory.AnimeSeries.GetMostRecentlyAdded(maxRecords);
int numSeries = 0;
foreach (SVR_AnimeSeries ser in series)
{
if (user.AllowedSeries(ser))
{
CL_AnimeSeries_User serContract = ser.GetUserContract(userID);
if (serContract != null)
{
retSeries.Add(serContract);
numSeries++;

// Lets only return the specified amount
if (retSeries.Count == maxRecords) return retSeries;
}
}
}
List<SVR_AnimeSeries> series = RepoFactory.AnimeSeries.GetMostRecentlyAdded(maxRecords, userID);
retSeries.AddRange(series.Select(a => a.GetUserContract(userID)).Where(a => a != null));
}
catch (Exception ex)
{
Expand Down
2 changes: 1 addition & 1 deletion Shoko.Server/API/v2/Modules/Common.cs
Expand Up @@ -1692,7 +1692,7 @@ public ActionResult<IEnumerable<Serie>> GetSeriesRecent([FromQuery] API_Call_Par
{
para.limit = 10;
}
List<SVR_AnimeSeries> series = RepoFactory.AnimeSeries.GetMostRecentlyAdded(para.limit);
List<SVR_AnimeSeries> series = RepoFactory.AnimeSeries.GetMostRecentlyAdded(para.limit, User.JMMUserID);

foreach (SVR_AnimeSeries aser in series)
{
Expand Down
5 changes: 3 additions & 2 deletions Shoko.Server/Repositories/Cached/AnimeSeriesRepository.cs
Expand Up @@ -273,11 +273,12 @@ public List<SVR_AnimeSeries> GetWithMissingEpisodes()
}
}

public List<SVR_AnimeSeries> GetMostRecentlyAdded(int maxResults)
public List<SVR_AnimeSeries> GetMostRecentlyAdded(int maxResults, int userID)
{
lock (Cache)
{
return Cache.Values.OrderByDescending(a => a.DateTimeCreated).Take(maxResults).ToList();
return Cache.Values.Where(a => userID == 0 || RepoFactory.JMMUser.GetByID(userID).AllowedSeries(a))
.OrderByDescending(a => a.DateTimeCreated).Take(maxResults).ToList();
}
}
}
Expand Down

0 comments on commit d63ff7d

Please sign in to comment.