From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Wed, 14 Jun 2023 09:26:59 +0000 (+0200)
Subject: discord discriminator stuff round 2
X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;ds=inline;h=b98dac4d596e4bed9a5f96526aa66ea8512ad2ab;p=alttp.git

discord discriminator stuff round 2
---

diff --git a/app/Http/Controllers/DiscordController.php b/app/Http/Controllers/DiscordController.php
index 6f9c03d..1625e32 100644
--- a/app/Http/Controllers/DiscordController.php
+++ b/app/Http/Controllers/DiscordController.php
@@ -146,6 +146,7 @@ class DiscordController extends \Jakyeru\Larascord\Http\Controllers\DiscordContr
 			],
 			[
 				'username' => $user->username,
+				'discord_nickname' => isset($user->global_name) ? $user->global_name : NULL,
 				'discriminator' => $user->discriminator,
 				'email' => isset($user->email) ? $user->email : NULL,
 				'avatar' => $user->avatar ?: NULL,
diff --git a/app/Models/User.php b/app/Models/User.php
index ad5215f..72286a4 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -190,6 +190,7 @@ class User extends Authenticatable
 	protected $fillable = [
 		'id',
 		'username',
+		'discord_nickname',
 		'discriminator',
 		'email',
 		'avatar',
diff --git a/database/migrations/2023_06_14_091826_add_user_discord_nickname.php b/database/migrations/2023_06_14_091826_add_user_discord_nickname.php
new file mode 100644
index 0000000..a8e9a35
--- /dev/null
+++ b/database/migrations/2023_06_14_091826_add_user_discord_nickname.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('users', function(Blueprint $table) {
+			$table->string('discord_nickname')->nullable()->default(null);
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('users', function(Blueprint $table) {
+			$table->dropColumn('discord_nickname');
+		});
+	}
+};
diff --git a/resources/js/components/common/Footer.js b/resources/js/components/common/Footer.js
index 361c1f7..71d8998 100644
--- a/resources/js/components/common/Footer.js
+++ b/resources/js/components/common/Footer.js
@@ -57,6 +57,15 @@ const Footer = () => {
 							</Nav.Link>
 						</LinkContainer>
 					</Nav.Item>
+					<Nav.Item as="li">
+						<Nav.Link
+							className="p-0 text-muted"
+							href="https://glitchmaps.mfns.dev/"
+							target="_blank"
+						>
+							{t('footer.muffins')}
+						</Nav.Link>
+					</Nav.Item>
 					<Nav.Item as="li">
 						<Nav.Link
 							className="p-0 text-muted"
diff --git a/resources/js/components/common/Header.js b/resources/js/components/common/Header.js
index 53119bc..21c6a67 100644
--- a/resources/js/components/common/Header.js
+++ b/resources/js/components/common/Header.js
@@ -55,7 +55,9 @@ const Header = ({ doLogout, user }) => {
 							<Nav.Link>
 								<img alt="" src={getAvatarUrl(user)} />
 								{user.username}
-								<span className="text-muted">#{user.discriminator}</span>
+								{user.discriminator && user.discriminator !== '0' ?
+									<span className="text-muted">#{user.discriminator}</span>
+								: null}
 							</Nav.Link>
 						</LinkContainer>
 						<Button
diff --git a/resources/js/components/users/Box.js b/resources/js/components/users/Box.js
index fd5814f..c0d011b 100644
--- a/resources/js/components/users/Box.js
+++ b/resources/js/components/users/Box.js
@@ -4,7 +4,7 @@ import { Button } from 'react-bootstrap';
 import { withTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 
-import { getAvatarUrl } from '../../helpers/User';
+import { getAvatarUrl, getUserName } from '../../helpers/User';
 import i18n from '../../i18n';
 
 const Box = ({ discriminator, noLink, user }) => {
@@ -16,8 +16,8 @@ const Box = ({ discriminator, noLink, user }) => {
 
 	const content = <>
 		<img alt="" src={getAvatarUrl(user)} />
-		<span>{discriminator || !user.nickname ? user.username : user.nickname}</span>
-		{discriminator && user.discriminator ?
+		<span>{discriminator ? user.username : getUserName(user)}</span>
+		{discriminator && user.discriminator && user.discriminator !== '0' ?
 			<span className="text-muted">
 				{'#'}
 				{user.discriminator}
diff --git a/resources/js/helpers/User.js b/resources/js/helpers/User.js
index 9a55444..0705bed 100644
--- a/resources/js/helpers/User.js
+++ b/resources/js/helpers/User.js
@@ -1,5 +1,3 @@
-import moment from 'moment';
-
 export const compareFinished = round => (a, b) => {
 	const a_result = findResult(a, round);
 	const b_result = findResult(b, round);
@@ -58,7 +56,8 @@ export const getAvatarUrl = user => {
 	return '/default-avatar.png';
 };
 
-export const getUserName = user => (user && (user.nickname || user.username)) || '';
+export const getUserName = user => (user &&
+	(user.nickname || user.discord_nickname || user.username)) || '';
 
 export const hasFinishedRound = (user, round) => {
 	const result = findResult(user, round);
diff --git a/resources/js/i18n/de.js b/resources/js/i18n/de.js
index d8cf861..b91fee4 100644
--- a/resources/js/i18n/de.js
+++ b/resources/js/i18n/de.js
@@ -322,9 +322,10 @@ export default {
 			alttpwiki: 'ALttP Speedrunning Wiki',
 			competitions: 'Wettbewerbe',
 			connect: 'Connect Spedruns Discord',
-			contact: 'Wenn du gerne ein Turnier auf dieser Seite organisieren möchtest, wende dich bitte an HolySmoke#5229 im Discord.',
+			contact: 'Wenn du gerne ein Turnier auf dieser Seite organisieren möchtest, wende dich bitte an holysmoke86 im Discord.',
 			info: 'Infos',
 			map: 'ALttP Karte',
+			muffins: 'Muffins\' Glitch Map (EN)',
 			privacy: 'Datenschutz',
 			resources: 'Ressourcen',
 			smd: 'Deutscher Super Metroid Discord',
diff --git a/resources/js/i18n/en.js b/resources/js/i18n/en.js
index d143eb0..fed1d5b 100644
--- a/resources/js/i18n/en.js
+++ b/resources/js/i18n/en.js
@@ -322,9 +322,10 @@ export default {
 			alttpwiki: 'ALttP Speedrunning Wiki',
 			competitions: 'Competitions',
 			connect: 'Connect Spedruns Discord',
-			contact: 'If you would like to organize a Tournament on this site, please contact HolySmoke#5229 on Discord.',
+			contact: 'If you would like to organize a Tournament on this site, please contact holysmoke86 on Discord.',
 			info: 'Infos',
 			map: 'ALttP Map',
+			muffins: 'Muffins\' Glitch Map',
 			privacy: 'Privacy',
 			resources: 'Resources',
 			smd: 'German Super Metroid Discord',