Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-07-29 16:38:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Separate EULA and announce endpoints by purpose

Browse source 
Also fixes LBP3 login not showing anything
This commit is contained in:
jvyden 2021-10-31 18:11:08 -04:00
commit 79be3e175b
No known key found for this signature in database
GPG key ID: 18BCF2BE0262B278
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ProjectLighthouse/Controllers/MessageController.cs
View file

@ -28,16 +28,20 @@ namespace LBPUnion.ProjectLighthouse.Controllers
? this.StatusCode(403, "") ? this.StatusCode(403, "")
: this.Ok : this.Ok
( (
$"You are now logged in as user {user.Username} (id {user.UserId}).\n" + EulaHelper.PrivateInstanceNoticeOrBlank +
// ReSharper disable once UnreachableCode
(EulaHelper.ShowPrivateInstanceNotice ? "\n" + EulaHelper.PrivateInstanceNotice : "") +
"\n" + "\n" +
$"{EulaHelper.License}\n" $"{EulaHelper.License}\n"
); );
} }
[HttpGet("announce")] [HttpGet("announce")]
public IActionResult Announce() => this.Ok(""); public async Task<IActionResult> Announce()
{
User user = await this.database.UserFromRequest(this.Request);
if (user == null) return this.StatusCode(403, "");
return this.Ok($"You are now logged in as user {user.Username} (id {user.UserId}).\n\n" + EulaHelper.PrivateInstanceNoticeOrBlank);
}
[HttpGet("notification")] [HttpGet("notification")]
public IActionResult Notification() => this.Ok(); public IActionResult Notification() => this.Ok();

5
ProjectLighthouse/Helpers/EulaHelper.cs
View file

@ -19,6 +19,9 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.";
public const string PrivateInstanceNotice = @"This server is a private testing instance. public const string PrivateInstanceNotice = @"This server is a private testing instance.
Please do not make anything public for now, and keep in mind security isn't as tight as a full release would."; Please do not make anything public for now, and keep in mind security isn't as tight as a full release would.";
public const bool ShowPrivateInstanceNotice = false; // ReSharper disable once UnreachableCode
public const string PrivateInstanceNoticeOrBlank = ShowPrivateInstanceNotice ? PrivateInstanceNotice : "";
public const bool ShowPrivateInstanceNotice = true;
} }
} }