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

Fixed #3409 and also a error when sending whatsapp notifications

Browse source
This commit is contained in:
tidusjar 2020-02-26 12:13:43 +00:00
commit c0ea803611
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Ombi.Api.Twilio/WhatsAppApi.cs
View file

@ -12,6 +12,10 @@ namespace Ombi.Api.Twilio
{
TwilioClient.Init(accountSid, authToken);
if(string.IsNullOrEmpty(message.To))
{
return string.Empty;
}
var response =await MessageResource.CreateAsync(
body: message.Message,
from: new PhoneNumber($"whatsapp:{message.From}"),

8
src/Ombi.Core/Rule/Rules/Request/ExistingPlexRequestRule.cs
View file

@ -29,15 +29,15 @@ namespace Ombi.Core.Rule.Rules.Request
if (obj.RequestType == RequestType.TvShow)
{
var tvRequest = (ChildRequests) obj;
var tvContent = _plexContent.GetAll().Where(x => x.Type == PlexMediaTypeEntity.Show);
var tvContent = _plexContent.GetAll().Include(x => x.Episodes).Where(x => x.Type == PlexMediaTypeEntity.Show);
// We need to do a check on the TVDBId
var anyTvDbMatches = await tvContent.Include(x => x.Episodes).FirstOrDefaultAsync(x => x.HasTvDb && x.TvDbId == tvRequest.Id.ToString()); // the Id on the child is the tvdbid at this point
var anyTvDbMatches = await tvContent.FirstOrDefaultAsync(x => x.TvDbId.Length > 0 && x.TvDbId == tvRequest.Id.ToString()); // the Id on the child is the tvdbid at this point
if (anyTvDbMatches == null)
{
// So we do not have a TVDB Id, that really sucks.
// Let's try and match on the title and year of the show
var titleAndYearMatch = await tvContent.Include(x=> x.Episodes).FirstOrDefaultAsync(x =>
var titleAndYearMatch = await tvContent.FirstOrDefaultAsync(x =>
x.Title == tvRequest.Title
&& x.ReleaseYear == tvRequest.ReleaseYear.Year.ToString());
if (titleAndYearMatch != null)