Update announcement URLs, allow customization of those

This commit is contained in:
Laura Hausmann 2021-01-31 22:31:20 +01:00
parent 90c3ac1324
commit 456a4ef3e2
Signed by: zotan
GPG key ID: 5EC1D38FFC321311
3 changed files with 20 additions and 15 deletions

View file

@ -21,7 +21,9 @@ else {
var stats = StreamUtils.GetStatsObject(); var stats = StreamUtils.GetStatsObject();
<div class="alert alert-success" role="alert"> <div class="alert alert-success" role="alert">
<h4 class="alert-heading">Welcome back!</h4> <h4 class="alert-heading">Welcome back!</h4>
<p>Thanks for using @Program.SiteName. If you have any issues, please contact me on <a href="https://t.me/zotan">Telegram</a>, <a href="https://threema.id/S59S9U8J">Threema</a>, or via <a href="mailto:zotan@zotan.pw">email</a>.</p> <p>Thanks for using @Program.SiteName. If you have any issues, please contact me on @Html.Raw(Program.ContactInfo)</p>
<hr/>
<p>Please subscribe to the <a href="@Program.ServiceAnnouncementUrl" target="_blank">Service Announcements Channel</a> to get informed about maintenance and other important things.</p>
<hr> <hr>
<p class="mb-0">When using OBS, the stream key and leading slash before it is to be left out in the RTMP url.</p> <p class="mb-0">When using OBS, the stream key and leading slash before it is to be left out in the RTMP url.</p>
<hr/> <hr/>

View file

@ -39,7 +39,6 @@
<a class="nav-link text-dark" asp-area="" asp-page="/Dashboard">Dashboard</a> <a class="nav-link text-dark" asp-area="" asp-page="/Dashboard">Dashboard</a>
</li> </li>
} }
</ul> </ul>
@if (Context.Request.Headers["ASP-Site-Type"] != "view") { @if (Context.Request.Headers["ASP-Site-Type"] != "view") {
<partial name="_LoginPartial"/> <partial name="_LoginPartial"/>
@ -56,7 +55,7 @@
<footer class="border-top footer text-muted"> <footer class="border-top footer text-muted">
<div class="container text-center"> <div class="container text-center">
<a href="https://git.zotan.services/zotan/rtmpdash" target="_blank">Source Code</a> - <a asp-area="" asp-page="/Privacy">Privacy</a> - <a href="mailto:@Program.AbuseEmail">Abuse</a> - <a asp-area="" asp-page="/Credits">Credits and Copyright</a> <a href="https://git.zotan.services/zotan/rtmpdash" target="_blank">Source Code</a> - <a href="@Program.ServiceAnnouncementUrl" target="_blank">Service Announcements</a> - <a asp-area="" asp-page="/Privacy">Privacy</a> - <a href="mailto:@Program.AbuseEmail">Abuse</a> - <a asp-area="" asp-page="/Credits">Credits and Copyright</a>
</div> </div>
</footer> </footer>

View file

@ -1,25 +1,29 @@
using System; using System;
using System.Threading;
using LinqToDB.Data; using LinqToDB.Data;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Hosting;
using RTMPDash.DataModels; using RTMPDash.DataModels;
using System.Threading;
namespace RTMPDash { namespace RTMPDash {
public class Program { public class Program {
public const string SiteName = "chaos.stream"; public const string SiteName = "chaos.stream";
public const string IngressDomain = "rtmp://chaos.stream"; public const string IngressDomain = "rtmp://chaos.stream";
public const string RootDomain = "https://chaos.stream"; public const string RootDomain = "https://chaos.stream";
public const string PlayerDomain = "https://live.on.chaos.stream"; public const string PlayerDomain = "https://live.on.chaos.stream";
public const string FragmentDomain = "https://cdn.chaos.stream"; public const string FragmentDomain = "https://cdn.chaos.stream";
public const string StatsDomain = "https://stats.chaos.stream"; public const string StatsDomain = "https://stats.chaos.stream";
public const string PrivacyEmail = "chaosstream-privacy@zotan.email"; public const string PrivacyEmail = "chaosstream-privacy@zotan.email";
public const string CopyrightEmail = "chaosstream-copyright@zotan.email"; public const string CopyrightEmail = "chaosstream-copyright@zotan.email";
public const string AbuseEmail = "chaosstream-abuse@zotan.email"; public const string AbuseEmail = "chaosstream-abuse@zotan.email";
public const string ServiceAnnouncementUrl = "https://t.me/chaosstream";
public const string ContactInfo =
"<a href=\"https://t.me/zotan\" target=\"_blank\">Telegram</a>, <a href=\"https://threema.id/S59S9U8J\" target=\"_blank\">Threema</a>, or via <a href=\"mailto:chaosstream-contact@zotan.email\" target=\"_blank\">email</a>.";
public static void Main(string[] args) { public static void Main(string[] args) {
DataConnection.DefaultSettings = new AppDb.Settings(); DataConnection.DefaultSettings = new AppDb.Settings();
ThreadPool.SetMinThreads(100,100); ThreadPool.SetMinThreads(100, 100);
CreateHostBuilder(args).Build().Run(); CreateHostBuilder(args).Build().Run();
} }
@ -33,4 +37,4 @@ namespace RTMPDash {
public static TimeSpan StripMilliseconds(this TimeSpan time) => public static TimeSpan StripMilliseconds(this TimeSpan time) =>
new(time.Days, time.Hours, time.Minutes, time.Seconds); new(time.Days, time.Hours, time.Minutes, time.Seconds);
} }
} }