CrazyHackGUT/telegram-bot
1
0
Fork 0
mirror of https://github.com/Bubuni-Team/telegram-bot.git synced 2026-07-31 00:29:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30 from Bubuni-Team/patch/rss_relative_uri

Browse Source 
Fix URL building for feeds with relative URLs
This commit is contained in:
Сергей Гут
2023-02-15 18:40:35 +03:00
committed by GitHub
parent 1a94764334 dba84e1a62
commit c8e833c48f
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/RichSiteSummary/Data/Post.cs
+1 -1
View File
@@ -30,7 +30,7 @@ namespace Kruzya.TelegramBot.RichSiteSummary.Data
protected override string ViewableUrl protected override string ViewableUrl
{ {
get => UtmUtility.ApplyParameters(Url, new UtmParameters() get => UtmUtility.ApplyParameters(new Uri(new(Feed.Url), Url), new UtmParameters()
{ {
Source = "telegram", Source = "telegram",
Type = "rss_post", Type = "rss_post",
modules/RichSiteSummary/UrchinTrackingModule/UtmUtility.cs
+5 -3
View File
@@ -9,16 +9,18 @@ namespace Kruzya.TelegramBot.RichSiteSummary.UrchinTrackingModule
public class UtmUtility public class UtmUtility
{ {
public static string ApplyParameters(string url, UtmParameters parameters) public static string ApplyParameters(string url, UtmParameters parameters)
=> ApplyParameters(new Uri(url), parameters);
public static string ApplyParameters(Uri uri, UtmParameters parameters)
{ {
var uri = new Uri(url);
var query = HttpUtility.ParseQueryString(uri.Query); var query = HttpUtility.ParseQueryString(uri.Query);
SetIfNotNull(query, "utm_source", parameters.Source); SetIfNotNull(query, "utm_source", parameters.Source);
SetIfNotNull(query, "utm_medium", parameters.Type); SetIfNotNull(query, "utm_medium", parameters.Type);
SetIfNotNull(query, "utm_campaign", parameters.Campaign); SetIfNotNull(query, "utm_campaign", parameters.Campaign);
SetIfNotNull(query, "utm_term", parameters.Term); SetIfNotNull(query, "utm_term", parameters.Term);
SetIfNotNull(query, "utm_content", parameters.Content); SetIfNotNull(query, "utm_content", parameters.Content);
var uriBuilder = new UriBuilder(uri); var uriBuilder = new UriBuilder(uri);
uriBuilder.Query = BuildQueryString(query); uriBuilder.Query = BuildQueryString(query);
return uriBuilder.ToString(); return uriBuilder.ToString();