docs: fix outdated github and discord links

README.md

@@ -7,7 +7,7 @@
         Today, <b>txAdmin</b> is <i>the</i> <b>full featured</b> web panel & in-game menu to Manage & Monitor your FiveM/RedM Server, in use by over <strong>29.000</strong> servers worldwide at any given time!
     </p>
     <p align="center">
-        Join our Discord Server: &nbsp; <a href="https://discord.gg/AFAAXzq"><img src="https://discordapp.com/api/guilds/577993482761928734/widget.png?style=shield"></img></a>
+        Join our Discord Server: &nbsp; <a href="https://txadmin.gg/discord"><img src="https://discordapp.com/api/guilds/577993482761928734/widget.png?style=shield"></img></a>
     </p>
     <p align="center">
         <a href="https://zap-hosting.com/txadmin4" target="_blank" rel="noopener">
@@ -79,7 +79,7 @@ Also, check our [Feature Graveyard](docs/feature-graveyard.md) for the features
 
 
 ## License, Credits and Thanks
-- This project is licensed under the [MIT License](https://github.com/tabarra/txAdmin/blob/master/LICENSE);
+- This project is licensed under the [MIT License](https://github.com/citizenfx/txAdmin/blob/master/LICENSE);
 - ["Kick" button icons](https://www.flaticon.com/free-icon/users-avatar_8188385) made by __SeyfDesigner__ from [www.flaticon.com](https://www.flaticon.com);
 - Warning Sounds ([1](https://freesound.org/people/Ultranova105/sounds/136756/)/[2](https://freesound.org/people/Ultranova105/sounds/136754/)) made by __Ultranova105__ are licensed under [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/);
 - [Announcement Sound](https://freesound.org/people/IENBA/sounds/545495/) made by __IENBA__ is licensed under [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/);

core/boot/checkPreRelease.ts

@@ -18,7 +18,7 @@ const printExpirationBanner = (timeUntilExpiration: number) => {
     console.error('This build is meant to be used by txAdmin beta testers.');
     console.error('txAdmin will automatically shut down when this pre-release expires.');
     console.error(`Time until expiration: ${chalkInversePad(timeLeft)}.`);
-    console.error('For more information: https://discord.gg/txAdmin.');
+    console.error('For more information: https://txadmin.gg/discord.');
 }
 
 const cronCheckExpiration = () => {

core/lib/fatalError.ts

@@ -60,7 +60,7 @@ function fatalError(code: number, msg: ErrorMsgType, err?: any): never {
     }
     console.error(console.DIVIDER);
     console.error(chalk.inverse(
-        padStartEnd('For support: https://discord.gg/txAdmin')
+        padStartEnd('For support: https://txadmin.gg/discord')
     ));
     console.error(console.DIVIDER);
     quitProcess(code);

core/modules/DiscordBot/defaultJsons.ts

@@ -52,7 +52,7 @@ export const defaultEmbedConfigJson = JSON.stringify({
         {
             "emoji": "1062339910654246964",
             "label": "txAdmin Discord",
-            "url": "https://discord.gg/txAdmin"
+            "url": "https://txadmin.gg/discord"
         },
     ].filter(Boolean)
 });

core/modules/UpdateChecker/index.ts

@@ -119,12 +119,12 @@ export default class UpdateChecker {
                 if (updates.txa.isImportant) {
                     console.error('This version of txAdmin is outdated.');
                     console.error('Please update as soon as possible.');
-                    console.error('For more information: https://discord.gg/uAmsGa2');
+                    console.error('For more information: https://txadmin.gg/discord');
                 } else {
                     console.warn('This version of txAdmin is outdated.');
                     console.warn('A patch (bug fix) update is available for txAdmin.');
                     console.warn('If you are experiencing any kind of issue, please update now.');
-                    console.warn('For more information: https://discord.gg/uAmsGa2');
+                    console.warn('For more information: https://txadmin.gg/discord');
                 }
             }
         }
@@ -148,7 +148,7 @@ export default class UpdateChecker {
     Other relevant apis:
         https://changelogs-live.fivem.net/api/changelog/versions/win32/server? (the one being used below)
         https://changelogs-live.fivem.net/api/changelog/versions
-        https://api.github.com/repos/tabarra/txAdmin/releases (changelog in [].body)
+        https://api.github.com/repos/citizenfx/txAdmin/releases (changelog in [].body)
 
     NOTE: old logic
     if == recommended, you're fine

core/modules/WebServer/middlewares/globalRateLimiter.ts

@@ -40,7 +40,7 @@ setInterval(() => {
             `txAdmin got ${numberFormatter.format(httpRequestsCounter)} HTTP requests in the last minute.`,
             `The attacker IP addresses have been blocked until ${DDOS_COOLDOWN_MINUTES} mins after the attack stops.`,
             'Make sure you have a proper firewall setup and/or a reverse proxy with rate limiting.',
-            'You can join https://discord.gg/txAdmin for support.'
+            'You can join https://txadmin.gg/discord for support.'
         ]);
     } else {
         minutesSinceLastAttack++;

core/modules/WebServer/middlewares/httpLoadMonitor.ts

@@ -60,7 +60,7 @@ const checkHttpLoad = () => {
                 `Node.js's V8 engine heap is almost full: ${(heapUsed * 100).toFixed(2)}% (${heapSize}/${heapLimit})`,
                 `All HTTP requests will be blocked for the next ${REQ_BLOCKER_DURATION} seconds to prevent a crash.`,
                 'Make sure you have a proper firewall setup and/or a reverse proxy with rate limiting.',
-                'You can join https://discord.gg/txAdmin for support.'
+                'You can join https://txadmin.gg/discord for support.'
             ]);
             //Resetting counter
             reqCounter = 0;

docs/development.md

@@ -29,7 +29,7 @@ Before starting, please make sure you are familiar with the basics of NodeJS & e
 ## Preparing the environment
 1. First, clone the txAdmin repository into a folder outside the fxserver directory;
 ```sh
-git clone https://github.com/tabarra/txAdmin
+git clone https://github.com/citizenfx/txAdmin
 ```
 2. Install dependencies & prepare commit hook;
 ```sh

docs/discord-status.md

@@ -94,7 +94,7 @@ To get the emoji ID, insert it into discord, and add `\` before it then send the
         {
             "emoji": "1062339910654246964",
             "label": "txAdmin Discord",
-            "url": "https://discord.gg/txAdmin"
+            "url": "https://txadmin.gg/discord"
         }
     ]
 }

docs/env-config.md

@@ -172,5 +172,5 @@ TXHOST_DEFAULT_ACCOUNT=tabarra:271816
 
 # Provider details
 TXHOST_PROVIDER_NAME=ExampleHosting
-TXHOST_PROVIDER_LOGO=https://github.com/tabarra/txAdmin/raw/master/docs/banner.png
+TXHOST_PROVIDER_LOGO=https://github.com/citizenfx/txAdmin/raw/master/docs/banner.png
 ```

docs/menu.md

@@ -107,11 +107,11 @@ positions, `top-center`, `top-left`, `top-right`, `bottom-center`, `bottom-left`
 - If you can't authenticate and the reason id `Invalid Request: source`, this means the source IP of the HTTP request being made by fxserver to txAdmin is not a "localhost" one, which might occur if your host has multiple IPs. To disable this protection, edit your `config.json` file and add `webServer.disableNuiSourceCheck` with value `true` then restart txAdmin.
 
 ## Development
-You can find development instructions regarding the menu [here.](https://github.com/tabarra/txAdmin/blob/master/docs/development.md#menu-development)
+You can find development instructions regarding the menu [here.](https://github.com/citizenfx/txAdmin/blob/master/docs/development.md#menu-development)
 
 ## FAQ
 - **Q**: Why don't the 'Heal' options revive a player when using ESX/QBCore/etc?
 - **A**: Many frameworks independently handle a "dead" state for a player, meaning
   the menu is unable to reset this state in an resource agnostic form directly. To establish compatibility 
-  with any framework, txAdmin will emit an [txAdmin:events:playerHealed](https://github.com/tabarra/txAdmin/blob/master/docs/events.md#txadmineventsplayerhealed) 
+  with any framework, txAdmin will emit an [txAdmin:events:playerHealed](https://github.com/citizenfx/txAdmin/blob/master/docs/events.md#txadmineventsplayerhealed) 
   for developers to handle.

docs/translation.md

@@ -3,7 +3,7 @@ txAdmin supports translation for over 30 languages for the in-game interface (me
 
 
 ## Custom locales:
-If your language is not available, or you want to customize the messages, create a `locale.json` file in inside the `txData` folder based on any language file found on [our repository](https://github.com/tabarra/txAdmin/tree/master/locale). Then go to the settings and select the "Custom" language option.  
+If your language is not available, or you want to customize the messages, create a `locale.json` file in inside the `txData` folder based on any language file found on [our repository](https://github.com/citizenfx/txAdmin/tree/master/locale). Then go to the settings and select the "Custom" language option.  
 
 The `$meta.humanizer_language` key must be compatible with the library [humanize-duration](https://www.npmjs.com/package/humanize-duration), check their page for a list of compatible languages.
 
@@ -15,7 +15,7 @@ For that you will need to:
 - Name the file using the language code in [this page](https://www.science.co.il/language/Locale-codes.php);
 - The `$meta.label` must be the language name in English (eg `Spanish` instead of `Español`);
 - If you create a new translation, make sure to add it to `shared/localeMap.ts`, and maintain the alphabetical order;
-- Do a [Pull Request](https://github.com/tabarra/txAdmin/pulls) posting a few screenshots of evidence that you tested what you changed in-game.
+- Do a [Pull Request](https://github.com/citizenfx/txAdmin/pulls) posting a few screenshots of evidence that you tested what you changed in-game.
 - An automatic check will run, make sure to read the output in case of any errors.
 
 > [!TIP]

package.json

@@ -23,12 +23,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/tabarra/txAdmin.git"
+    "url": "git+https://github.com/citizenfx/txAdmin.git"
   },
   "author": "André Tabarra",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/tabarra/txAdmin/issues"
+    "url": "https://github.com/citizenfx/txAdmin/issues"
   },
   "homepage": "https://txadmin.gg/",
   "dependencies": {

panel/src/components/ErrorFallback.tsx

@@ -111,7 +111,7 @@ export function GenericErrorBoundaryCard(props: GenericErrorBoundaryCardProps) {
                     variant="outline"
                     className="bg-discord hover:bg-discord-active animate-pulse hover:animate-none"
                 >
-                    <a href="http://discord.gg/txAdmin" target="_blank" rel="noopener noreferrer">
+                    <a href="https://txadmin.gg/discord" target="_blank" rel="noopener noreferrer">
                         Support Discord
                     </a>
                 </Button>

panel/src/components/TxToaster.tsx

@@ -112,12 +112,12 @@ export const CustomToast = ({ t, type, data }: CustomToastProps) => {
                     <small className="block text-xs tracking-wide text-muted-foreground">
                         For support, visit&nbsp;
                         <a
-                            href="https://discord.gg/uAmsGa2"
+                            href="https://txadmin.gg/discord"
                             target="_blank"
                             onClick={handleExternalLinkClick}
                             className="font-semibold no-underline hover:underline m-0"
                         >
-                            discord.gg/txAdmin
+                            txadmin.gg/discord
                         </a>.
                     </small>
                 )}

panel/src/layout/AuthShell.tsx

@@ -70,7 +70,7 @@ export default function AuthShell() {
                 <div className="mx-auto flex flex-wrap gap-4 justify-center mb-2">
                     <DynamicAdvert placement='login' />
                     <a
-                        href='https://discord.gg/uAmsGa2'
+                        href='https://txadmin.gg/discord'
                         onClick={handleExternalLinkClick}
                         target='_blank'
                         className='w-48 h-16 relative group shadow-sm opacity-90 hover:opacity-100 brightness-110

panel/src/layout/Header.tsx

@@ -119,7 +119,7 @@ function AuthedHeaderFragment() {
         setAccountModalOpen(true);
     }
     const gotoSupportDiscord = () => {
-        openExternalLink('https://discord.gg/uAmsGa2');
+        openExternalLink('https://txadmin.gg/discord');
     }
     const doLogout = () => logout();
 

panel/src/layout/WarningBar.tsx

@@ -86,7 +86,7 @@ export function InnerWarningBar({ titleIcon, title, description, isImportant, ca
                             asChild
                             className={isImportant ? "text-foreground border-foreground" : 'dark:border-primary-foreground dark:hover:border-primary'}
                         >
-                            <a href="https://discord.gg/uAmsGa2" target="_blank">
+                            <a href="https://txadmin.gg/discord" target="_blank">
                                 <FaDiscord size="14" className="mr-1" /> Support
                             </a>
                         </Button>

panel/src/pages/Diagnostics/DiagnosticsPage.tsx

@@ -55,10 +55,10 @@ export default function DiagnosticsPage() {
                             To receive support, it is recommended that you send the diagnostics data directly to the
                             Support Team. <br />
                             After that, share the report ID with the support team in <TxAnchor
-                                href="https://discord.gg/uAmsGa2"
+                                href="https://txadmin.gg/discord"
                                 className="font-semibold tracking-wide text-primary"
                             >
-                                discord.gg/txAdmin
+                                txadmin.gg/discord
                             </TxAnchor>.
                         </p>
                         <Button

panel/src/pages/Diagnostics/report-dialog.tsx

@@ -104,10 +104,10 @@ const SuccessContent = ({ reportId }: { reportId: string }) => (
         </div>
         <p className="text-muted-foreground pt-2">
             Please send this ID to the support team in <TxAnchor
-                href="https://discord.gg/uAmsGa2"
+                href="https://txadmin.gg/discord"
                 className="font-semibold tracking-wide text-primary"
             >
-                discord.gg/txAdmin
+                txadmin.gg/discord
             </TxAnchor>.
         </p>
     </div>
@@ -124,7 +124,7 @@ const ErrorContent = ({ error }: { error: string }) => (
 
 export const DiscordBadge = ({ className }: { className?: string }) => (
     <a
-        href="https://discord.gg/uAmsGa2"
+        href="https://txadmin.gg/discord"
         target="_blank"
         rel="noopener noreferrer"
         className={cn("inline-block ml-1", className)}

panel/src/pages/History/HistoryTable.tsx

@@ -126,7 +126,7 @@ function LastRow({ playersCount, hasReachedEnd, isFetching, loadError, retryFetc
     } else {
         content = <span>
             You've found the end of the rainbow, but there's no pot of gold here. <br />
-            <i>(this is a bug, please report it in <TxAnchor href="https://discord.gg/txAdmin" target="_blank" rel="noopener noreferrer">discord.gg/txAdmin</TxAnchor>)</i>
+            <i>(this is a bug, please report it in <TxAnchor href="https://txadmin.gg/discord" target="_blank" rel="noopener noreferrer">txadmin.gg/discord</TxAnchor>)</i>
         </span>
     }
 

panel/src/pages/Players/PlayersTable.tsx

@@ -76,7 +76,7 @@ function LastRow({ playersCount, hasReachedEnd, isFetching, loadError, retryFetc
     } else {
         content = <span>
             You've found the end of the rainbow, but there's no pot of gold here. <br />
-            <i>(this is a bug, please report it in <TxAnchor href="https://discord.gg/txAdmin" target="_blank" rel="noopener noreferrer">discord.gg/txAdmin</TxAnchor>)</i>
+            <i>(this is a bug, please report it in <TxAnchor href="https://txadmin.gg/discord" target="_blank" rel="noopener noreferrer">txadmin.gg/discord</TxAnchor>)</i>
         </span>
     }
 

panel/src/pages/Settings/tabCards/general.tsx

@@ -143,7 +143,7 @@ export default function ConfigCardGeneral({ cardCtx, pageCtx }: SettingsCardProp
                 <SettingItemDesc>
                     The language to use on Chat/Discord messages. <br />
                     You can customize the phrases/words by using the <InlineCode>Custom</InlineCode> option. <br />
-                    For more information, please read the <TxAnchor href="https://github.com/tabarra/txAdmin/blob/master/docs/translation.md">documentation</TxAnchor>.
+                    For more information, please read the <TxAnchor href="https://github.com/citizenfx/txAdmin/blob/master/docs/translation.md">documentation</TxAnchor>.
                 </SettingItemDesc>
             </SettingItem>
         </SettingsCardShell>

panel/src/pages/TestingPage/TmpJsonEditor.tsx

@@ -220,7 +220,7 @@ export default function TmpJsonEditor() {
                     description={(<>
                         The server status embed is customizable by editing the JSON below. <br />
                         You can use the placeholders to include dynamic server information in the embed. <br />
-                        For information refer to <TxAnchor href="https://github.com/tabarra/txAdmin/blob/master/docs/discord-status.md">our docs</TxAnchor>.
+                        For information refer to <TxAnchor href="https://github.com/citizenfx/txAdmin/blob/master/docs/discord-status.md">our docs</TxAnchor>.
                     </>)}
                 />
             </div>

panel/src/pages/TestingPage/TmpLibraryShowcase.tsx

@@ -387,7 +387,7 @@ export default function TmpLibraryShowcase() {
                             Lorem ipsum dolor <TxAnchor href="/players">Example</TxAnchor>: internal link.
                         </p>
                         <p>
-                            Lorem ipsum dolor <TxAnchor href="https://github.com/tabarra/txAdmin">Example</TxAnchor>: external link.
+                            Lorem ipsum dolor <TxAnchor href="https://github.com/citizenfx/txAdmin">Example</TxAnchor>: external link.
                         </p>
                     </div>
 
@@ -397,7 +397,7 @@ export default function TmpLibraryShowcase() {
                             Lorem ipsum dolor <TxAnchor href="/dashboard">Example</TxAnchor>: internal link.
                         </p>
                         <p className="text-sm">
-                            Lorem ipsum dolor <TxAnchor href="https://discord.gg/txAdmin">Example</TxAnchor>: external link.
+                            Lorem ipsum dolor <TxAnchor href="https://txadmin.gg/discord">Example</TxAnchor>: external link.
                         </p>
                     </div>
                 </div>

panel/src/pages/TestingPage/TmpPageHeader.tsx

@@ -23,9 +23,9 @@ export default function TmpPageHeader() {
                 <PageHeader title="Simple + links" icon={<Settings2Icon />}>
                     <PageHeaderLinks
                         topLabel="Documentation"
-                        topLink="https://github.com/tabarra/txAdmin"
+                        topLink="https://github.com/citizenfx/txAdmin"
                         bottomLabel="Support"
-                        bottomLink="https://discord.gg/txAdmin"
+                        bottomLink="https://txadmin.gg/discord"
                     />
                 </PageHeader>
             </Wrapper>

scripts/build/utils.ts

@@ -34,7 +34,7 @@ export const licenseBanner = (baseDir = '.', isBundledFile = false) => {
         ...txAdminASCII().split('\n').map((x) => logoPad + x),
         lineSep,
         'Author: André Tabarra (https://github.com/tabarra)',
-        'Repository: https://github.com/tabarra/txAdmin',
+        'Repository: https://github.com/citizenfx/txAdmin',
         'txAdmin is a free open source software provided under the license below.',
         lineSep,
         ...fs.readFileSync(licensePath, 'utf8').trim().split('\n'),

web/public/js/txadmin/base.js

@@ -102,7 +102,7 @@ const updateMarkdownNotification = (data, notify) => {
         if (data.type === 'danger') {
             msgHtml += `<div class="text-right">
                 <small>
-                    For support, visit <strong><a href="http://discord.gg/txAdmin" target="_blank" class="text-dark">discord.gg/txAdmin</a></strong>.
+                    For support, visit <strong><a href="https://txadmin.gg/discord" target="_blank" class="text-dark">txadmin.gg/discord</a></strong>.
                 </small>
             </div>`;
         }