summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/external/addressbook/discord.js4
-rw-r--r--pages/evening.inc2
2 files changed, 4 insertions, 2 deletions
diff --git a/includes/external/addressbook/discord.js b/includes/external/addressbook/discord.js
index 068f6b0..0993799 100644
--- a/includes/external/addressbook/discord.js
+++ b/includes/external/addressbook/discord.js
@@ -27,7 +27,7 @@ function sleep(ms) {
copy: [
{
title: "Copy full username",
- text: `${data['username']}#${data['discriminator']}`
+ text: data['discriminator'] === "0" ? data['username'] : `${data['username']}#${data['discriminator']}`
},
{
title: "Copy mention",
@@ -45,7 +45,7 @@ function sleep(ms) {
}
if (data['display_name'] || data['global_name']) {
- obj.description = data['username'] + "#" + data['discriminator'];
+ obj.description = data['discriminator'] === "0" ? data['username'] : `${data['username']}#${data['discriminator']}`;
} else {
obj.description = "#" + data['discriminator'];
}
diff --git a/pages/evening.inc b/pages/evening.inc
index 6f9e7b8..c0b2818 100644
--- a/pages/evening.inc
+++ b/pages/evening.inc
@@ -154,9 +154,11 @@ if (!isset($cache["content"]) || date('Y-m-d') !== $cache["day"]) {
<div>
<h2><?= $pages["evening"]["name"][$lang["_name"]] ?><?= time() >= 1686787200 ? "" : " (Beta)" ?></h2>
+ <?php if (time() < 1686787200): ?>
<div class="alert alert-warning">
<b>The evening schedule will replace the fronting schedule starting June 15<sup>th</sup>.</b> The fronting schedule page contains more information and shows the schedule up to that date. The evening schedule is experimental until then.
</div>
+ <?php endif; ?>
<details>
<summary style="list-style: none; outline: none; cursor: text;">