github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 12:59:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

!wip removed trailing slash from mattermost request url to fix notifications not sending

Browse source
This commit is contained in:
Anojh 2018-05-31 00:33:31 -07:00
commit 612e689a8c
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Ombi.Api.Mattermost/Models/MattermostClient.cs
View file

@ -120,8 +120,10 @@ namespace Ombi.Api.Mattermost.Models
var attIndex = outMessages[msgCount].Attachments.Count - 1; var attIndex = outMessages[msgCount].Attachments.Count - 1;
//Get the text lines //Get the text lines
if (!String.IsNullOrEmpty(att.Text))
{
lines = att.Text.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None); lines = att.Text.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
}
foreach (var line in lines) foreach (var line in lines)
{ {
//Get the total length of all attachments on the current outgoing message //Get the total length of all attachments on the current outgoing message
@ -155,6 +157,7 @@ namespace Ombi.Api.Mattermost.Models
{ {
var request = new Request("", _webhookUrl.ToString(), HttpMethod.Post); var request = new Request("", _webhookUrl.ToString(), HttpMethod.Post);
request.AddJsonBody(msg); request.AddJsonBody(msg);
request.AddHeader("Host", _webhookUrl.Host);
await api.Request(request); await api.Request(request);
} }
} }

10
src/Ombi.Api/Api.cs
View file

@ -106,7 +106,15 @@ namespace Ombi.Api
public async Task Request(Request request) public async Task Request(Request request)
{ {
using (var httpRequestMessage = new HttpRequestMessage(request.HttpMethod, request.FullUri)) object url;
if (request.JsonBody.ToString().Contains("Mattermost"))
{
url = request.BaseUrl;
} else
{
url = request.FullUri;
}
using (var httpRequestMessage = new HttpRequestMessage(request.HttpMethod, url.ToString()))
{ {
AddHeadersBody(request, httpRequestMessage); AddHeadersBody(request, httpRequestMessage);
var httpResponseMessage = await _client.SendAsync(httpRequestMessage); var httpResponseMessage = await _client.SendAsync(httpRequestMessage);