remove got from global

bot.js

@@ -8,15 +8,6 @@ process.on( 'message', message => {
 	shardId = message.shard.id;
 } );
 
-global.got = require('got').extend( {
-	throwHttpErrors: false,
-	timeout: 5000,
-	headers: {
-		'User-Agent': 'Wiki-Bot/' + ( isDebug ? 'testing' : process.env.npm_package_version ) + ' (Discord; ' + process.env.npm_package_name + ')'
-	},
-	responseType: 'json'
-} );
-
 const Lang = require('./util/i18n.js');
 const Wiki = require('./util/wiki.js');
 const newMessage = require('./util/newMessage.js');

cmds/eval.js

@@ -4,6 +4,7 @@ util.inspect.defaultOptions = {compact:false,breakLength:Infinity};
 const cheerio = require('cheerio');
 const Discord = require('discord.js');
 const {limit: {verification: verificationLimit, rcgcdw: rcgcdwLimit}} = require('../util/default.json');
+const {got} = require('../util/functions.js');
 const newMessage = require('../util/newMessage.js');
 const Wiki = require('../util/wiki.js');
 var db = require('../util/database.js');

cmds/minecraft/bug.js

@@ -1,5 +1,5 @@
 const {MessageEmbed} = require('discord.js');
-const {escapeFormatting, limitLength} = require('../../util/functions.js');
+const {got, escapeFormatting, limitLength} = require('../../util/functions.js');
 
 /**
  * Sends a Minecraft issue.

cmds/minecraft/syntax.js

@@ -1,3 +1,4 @@
+const {got} = require('../../util/functions.js');
 const Wiki = require('../../util/wiki.js');
 const commands = require('./commands.json');
 

cmds/rcscript.js

@@ -1,6 +1,7 @@
 const cheerio = require('cheerio');
 const help_setup = require('../functions/helpsetup.js');
 const {limit: {rcgcdw: rcgcdwLimit}} = require('../util/default.json');
+const {got} = require('../util/functions.js');
 const Lang = require('../util/i18n.js');
 const allLangs = Lang.allLangs(true);
 const Wiki = require('../util/wiki.js');

cmds/settings.js

@@ -1,6 +1,7 @@
 const cheerio = require('cheerio');
 const {MessageEmbed} = require('discord.js');
 const {defaultSettings} = require('../util/default.json');
+const {got} = require('../util/functions.js');
 const Lang = require('../util/i18n.js');
 const allLangs = Lang.allLangs();
 const Wiki = require('../util/wiki.js');

cmds/test.js

@@ -1,5 +1,6 @@
 const {MessageEmbed} = require('discord.js');
 const help_setup = require('../functions/helpsetup.js');
+const {got} = require('../util/functions.js');
 const logging = require('../util/logging.js');
 
 const wsStatus = [

cmds/verification.js

@@ -1,7 +1,8 @@
 const help_setup = require('../functions/helpsetup.js');
 const {limit: {verification: verificationLimit}} = require('../util/default.json');
 var db = require('../util/database.js');
-const slashCommand = require('../util/functions.js').slashCommands.find( slashCommand => slashCommand.name === 'verify' );
+const {got, slashCommands} = require('../util/functions.js');
+const slashCommand = slashCommands.find( slashCommand => slashCommand.name === 'verify' );
 
 /**
  * Processes the "verification" command.

cmds/wiki/diff.js

@@ -1,7 +1,7 @@
 const {MessageEmbed} = require('discord.js');
 const logging = require('../../util/logging.js');
 const {timeoptions} = require('../../util/default.json');
-const {htmlToPlain, htmlToDiscord, escapeFormatting} = require('../../util/functions.js');
+const {got, htmlToPlain, htmlToDiscord, escapeFormatting} = require('../../util/functions.js');
 const diffParser = require('../../util/edit_diff.js');
 
 /**

cmds/wiki/general.js

@@ -2,7 +2,7 @@ const {MessageEmbed} = require('discord.js');
 const parse_page = require('../../functions/parse_page.js');
 const phabricator = require('../../functions/phabricator.js');
 const logging = require('../../util/logging.js');
-const {htmlToDiscord, escapeFormatting, partialURIdecode} = require('../../util/functions.js');
+const {got, htmlToDiscord, escapeFormatting, partialURIdecode} = require('../../util/functions.js');
 const extract_desc = require('../../util/extract_desc.js');
 const {limit: {interwiki: interwikiLimit}, wikiProjects} = require('../../util/default.json');
 const Wiki = require('../../util/wiki.js');

cmds/wiki/overview.js

@@ -1,7 +1,7 @@
 const {MessageEmbed} = require('discord.js');
 const logging = require('../../util/logging.js');
 const {timeoptions} = require('../../util/default.json');
-const {toFormatting, toPlaintext, escapeFormatting} = require('../../util/functions.js');
+const {got, toFormatting, toPlaintext, escapeFormatting} = require('../../util/functions.js');
 
 /**
  * Sends a Gamepedia wiki overview.

cmds/wiki/random.js

@@ -1,7 +1,7 @@
 const {MessageEmbed} = require('discord.js');
 const parse_page = require('../../functions/parse_page.js');
 const logging = require('../../util/logging.js');
-const {toMarkdown, htmlToDiscord, escapeFormatting} = require('../../util/functions.js');
+const {got, toMarkdown, htmlToDiscord, escapeFormatting} = require('../../util/functions.js');
 const extract_desc = require('../../util/extract_desc.js');
 
 /**

cmds/wiki/search.js

@@ -1,5 +1,5 @@
 const {MessageEmbed, Util} = require('discord.js');
-const {escapeFormatting} = require('../../util/functions.js');
+const {got, escapeFormatting} = require('../../util/functions.js');
 const {limit: {search: searchLimit}} = require('../../util/default.json');
 
 /**

cmds/wiki/user.js

@@ -5,7 +5,7 @@ const parse_page = require('../../functions/parse_page.js');
 const logging = require('../../util/logging.js');
 const extract_desc = require('../../util/extract_desc.js');
 const {timeoptions, usergroups} = require('../../util/default.json');
-const {toMarkdown, toPlaintext, htmlToDiscord, escapeFormatting} = require('../../util/functions.js');
+const {got, toMarkdown, toPlaintext, htmlToDiscord, escapeFormatting} = require('../../util/functions.js');
 
 /**
  * Processes a Gamepedia user.

functions/discussion.js

@@ -1,7 +1,7 @@
 const htmlparser = require('htmlparser2');
 const {MessageEmbed, Util} = require('discord.js');
 const {limit: {discussion: discussionLimit}} = require('../util/default.json');
-const {htmlToDiscord, escapeFormatting} = require('../util/functions.js');
+const {got, htmlToDiscord, escapeFormatting} = require('../util/functions.js');
 
 /**
  * Processes discussion commands.

functions/global_block.js

@@ -1,5 +1,5 @@
 const cheerio = require('cheerio');
-const {escapeFormatting} = require('../util/functions.js');
+const {got, escapeFormatting} = require('../util/functions.js');
 
 /**
  * Add global blocks to user messages.

functions/parse_page.js

@@ -1,7 +1,7 @@
 const cheerio = require('cheerio');
 const {MessageEmbed} = require('discord.js');
 const {toSection} = require('../util/wiki.js');
-const {parse_infobox, htmlToPlain, htmlToDiscord, escapeFormatting, limitLength} = require('../util/functions.js');
+const {got, parse_infobox, htmlToPlain, htmlToDiscord, escapeFormatting, limitLength} = require('../util/functions.js');
 
 const parsedContentModels = [
 	'wikitext',

functions/phabricator.js

@@ -1,6 +1,6 @@
 const {MessageEmbed} = require('discord.js');
 const logging = require('../util/logging.js');
-const {escapeFormatting, limitLength} = require('../util/functions.js');
+const {got, escapeFormatting, limitLength} = require('../util/functions.js');
 
 /**
  * Sends a Phabricator task.

functions/special_page.js

@@ -1,7 +1,7 @@
 const {MessageEmbed, Util} = require('discord.js');
 const logging = require('../util/logging.js');
 const {timeoptions} = require('../util/default.json');
-const {toMarkdown, escapeFormatting} = require('../util/functions.js');
+const {got, toMarkdown, escapeFormatting} = require('../util/functions.js');
 
 const overwrites = {
 	randompage: (fn, lang, msg, wiki, querystring, fragment, reaction, spoiler, noEmbed, args, embed, query) => {

functions/verify.js

@@ -4,7 +4,7 @@ var db = require('../util/database.js');
 const Lang = require('../util/i18n.js');
 const Wiki = require('../util/wiki.js');
 const logging = require('../util/logging.js');
-const {oauthVerify, escapeFormatting} = require('../util/functions.js');
+const {got, oauthVerify, escapeFormatting} = require('../util/functions.js');
 const toTitle = require('../util/wiki.js').toTitle;
 
 /**

interactions/inline.js

@@ -1,6 +1,6 @@
 const logging = require('../util/logging.js');
 const Wiki = require('../util/wiki.js');
-const {limitLength, partialURIdecode, sendMessage} = require('../util/functions.js');
+const {got, limitLength, partialURIdecode, sendMessage} = require('../util/functions.js');
 
 /**
  * Post a message with inline wiki links.

util/functions.js

@@ -3,7 +3,7 @@ const got = require('got').extend( {
 	throwHttpErrors: false,
 	timeout: 5000,
 	headers: {
-		'User-Agent': 'Wiki-Bot/' + ( isDebug ? 'testing' : process.env.npm_package_version ) + ' (Discord; ' + process.env.npm_package_name + ')'
+		'User-Agent': 'Wiki-Bot/' + ( isDebug ? 'testing' : process.env.npm_package_version ) + ' (Discord; ' + process.env.npm_package_name + ( process.env.invite ? '; ' + process.env.invite : '' ) + ')'
 	},
 	responseType: 'json'
 } );

util/newMessage.js

@@ -1,6 +1,6 @@
 const {Util} = require('discord.js');
 const logging = require('./logging.js');
-const {partialURIdecode} = require('./functions.js');
+const {got, partialURIdecode} = require('./functions.js');
 const {limit: {command: commandLimit}, defaultSettings, wikiProjects} = require('./default.json');
 const Wiki = require('./wiki.js');
 const check_wiki = {