Merge branch 'bugfix-155'

app/Model/Character/Buffs.js

@@ -65,3 +65,37 @@ makeParent(Buffs, ["name", "enabled"]); //parents of effects, attacks, proficien
 
 Buffs.allow(CHARACTER_SUBSCHEMA_ALLOW);
 Buffs.deny(CHARACTER_SUBSCHEMA_DENY);
+
+Meteor.methods({
+	applyBuff: function(buffId, targetId){
+		if (!Meteor.call("canWriteCharacter", targetId)){
+			throw new Meteor.Error(
+				"Access denied",
+				"You do not have permission to buff this character"
+			);
+		}
+		let buff = CustomBuffs.findOne(buffId);
+		if (!buff) return;
+
+		var parentCol = Meteor.isClient ?
+			window[buff.parent.collection] : global[buff.parent.collection]
+		var parent = parentCol.findOne(buff.parent.id);
+
+		//insert new buff
+		newBuffId = Buffs.insert({
+			charId: targetId,
+			name: buff.name,
+			description: buff.description,
+			lifeTime: {total: buff.lifeTime.total},
+			type: "custom",
+
+			appliedBy: buff.charId,
+			appliedByDetails: {
+				name: parent && parent.name || "",
+				collection: buff.parent.collection,
+			},
+		});
+
+		Meteor.call("cloneChildren", buffId, {id: newBuffId, collection: "Buffs"})
+	}
+})

app/client/views/character/buffs/customBuffView/customBuffView.js

@@ -1,47 +1,5 @@
 const applyBuff = function(targetId, buff) {
-	var parent = global[buff.parent.collection].findOne(buff.parent.id);
-
-	//insert new buff
-	newBuffId = Buffs.insert({
-		charId: targetId,
-		name: buff.name,
-		description: buff.description,
-		lifeTime: {total: buff.lifeTime.total},
-		type: "custom",
-
-		appliedBy: buff.charId,
-		appliedByDetails: {
-			name: parent.name,
-			collection: buff.parent.collection,
-		},
-	});
-
-	//insert children
-	Attacks.find({"parent.id": buff._id}).forEach(function(doc){
-		temp = _.clone(doc);
-		temp.parent.id = newBuffId;
-		temp.parent.collection = "Buffs";
-		delete temp._id;
-
-		Attacks.insert(temp);
-	});
-	Effects.find({"parent.id": buff._id}).forEach(function(doc){
-		temp = _.clone(doc);
-		temp.parent.id = newBuffId;
-		temp.parent.collection = "Buffs";
-		delete temp._id;
-
-		Effects.insert(temp);
-	});
-	Proficiencies.find({"parent.id": buff._id}).forEach(function(doc){
-		temp = _.clone(doc);
-		temp.parent.id = newBuffId;
-		temp.parent.collection = "Buffs";
-		delete temp._id;
-
-		Proficiencies.insert(temp);
-	});
-
+	Meteor.call("applyBuff", buff._id, targetId)
 	let target;
 	if (targetId == buff.charId) {
 		target = "self";