Skip to content

Account for null discord invite and owner username #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Toastbrot236 merged 2 commits into from
Feb 14, 2026
+39 −17
Merged

Account for null discord invite and owner username #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9012792
Account for null discord invite and owner username
Toastbrot236 Feb 14, 2026
c76d123
Wrap and break owner email address if it's too long
Toastbrot236 Feb 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/api/types/contact-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export interface ContactInfo {
adminName: string;
emailAddress: string;
discordServerInvite: string;
adminDiscordUsername: string;
discordServerInvite: string | null;
adminDiscordUsername: string | null;
}
25 changes: 17 additions & 8 deletions src/app/components/ui/footer.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,24 @@ import { RouterLink } from "@angular/router";
<p class="text-3xl">Get In Touch</p>
<a [href]="'mailto:' + instance.contactInfo.emailAddress" class="text-link hover:text-link-hover hover:underline">
<fa-icon class="pr-1" [icon]="faEnvelope"></fa-icon>
Email Us ({{ instance.contactInfo.emailAddress }})
Email Us <span class="word-wrap-and-break">({{ instance.contactInfo.emailAddress }})</span>
</a>
<a [href]="instance.contactInfo.discordServerInvite" class="text-link hover:text-link-hover hover:underline">
<fa-icon class="pr-1" [icon]="faSignIn"></fa-icon>
Join Our Discord Server
</a>
<p>
You can also contact <span class="italic">{{ instance.contactInfo.adminName }}</span> on Discord at <span class="italic">{{ instance.contactInfo.adminDiscordUsername }}</span>
</p>
@if (instance.contactInfo.discordServerInvite != null) {
<a [href]="instance.contactInfo.discordServerInvite" class="text-link hover:text-link-hover hover:underline">
<fa-icon class="pr-1" [icon]="faSignIn"></fa-icon>
Join Our Discord Server
</a>
}
@if (instance.contactInfo.adminDiscordUsername != null) {
<p>
You can also contact <span class="italic">{{ instance.contactInfo.adminName }}</span> on Discord at <span class="italic">{{ instance.contactInfo.adminDiscordUsername }}</span>
</p>
}
@else {
<p>
Server owner: <span class="italic">{{ instance.contactInfo.adminName }}</span>
</p>
}
</div>
</ng-template>

Expand Down
27 changes: 20 additions & 7 deletions src/app/pages/instance-info/instance-info.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,27 @@ <h2 class="font-bold text-2xl">Server Information</h2>

<h2 class="font-bold text-2xl">Contact Us</h2>
<p>Owner: <span class="italic">{{ instance.contactInfo.adminName }}</span></p>
<p>Owner Discord username: <span class="italic">{{ instance.contactInfo.adminDiscordUsername }}</span></p>
<p>Discord server invite:
<a [href]="instance.contactInfo.discordServerInvite" class="text-link hover:text-link-hover hover:underline">
{{ instance.contactInfo.discordServerInvite }}
</a>
</p>

@if (instance.contactInfo.adminDiscordUsername != null) {
<p>Owner Discord username: <span class="italic">{{ instance.contactInfo.adminDiscordUsername }}</span></p>
}
@else {
<p>No Discord username of the owner</p>
}

@if (instance.contactInfo.discordServerInvite != null) {
<p>Discord server invite:
<a [href]="instance.contactInfo.discordServerInvite" class="text-link hover:text-link-hover hover:underline">
{{ instance.contactInfo.discordServerInvite }}
</a>
</p>
}
@else {
<p>No Discord server invite</p>
}

<p>Email address:
<a [href]="'mailto:' + instance.contactInfo.emailAddress" class="text-link hover:text-link-hover hover:underline">
<a [href]="'mailto:' + instance.contactInfo.emailAddress" class="text-link hover:text-link-hover hover:underline word-wrap-and-break">
{{instance.contactInfo.emailAddress }}
</a>
</p>
Expand Down