Update team and add discord contact config (#143)

Update team and add Discord contact config

README.md

@@ -148,6 +148,7 @@ Add `config.json` file in root directory with following content. You can use `co
 {
   "title": "Pony Town",
   "discordLink": "https://discordapp.com/invite/<invite_code>", // optional
+  "contactDiscord": "your_contact_discord#0000", // optional
   "twitterLink": "https://twitter.com/<twitter_name>", // optional
   "contactEmail": "<your_contact_email>",
   "port": 8090,

config-template.json

@@ -3,6 +3,7 @@
 	"discordLink": "<LINK_TO_DISCORD_INVITE>",
 	"twitterLink": "<LINK_TO_TWITTER>",
 	"contactEmail": "[email protected]",
+	"contactDiscord": "your_contact_discord#0000",
 	"port": 8090,
 	"adminPort": 8091,
 	"host": "http://localhost:8090/",

src/ts/client/credits.ts

@@ -30,12 +30,6 @@ export const CREDITS: Credit[] = [
 		avatarIndex: 0,
 		links: ['https://twitter.com/BytewaveMLP', 'https://github.com/BytewaveMLP']
 	},
-	{
-		name: 'Cloud Hop',
-		title: 'Programmer',
-		avatarIndex: 1,
-		links: ['https://twitter.com/blackhole0173', 'https://github.com/blackhole12']
-	},
 	{
 		name: 'CyberPon3',
 		title: 'Programmer / Moderator',
@@ -48,24 +42,36 @@ export const CREDITS: Credit[] = [
 		avatarIndex: 3,
 		links: ['https://github.com/Keupoz']
 	},
-	{
-		name: 'NotMyWing',
-		title: 'Programmer / Moderator',
-		avatarIndex: 4,
-		links: ['https://twitter.com/NotMyWing', 'https://github.com/Neeve01']
-	},
 	{
 		name: 'Luney',
 		title: 'Programmer',
 		avatarIndex: 5,
 		links: ['https://twitter.com/luneythesnep', 'https://github.com/LunarMist']
 	},
+	{
+		name: 'MysticBlare',
+		title: 'Artist',
+		avatarIndex: 1,
+		links: ['https://twitter.com/MysticBlare']
+	},
+	{
+		name: 'NotMyWing',
+		title: 'Programmer / Moderator',
+		avatarIndex: 4,
+		links: ['https://twitter.com/NotMyWing', 'https://github.com/Neeve01']
+	},
 	{
 		name: 'Stubenhocker',
 		title: 'Programmer',
 		avatarIndex: 6,
 		links: ['https://github.com/Stubenhocker1399', 'https://twitter.com/Stubenhocker13']
 	},
+	{
+		name: 'Sunberry',
+		title: 'Moderator',
+		avatarIndex: 9,
+		links: ['https://twitter.com/Sunberreiy']
+	},
 	{
 		name: 'Terncode',
 		title: 'Programmer',
@@ -118,7 +124,6 @@ export const CONTRIBUTORS: Contributors[] = [
 			{ name: 'Wellfugzee' },
 			{ name: 'ScribblesHeart', links: ['https://www.deviantart.com/scribblesdesu'] },
 			{ name: 'dsp2003', links: ['https://dsp2003.tumblr.com/', 'http://www.deviantart.com/dsp2003'] },
-			{ name: 'MysticBlare', links: ['https://twitter.com/MysticBlare'] },
 			{ name: 'Towmacow Waffles', links: ['https://www.deviantart.com/towmacowwaffles'] },
 			{ name: 'OrchidPony', links: ['https://www.deviantart.com/orchidpony'] },
 			{ name: 'Cherry Cerise', links: ['https://www.deviantart.com/cherryceriseart'] },

src/ts/client/data.ts

@@ -28,6 +28,7 @@ export const discordLink = attr('data-discord-link');
 export const twitterLink = attr('data-twitter-link');
 export const contactEmail = attr('data-email');
 export const copyrightName = attr('data-copyright');
+export const contactDiscord = attr('data-contact-discord');
 
 /* istanbul ignore next */
 export const oauthProviders = json<OAuthProvider[]>('oauth-providers', '[]')

src/ts/components/app/about/about.pug

@@ -8,6 +8,9 @@ h1(focusTitle) About
 
 		h2 Contact
 		p For all inquiries please send an email to #[b {{contactEmail}}]
+			span(*ngIf="contactDiscord")
+				|  or message #[b {{contactDiscord}}] on Discord
+			| .
 
 		h2 Technology
 

src/ts/components/app/about/about.ts

@@ -4,7 +4,7 @@ import { getUrl } from '../../../client/rev';
 import { CREDITS, CONTRIBUTORS, Credit } from '../../../client/credits';
 import { CHANGELOG } from '../../../generated/changelog';
 import { SUPPORTER_REWARDS_LIST } from '../../../common/constants';
-import { discordLink, contactEmail } from '../../../client/data';
+import { discordLink, contactEmail, contactDiscord } from '../../../client/data';
 
 function toCredit(credit: Credit) {
 	return {
@@ -28,4 +28,5 @@ export class About {
 	readonly rewards = SUPPORTER_REWARDS_LIST;
 	readonly discordLink = discordLink;
 	readonly contactEmail = contactEmail;
+	readonly contactDiscord = contactDiscord;
 }

src/ts/components/app/app.ts

@@ -6,7 +6,7 @@ import { BsModalRef, BsModalService } from 'ngx-bootstrap/modal';
 import { Subscription } from 'rxjs';
 import { GameService } from '../services/gameService';
 import { Model, Friend } from '../services/model';
-import { version, host, contactEmail, twitterLink, discordLink, copyrightName } from '../../client/data';
+import { version, host, contactEmail, twitterLink, discordLink, copyrightName, contactDiscord } from '../../client/data';
 import { PonyTownGame } from '../../client/game';
 import { faTwitter, faPatreon, faDiscord, faEnvelope, faCog, faHome, faInfoCircle, faHorseHead, faQuestionCircle } from '../../client/icons';
 import { OAuthProvider, Entity, FakeEntity, Pony } from '../../common/interfaces';
@@ -53,6 +53,7 @@ export class App implements OnInit, OnDestroy {
 	readonly aboutIcon = faInfoCircle;
 	readonly charactersIcon = faHorseHead;
 	readonly contactEmail = contactEmail;
+	readonly contactDiscord = contactDiscord;
 	readonly discordLink = discordLink;
 	readonly twitterLink = twitterLink;
 	readonly copyright = copyrightName;

src/ts/components/app/help/help.pug

@@ -5,9 +5,12 @@ h1(focusTitle) Help
 	
 		section
 			h2 Contact
-			p.
+			p
-				For technical issues, see the #[a(routerLink="/help" fragment="issues") Common Issues] section. If it doesn't solve your problem, 
+				| For technical issues, see the #[a(routerLink="/help" fragment="issues") Common Issues] section. If it doesn't solve your problem, 
-				send an email to #[b {{contactEmail}}].
+				| send an email to #[b {{contactEmail}}]
+				span(*ngIf="contactDiscord")
+					|  or message #[b {{contactDiscord}}] on Discord
+				| .
 
 		section
 			h2 Controls

src/ts/components/app/help/help.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { emojis } from '../../../client/emoji';
 import { faArrowLeft, faArrowRight, faArrowUp, faArrowDown } from '../../../client/icons';
-import { contactEmail } from '../../../client/data';
+import { contactEmail, contactDiscord } from '../../../client/data';
 import { ActivatedRoute } from '@angular/router';
 
 @Component({
@@ -17,6 +17,7 @@ export class Help {
 	readonly emotes = emojis.map(e => e.names[0]);
 	readonly mac = /Macintosh/.test(navigator.userAgent);
 	readonly contactEmail = contactEmail;
+	readonly contactDiscord = contactDiscord;
 
 	// allow scrolling to #issues and #rules fragments
 

src/ts/server/config.ts

@@ -7,6 +7,7 @@ export interface AppConfig {
 	supporterLink?: string;
 	discordLink?: string;
 	contactEmail?: string;
+	contactDiscord?: string;
 	port: number;
 	adminPort?: number;
 	host: string;

src/ts/server/routes/index.ts

@@ -101,6 +101,7 @@ export function createIndex(assetsPath: string, adminAssetsPath: string) {
 			twitterLink: config.twitterLink,
 			discordLink: config.discordLink,
 			email: config.contactEmail,
+			contactDiscord: config.contactDiscord,
 			logo: `${config.host}${getRevImageURL('logo-120.png')}`,
 			loadingImage: `data:image/png;base64,${loadingImage.toString('base64')}`,
 			version,

views/index.pug

@@ -52,6 +52,7 @@ html(lang="en")
 		data-discord-link=discordLink
 		data-twitter-link=twitterLink
 		data-email=email
+		data-contact-discord=contactDiscord
 		data-copyright=title
 		data-host=host
 		data-local=local