Merge branch 'f0ckdev' into 'master'
bump version See merge request !51
This commit is contained in:
		@@ -22,6 +22,7 @@ INSERT INTO `cfg` (`class`, `key`, `value`, `type`) VALUES
 | 
			
		||||
('main',	'level',	'{\r\n  \"~\": 80,\r\n  \"&\": 70,\r\n  \"@\": 60,\r\n  \"%\": 50,\r\n  \"+\": 10,\r\n  \"\": 0\r\n}',	'json'),
 | 
			
		||||
('main',	'debug',	'false',	'bool'),
 | 
			
		||||
('main',	'debugchannel',	'#f0ck',	'string'),
 | 
			
		||||
('main',	'debugnetwork',	'n0xy',	'string'),
 | 
			
		||||
('main',	'scclientid',	'',	'string'),
 | 
			
		||||
('main',	'url',	'http://',	'string'),
 | 
			
		||||
('websrv',	'port',	'',	'int'),
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
{
 | 
			
		||||
  "name": "keinBotv2",
 | 
			
		||||
  "version": "0.2.0",
 | 
			
		||||
  "name": "f0ck",
 | 
			
		||||
  "version": "0.3.0_f0ck",
 | 
			
		||||
  "main": "src/main.js",
 | 
			
		||||
  "scripts": {
 | 
			
		||||
    "start": "node ./bot.js"
 | 
			
		||||
@@ -22,7 +22,7 @@
 | 
			
		||||
  },
 | 
			
		||||
  "repository": {
 | 
			
		||||
    "type": "git",
 | 
			
		||||
    "url": "git+https://gitfap.de/keinBot/keinBotv2.git"
 | 
			
		||||
    "url": "git+https://gitfap.de/keinBot/f0ck.git"
 | 
			
		||||
  },
 | 
			
		||||
  "author": "Flummi & jkhsjdhjs",
 | 
			
		||||
  "license": "WTFPL"
 | 
			
		||||
 
 | 
			
		||||
@@ -138,7 +138,7 @@ self.generateThumbs = () => {
 | 
			
		||||
};
 | 
			
		||||
self.log = (msg) => {
 | 
			
		||||
  if(self.debug)
 | 
			
		||||
    self.bot.send(self.cfg.main.debugchannel, msg, 'n0xy');
 | 
			
		||||
    self.bot.send(self.cfg.main.debugchannel, msg, self.cfg.main.debugnetwork);
 | 
			
		||||
};
 | 
			
		||||
self.loadTrigger = () => {
 | 
			
		||||
  var files = fs.readdirSync(__dirname+'/trigger/');
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user