github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-16 02:02:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

When a users requests content and the voting is enabled, the user who requested is an automatic +1 vote.

Browse source
This commit is contained in:
TidusJar 2018-10-10 21:39:59 +01:00
parent 870a07de9d
commit 4508f79a5f
7 changed files with 68 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi.Core/Engine/MovieRequestEngine.cs
View file

@ -483,7 +483,7 @@ namespace Ombi.Core.Engine
RequestType = RequestType.Movie,
});
return new RequestEngineResult {Result = true, Message = $"{movieName} has been successfully added!"};
return new RequestEngineResult {Result = true, Message = $"{movieName} has been successfully added!", RequestId = model.Id};
}
public async Task<RequestQuotaCountModel> GetRemainingRequests(OmbiUser user)

2
src/Ombi.Core/Engine/MusicRequestEngine.cs
View file

@ -495,7 +495,7 @@ namespace Ombi.Core.Engine
RequestType = RequestType.Album,
});
return new RequestEngineResult { Result = true, Message = $"{model.Title} has been successfully added!" };
return new RequestEngineResult { Result = true, Message = $"{model.Title} has been successfully added!", RequestId = model.Id };
}

1
src/Ombi.Core/Engine/RequestEngineResult.cs
View file

@ -6,5 +6,6 @@
public string Message { get; set; }
public bool IsError => !string.IsNullOrEmpty(ErrorMessage);
public string ErrorMessage { get; set; }
public int RequestId { get; set; }
}
}

7
src/Ombi.Core/Engine/TvRequestEngine.cs
View file

@ -604,15 +604,16 @@ namespace Ombi.Core.Engine
var result = await TvSender.Send(model);
if (result.Success)
{
return new RequestEngineResult { Result = true };
return new RequestEngineResult { Result = true, RequestId = model.Id};
}
return new RequestEngineResult
{
ErrorMessage = result.Message
ErrorMessage = result.Message,
RequestId = model.Id
};
}
return new RequestEngineResult { Result = true };
return new RequestEngineResult { Result = true, RequestId = model.Id };
}
public async Task<RequestQuotaCountModel> GetRemainingRequests(OmbiUser user)

15
src/Ombi.Core/Engine/VoteEngine.cs
View file

@ -149,13 +149,17 @@ namespace Ombi.Core.Engine
public async Task<VoteEngineResult> UpVote(int requestId, RequestType requestType)
{
var voteSettings = await _voteSettings.GetSettingsAsync();
if (!voteSettings.Enabled)
{
return new VoteEngineResult {Result = true};
}
// How many votes does this have?!
var currentVotes = GetVotes(requestId, requestType);
var voteSettings = await _voteSettings.GetSettingsAsync();
// Does this user have a downvote? If so we should revert it and make it an upvote
var user = await GetUser();
// Does this user have a downvote? If so we should revert it and make it an upvote
var currentVote = await GetVoteForUser(requestId, user.Id);
if (currentVote != null && currentVote.VoteType == VoteType.Upvote)
{
@ -206,7 +210,7 @@ namespace Ombi.Core.Engine
{
return new VoteEngineResult
{
ErrorMessage = "Voted succesfully but could not approve movie!"
ErrorMessage = "Voted succesfully but could not approve!"
};
}
@ -218,6 +222,11 @@ namespace Ombi.Core.Engine
public async Task<VoteEngineResult> DownVote(int requestId, RequestType requestType)
{
var voteSettings = await _voteSettings.GetSettingsAsync();
if (!voteSettings.Enabled)
{
return new VoteEngineResult { Result = true };
}
var user = await GetUser();
var currentVote = await GetVoteForUser(requestId, user.Id);
if (currentVote != null && currentVote.VoteType == VoteType.Downvote)