merge prod

config/bannerimages.json

@@ -6,91 +6,86 @@
 	},
 	{
 		"id": 2,
-		"image": "banner/discord.gif",
-		"link": "https://discord.gg/dumJwXTPxX"
-	},
-	{
-		"id": 3,
 		"image": "banner/amrd24.gif",
 		"link": "https://amrd24.github.io/ctad.html"
 	},
 	{
-		"id": 4,
+		"id": 3,
 		"image": "banner/fortind.gif",
 		"link": "https://www.fort1nd.com"
 	},
 	{
-		"id": 5,
+		"id": 4,
 		"image": "banner/abrefresh.png",
 		"link": "https://www.teamflashcord.com/projects/ab-refresh"
 	},
 	{
-		"id": 6,
+		"id": 5,
 		"image": "banner/cobbclub.png",
 		"link": "http://cobb.club"
 	},
 	{
-		"id": 7,
+		"id": 6,
 		"image": "banner/maymundere.gif",
 		"link": "https://maymundere.org"
 	},
 	{
-		"id": 8,
+		"id": 7,
 		"image": "banner/macsecret.png",
 		"link": "http://macsecret.com"
 	},
 	{
-		"id": 9,
+		"id": 8,
 		"image": "banner/leefy.png",
 		"link": "https://leefymoons-room.net"
 	},
 	{
-		"id": 10,
+		"id": 9,
 		"image": "banner/srcfreak.jpg",
 		"link": "http://srcfreaks.ddns.net"
 	},
 	{
-		"id": 11,
+		"id": 10,
 		"image": "banner/kakworm.gif",
 		"link": "https://fusionstrike.neocities.org"
 	},
 	{
-		"id": 12,
+		"id": 11,
 		"image": "banner/gdsk.gif",
 		"link": "https://gdsk.retrosite.org"
 	},
 	{
-		"id": 13,
+		"id": 12,
 		"image": "banner/kooper.png",
 		"link": "http://kooper.online"
 	},
 	{
-		"id": 14,
+		"id": 13,
 		"image": "banner/imsnp.png",
 		"link": "http://kooper.online/blog/pages/imsnp.html"
 	},
 	{
-		"id": 15,
+		"id": 14,
 		"image": "banner/aomeix.jpg",
 		"link": "http://aomeix.eu.org"
 	},
     {
-		"id": 16,
+		"id": 15,
 		"image": "banner/bluebrixhq.gif",
 		"link": "https://brix.neocities.org"
     },
 	{
-		"id": 17,
+		"id": 16,
 		"image": "banner/thebrothers.png",
 		"link": "https://the-brothers.neocities.org"
     },
 	{
-		"id": 18,
+		"id": 17,
 		"image": "banner/action97.gif",
 		"link": "https://bloxy97.nekoweb.org"
     },
 	{
-		"id": 19,
+		"id": 18,
 		"image": "banner/barco.gif",
 		"link": "https://barcohot.nekoweb.org"
     }

config/textads.json

@@ -7,10 +7,6 @@
 		"caption": "Looking for friends/contacts? Check out our new Member Directory!",
 		"url": "https://crosstalk.im/directory"
 	},
-	{
-		"caption": "Did you know we have a Discord server? Join it now!",
-		"url": "https://discord.gg/dumJwXTPxX"
-	},
 	{
 		"caption": "ClassicConnect - A community of retro tech geeks.",
 		"url": "http://classicconnect.net"

front/msn/http/tmpl/config/MsgrConfig.wlm.14.xml

@@ -102,7 +102,7 @@
 			<Device VID="0x045e" PID="0x0722"/>
 			<Device VID="0x041e" PID="0x4080"/>
 		</USBDevices>
-		<CirclesWeb General="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" General-SiteId="73625" Management="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" Management-SiteId="73625" Membership="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" Membership-SiteId="73625" Leave="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" Leave-SiteId="73625" Disc="https://discord.gg/dumJwXTPxX" />
+		<CirclesWeb General="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" General-SiteId="73625" Management="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" Management-SiteId="73625" Membership="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" Membership-SiteId="73625" Leave="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" Leave-SiteId="73625" Disc="https://{{ settings.WEBSITE_HOST }}" />
 		<AnonymousIMSettings>
 			<SettingsPage URL="http://settings.messenger.live.com/applications/WebSettings.aspx" SiteID="76215" />
 		</AnonymousIMSettings>

front/msn/http/tmpl/config/MsgrConfig.wlm.16.xml

@@ -238,7 +238,7 @@
 		<VoiceVideo>
 			<Log PeerLogDisable="1" />
 		</VoiceVideo>
-		<CirclesWeb General="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" General-SiteId="73625" Management="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" Management-SiteId="73625" Membership="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" Membership-SiteId="73625" Leave="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" Leave-SiteId="73625" Disc="https://discord.gg/dumJwXTPxX" />
+		<CirclesWeb General="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" General-SiteId="73625" Management="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" Management-SiteId="73625" Membership="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" Membership-SiteId="73625" Leave="https://{{ settings.WEBSITE_HOST }}/circles/$CIRCLECID$/settings/" Leave-SiteId="73625" Disc="https://{{ settings.WEBSITE_HOST }}" />
 		<AnonymousIMSettings>
 			<SettingsPage URL="http://settings.messenger.live.com/applications/WebSettings.aspx" SiteID="76215" />
 		</AnonymousIMSettings>

front/msn/http/tmpl/svcs/MSNToday.html

@@ -100,7 +100,7 @@
 		</div>
 		<div class="content">
 			<h3>Welcome! Thank you for using CrossTalk!</h3>
-			<p>If you find any issues, have suggestions for any new features, or just want to hang out with fellow CrossTalk users, check out our <a href="https://discord.gg/dumJwXTPxX">Discord server</a>.</p>
+			<p>If you find any issues, have suggestions for any new features, or just want to hang out with fellow CrossTalk users, check out our community <a href="https://crosstalk.im/community">IRC/Forums</a>.</p>
 			<p>This page will soon be redesigned. Stay tuned!</p>
 		</div>
 	</body>