refactored Skill command

commands/Skill.js

@@ -1,6 +1,7 @@
 const globals = require('../globals');
 const db = globals.db;
 const { findMessage }= require('@dsabot/findMessage');
+const { getSkill } = require('@dsabot/getSkill');
 module.exports = {
 	name: 'skill',
 	description: 'Zeigt dir deinen Fertigkeitswert im jeweiligen Talent.',
@@ -17,16 +18,9 @@ module.exports = {
 					return message.reply(findMessage('NOENTRY'));
 				}
 				else {
-					let level = 0;
+					const Skill = getSkill({Character: docs[0].character, args: args});
-					/*
+					if(!Skill) { return message.reply(findMessage('TALENT_UNKNOWN'));}
-					for (let i in docs[0].character.skills) {
+					return message.reply(`Du hast folgenden Wert in **${Skill.Name}**: ${Skill.Level}`)
-						if (docs[0].character.skills[i].id == args[0]) { 
-							level = docs[0].character.skills[i].level; 
-						}
-					}
-					*/
-					level = docs[0].character.skills.find(skill => skill.id === args[0]).level;
-					message.reply('Du hast folgenden Talentwert in ' + args[0] + ': ' + level);
 				}
 			});
 		}
@@ -34,4 +28,5 @@ module.exports = {
 			throw e;
 		}
 	},
-};
+};
+

functions/getSkill.js

@@ -0,0 +1,20 @@
+const globals = require('../globals');
+
+const getSkill = ({ Character: Character = [], args: args = [] } = {}) => {
+	let skill_entry = globals.Talente.find(skill => skill.id.toLowerCase() === args[0].toLowerCase()) ||
+		globals.Talente.find(skill => skill.name.toLowerCase() === args[0].toLowerCase());
+
+	if (!skill_entry) { return; }
+	let Level = 0; // This is the minimum attributes value.
+	let cSkill = Character.skills.find(skill => skill.id === skill_entry.id) || {};
+	if (cSkill) {
+		Level = cSkill.level || 0;
+	}
+	let Name = globals.Talente.find(skill => skill.id === skill_entry.id).name;
+
+	return {
+		Name: Name,
+		Level: Level
+	};
+};
+module.exports = { getSkill };