diff --git a/Lampac/Startup.cs b/Lampac/Startup.cs index 95a6632a..ebf56d34 100644 --- a/Lampac/Startup.cs +++ b/Lampac/Startup.cs @@ -13,7 +13,6 @@ using Newtonsoft.Json.Linq; using System.Text; using System.Net; -using System.IO; namespace Lampac { diff --git a/Online/OnlineApi.cs b/Online/OnlineApi.cs index cf022c54..1e6abe46 100644 --- a/Online/OnlineApi.cs +++ b/Online/OnlineApi.cs @@ -67,7 +67,7 @@ async public Task Externalids(long id, string imdb_id, long kinopo if (IO.File.Exists("cache/externalids/master.json")) externalids = JsonConvert.DeserializeObject>(IO.File.ReadAllText("cache/externalids/master.json")); - #region getAlloha / getVSDN / getTabus / getCDNmovies + #region getAlloha / getVSDN / getTabus async Task getAlloha(string imdb) { var proxyManager = new ProxyManager("alloha", AppInit.conf.Alloha); @@ -262,7 +262,7 @@ async public Task Events(long id, string imdb_id, long kinopoisk_i online += "{\"name\":\"" + (conf.VoKino.displayname ?? "VoKino") + "\",\"url\":\"{localhost}/vokino\"},"; if (conf.KinoPub.enable) - online += "{\"name\":\"" + (conf.KinoPub.displayname ?? "KinoPub") + "\",\"url\":\"{localhost}/kinopub\"},"; + online += "{\"name\":\"" + (conf.KinoPub.displayname ?? "KinoPub") + "\",\"url\":\"{localhost}/kinopub"+(source == "pub" ? $"?postid={id}" : "")+"\"},"; if (conf.Filmix.enable) online += "{\"name\":\"" + (conf.Filmix.displayname ?? "Filmix") + "\",\"url\":\"{localhost}/filmix"+(source == "filmix" ? $"?postid={id}" : "")+"\"},"; @@ -407,7 +407,7 @@ async public Task Events(long id, string imdb_id, long kinopoisk_i async Task checkSearch(ConcurrentBag<(string code, int index, bool work)> links, List tasks, int index, string name, string uri, long id, string imdb_id, long kinopoisk_id, string title, string original_title, string original_language, string source, int year, int serial) { - string account_email = AppInit.conf.accsdb.enable ? AppInit.conf.accsdb?.accounts?.First() : ""; + string account_email = AppInit.conf.accsdb.enable ? AppInit.conf.accsdb?.accounts?.First().Key : ""; string res = await HttpClient.Get($"{host}/lite/{uri}{(uri.Contains("?") ? "&" : "?")}id={id}&imdb_id={imdb_id}&kinopoisk_id={kinopoisk_id}&title={HttpUtility.UrlEncode(title)}&original_title={HttpUtility.UrlEncode(original_title)}&original_language={original_language}&source={source}&year={year}&serial={serial}&account_email={HttpUtility.UrlEncode(account_email)}&checksearch=true", timeoutSeconds: 10); bool work = !string.IsNullOrWhiteSpace(res) && res.Contains("data-json="); diff --git a/Shared.Model/AppInit.cs b/Shared.Model/AppInit.cs index 7ccb4e91..37da0e26 100644 --- a/Shared.Model/AppInit.cs +++ b/Shared.Model/AppInit.cs @@ -69,7 +69,7 @@ public class AppInit public OnlinesSettings Zetflix { get; set; } = new OnlinesSettings("https://zetfix.online"); - public OnlinesSettings VideoDB { get; set; } = new OnlinesSettings("https://kinoplay.site"); + public OnlinesSettings VideoDB { get; set; } = new OnlinesSettings("https://kinoplay1.site"); public OnlinesSettings CDNmovies { get; set; } = new OnlinesSettings("https://cdnmovies.nl");