Allowed owners to give their characters to new owners, no UI yet.

Adding advantage/disadvantage arrows to initiative stat card

README.md

@@ -8,6 +8,6 @@ Getting started
 
 `git clone https://github.com/ThaumRystra/DiceCloud1 dicecloud`  
 `cd dicecloud`  
-`cd rpg-docs`  
+`cd app`  
 `bower install`  
 `meteor`

app/.meteor/.finished-upgraders

@@ -15,3 +15,4 @@ notices-for-facebook-graph-api-2
 1.4.1-add-shell-server-package
 1.4.3-split-account-service-packages
 1.5-add-dynamic-import-package
+1.7-split-underscore-from-meteor-base

app/.meteor/packages

@@ -3,9 +3,9 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-accounts-password@1.5.0
+accounts-password@1.5.1
-accounts-ui@1.2.0
+accounts-ui@1.3.0
-random@1.0.10
+random@1.1.0
 dburles:collection-helpers
 reactive-var@1.0.11
 underscore@1.0.10
@@ -17,40 +17,40 @@ dburles:mongo-collection-instances
 percolate:migrations
 ecwyne:mathjs
 useraccounts:polymer
-accounts-google@1.3.0
+accounts-google@1.3.1
 splendido:accounts-meld
 email@1.2.3
 meteorhacks:subs-manager
 chuangbo:marked
 reywood:iron-router-ga
-meteor-base@1.2.0
+meteor-base@1.4.0
 mobile-experience@1.0.5
-mongo@1.3.1
+mongo@1.5.0
 blaze-html-templates
 session@1.1.7
 jquery@1.11.10
-tracker@1.1.3
+tracker@1.2.0
-logging@1.1.19
+logging@1.1.20
-reload@1.1.11
+reload@1.2.0
 ejson@1.1.0
 spacebars
-check@1.2.5
+check@1.3.1
 useraccounts:iron-routing
 wizonesolutions:canonical
-standard-minifier-js@2.2.0
+standard-minifier-js@2.3.4
-shell-server@0.3.0
+shell-server@0.3.1
 seba:minifiers-autoprefixer
 nikogosovd:multiple-uihooks
 templates:array
-ecmascript@0.9.0
+ecmascript@0.11.1
-es5-shim@4.6.15
+es5-shim@4.8.0
 differential:vulcanize
 reactive-dict@1.2.0
 percolate:synced-cron
 ongoworks:speakingurl
 service-configuration@1.0.11
 google-config-ui@1.0.0
-dynamic-import@0.2.0
+dynamic-import@0.4.0
 ddp-rate-limiter@1.0.7
-rate-limit@1.0.8
+rate-limit@1.0.9
 iron:router

app/.meteor/release

@@ -0,0 +1 @@
+METEOR@1.7.0.3

app/.meteor/versions

@@ -1,57 +1,57 @@
 accounts-base@1.4.2
 accounts-google@1.3.1
 accounts-oauth@1.1.15
-accounts-password@1.5.0
+accounts-password@1.5.1
-accounts-ui@1.2.0
+accounts-ui@1.3.0
-accounts-ui-unstyled@1.3.0
+accounts-ui-unstyled@1.4.1
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
 aldeed:schema-deny@1.1.0
 aldeed:schema-index@1.1.1
-aldeed:simple-schema@1.5.3
+aldeed:simple-schema@1.5.4
 allow-deny@1.1.0
-autoupdate@1.3.12
+autoupdate@1.4.1
-babel-compiler@6.24.7
+babel-compiler@7.1.1
-babel-runtime@1.1.1
+babel-runtime@1.2.2
-base64@1.0.10
+base64@1.0.11
 binary-heap@1.0.10
 blaze@2.3.2
 blaze-html-templates@1.1.2
 blaze-tools@1.0.10
-boilerplate-generator@1.3.1
+boilerplate-generator@1.5.0
-caching-compiler@1.1.11
+caching-compiler@1.1.12
-caching-html-compiler@1.1.2
+caching-html-compiler@1.1.3
-callback-hook@1.0.10
+callback-hook@1.1.0
-check@1.2.5
+check@1.3.1
 chuangbo:marked@0.3.5_1
-coffeescript@1.11.1_4
+coffeescript@1.0.17
 dburles:collection-helpers@1.1.0
 dburles:mongo-collection-instances@0.3.5
 ddp@1.4.0
-ddp-client@2.2.0
+ddp-client@2.3.3
-ddp-common@1.3.0
+ddp-common@1.4.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.1.1
+ddp-server@2.2.0
 deps@1.0.12
-diff-sequence@1.0.7
+diff-sequence@1.1.0
 differential:vulcanize@3.0.0
-dynamic-import@0.2.1
+dynamic-import@0.4.1
-ecmascript@0.9.0
+ecmascript@0.11.1
-ecmascript-runtime@0.5.0
+ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.5.0
+ecmascript-runtime-client@0.7.1
-ecmascript-runtime-server@0.5.0
+ecmascript-runtime-server@0.7.0
 ecwyne:mathjs@0.25.0
 ejson@1.1.0
 email@1.2.3
-es5-shim@4.6.15
+es5-shim@4.8.0
 geojson-utils@1.0.10
 google-config-ui@1.0.0
 google-oauth@1.2.5
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.3.0
+http@1.4.1
-id-map@1.0.9
+id-map@1.1.0
 iron:controller@1.0.12
 iron:core@1.0.11
 iron:dynamic-template@1.0.12
@@ -60,74 +60,76 @@ iron:location@1.0.11
 iron:middleware-stack@1.1.0
 iron:router@1.1.2
 iron:url@1.1.0
-jquery@1.11.10
+jquery@1.11.11
 lai:collection-extensions@0.2.1_1
 launch-screen@1.1.1
 less@2.7.12
 livedata@1.0.18
 localstorage@1.2.0
-logging@1.1.19
+logging@1.1.20
 matb33:collection-hooks@0.8.4
 mdg:validation-error@0.5.1
-meteor@1.8.2
+meteor@1.9.2
-meteor-base@1.2.0
+meteor-base@1.4.0
 meteorhacks:subs-manager@1.6.4
-minifier-css@1.2.16
+minifier-css@1.3.1
-minifier-js@2.2.2
+minifier-js@2.3.5
-minimongo@1.4.3
+minimongo@1.4.4
 mobile-experience@1.0.5
 mobile-status-bar@1.0.14
-modules@0.11.3
+modern-browsers@0.1.2
-modules-runtime@0.9.2
+modules@0.12.2
-momentjs:moment@2.20.1
+modules-runtime@0.10.2
-mongo@1.3.1
+momentjs:moment@2.22.2
+mongo@1.5.1
 mongo-dev-server@1.1.0
-mongo-id@1.0.6
+mongo-id@1.0.7
 nikogosovd:multiple-uihooks@0.1.8
 npm-bcrypt@0.9.3
-npm-mongo@2.2.34
+npm-mongo@3.0.11
-oauth@1.2.1
+oauth@1.2.3
 oauth2@1.2.0
 observe-sequence@1.0.16
 ongoworks:speakingurl@9.0.0
-ordered-dict@1.0.9
+ordered-dict@1.1.0
 percolate:migrations@0.9.8
 percolate:synced-cron@1.3.2
-promise@0.10.1
+promise@0.11.1
 raix:eventemitter@0.1.3
-random@1.0.10
+random@1.1.0
-rate-limit@1.0.8
+rate-limit@1.0.9
 reactive-dict@1.2.0
 reactive-var@1.0.11
-reload@1.1.11
+reload@1.2.0
-retry@1.0.9
+retry@1.1.0
 reywood:iron-router-ga@0.7.1
-routepolicy@1.0.12
+routepolicy@1.0.13
 seba:minifiers-autoprefixer@1.0.1
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9
 shell-server@0.3.1
+socket-stream-client@0.2.2
 softwarerero:accounts-t9n@1.3.11
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 splendido:accounts-emails-field@1.2.0
 splendido:accounts-meld@1.3.1
 srp@1.0.10
-standard-minifier-js@2.2.3
+standard-minifier-js@2.3.4
 templates:array@1.0.3
 templating@1.3.2
 templating-compiler@1.3.3
 templating-runtime@1.3.2
 templating-tools@1.1.2
-tracker@1.1.3
+tracker@1.2.0
 ui@1.0.13
 underscore@1.0.10
-url@1.1.0
+url@1.2.0
 useraccounts:core@1.14.2
 useraccounts:iron-routing@1.14.2
 useraccounts:polymer@1.14.2
-webapp@1.4.0
+webapp@1.6.2
 webapp-hashing@1.0.9
 wizonesolutions:canonical@0.0.5
 zimme:collection-behaviours@1.1.3

app/Model/Character/Characters.js

@@ -583,7 +583,7 @@ Characters.allow({
 
 Characters.deny({
 	update: function(userId, docs, fields, modifier) {
-		// can't change owners
+		// can't change owners unless you are the current owner
-		return _.contains(fields, "owner");
+		return _.contains(fields, "owner") && doc.owner !== userId;
 	}
 });

app/Model/Meta/Blacklist.js

@@ -0,0 +1,9 @@
+Blacklist = new Mongo.Collection("blacklist");
+
+Schemas.Blacklist = new SimpleSchema({
+	userId: {
+		type: String,
+	},
+});
+
+Blacklist.attachSchema(Schemas.Blacklist);

app/Routes/API.js

@@ -0,0 +1,91 @@
+Router.map(function() {
+	this.route("vmixCharacter", {
+		path: "/vmix-character/:_id/",
+		where: "server",
+		action: function() {
+			this.response.setHeader("Content-Type", "application/json");
+			var query = this.params.query;
+			var key = query && query.key;
+			ifKeyValid(key, this.response, "vmixCharacter", () =>
+				this.response.end(vMixCharacter(this.params._id))
+			);
+		},
+	});
+	this.route("vmixParty", {
+		path: "/vmix-party/:_id/",
+		where: "server",
+		action: function() {
+			this.response.setHeader("Content-Type", "application/json");
+			var query = this.params.query;
+			var key = query && query.key;
+			ifKeyValid(key, this.response, "vmixParty", () =>
+				this.response.end(vMixParty(this.params._id))
+			);
+		},
+	});
+
+	this.route("jsonCharacterSheet", {
+		path: "/character/:_id/json",
+		where: "server",
+		action: function() {
+			this.response.setHeader("Content-Type", "application/json");
+			var query = this.params.query;
+			var key = query && query.key;
+			ifKeyValid(key, this.response, "jsonCharacterSheet", () => {
+				if (canViewCharacter(this.params._id, userIdFromKey(key))){
+					this.response.end(JSONExport(this.params._id))
+				} else {
+					this.response.writeHead(403, "You do not have permission to view this character");
+					this.response.end();
+				}
+			}
+			);
+		},
+	});
+});
+
+var ifKeyValid = function(apiKey, response, method, callback){
+	if (!apiKey){
+		response.writeHead(403, "You must use an api key to access this api");
+		response.end();
+	} else if (!isKeyValid(apiKey)){
+		response.writeHead(403, "API key is invalid");
+		response.end();
+	} else if (isRateLimited(apiKey, method)){
+		response.writeHead(429, "Too many requests");
+		response.end(JSON.stringify({
+			"timeToReset": rateLimiter.check({apiKey: apiKey, method: method}).timeToReset
+		}));
+	} else {
+		rateLimiter.increment({apiKey: apiKey, method: method})
+		callback();
+	}
+};
+
+var isKeyValid = function(apiKey){
+	var user = Meteor.users.findOne({apiKey});
+	if (!user) return false;
+	var blackListed = Blacklist.findOne({userId: user._id});
+	return !blackListed;
+};
+
+var userIdFromKey = function(apiKey){
+	var user = Meteor.users.findOne({apiKey}); // we know user exists from isKeyValid
+	return user._id;
+}
+
+var rateLimiter = new RateLimiter();
+rateLimiter.addRule({apiKey: String}, 5, 5000);
+rateLimiter.addRule({apiKey: String, method: "vmixCharacter"}, 2, 10000);
+rateLimiter.addRule({apiKey: String, method: "vmixParty"}, 2, 10000);
+rateLimiter.addRule({apiKey: String, method: "jsonCharacterSheet"}, 5, 5000);
+
+var isRateLimited = function(apiKey, method){
+	const limited = !rateLimiter.check({apiKey: apiKey, method: method}).allowed
+	if (limited) {
+		console.log(`Rate limit hit by API key ${apiKey}`);
+		return true;
+	} else {
+		return false;
+	}
+};

app/Routes/Routes.js

@@ -13,6 +13,11 @@ Router.plugin("ensureSignedIn", {
 
 Router.plugin("dataNotFound", {notFoundTemplate: "notFound"});
 
+var handleSubError = function(e){
+	Session.set("error", {reason: e.reason, href: location.href});
+	Router.go("/error");
+};
+
 Router.map(function() {
 	this.route("/", {
 		name: "home",
@@ -36,7 +41,9 @@ Router.map(function() {
 		path: "/character/:_id/",
 		waitOn: function(){
 			return [
-				subsManager.subscribe("singleCharacter", this.params._id),
+				subsManager.subscribe(
+					"singleCharacter", this.params._id, {onError: handleSubError}
+				),
 			];
 		},
 		action: function(){
@@ -52,7 +59,9 @@ Router.map(function() {
 		path: "/character/:_id/:urlName",
 		waitOn: function(){
 			return [
-				subsManager.subscribe("singleCharacter", this.params._id),
+				subsManager.subscribe(
+					"singleCharacter", this.params._id, {onError: handleSubError}
+				),
 			];
 		},
 		data: function() {
@@ -78,6 +87,37 @@ Router.map(function() {
 		fastRender: true,
 	});
 
+	this.route("printedCharacterSheet", {
+		path: "/character/:_id/:urlName/print",
+		waitOn: function(){
+			return [
+				subsManager.subscribe(
+					"singleCharacter", this.params._id, {onError: handleSubError}
+				),
+			];
+		},
+		data: function() {
+			var data = Characters.findOne(
+				{_id: this.params._id},
+				{fields: {_id: 1, name: 1, color: 1, writers: 1, readers: 1}}
+			);
+			return data;
+		},
+		onAfterAction: function() {
+			var char = Characters.findOne({_id: this.params._id}, {fields: {name: 1}});
+			var name = char && char.name;
+			if (name){
+				document.title = name + " - Printing";
+			}
+		},
+		//analytics
+		trackPageView: false,
+		onRun: function() {
+			window.ga && window.ga("send", "pageview", "/print-character");
+			this.next();
+		},
+	});
+
 	this.route("library", {
 		path: "/library",
 		waitOn: function(){
@@ -124,4 +164,11 @@ Router.map(function() {
 			document.title = appName;
 		},
 	});
+
+	this.route("/error", {
+		name: "error",
+		onAfterAction: function() {
+			document.title = `${appName} - Error`;
+		},
+	});
 });

app/client/compatibility/jquery.quickfit.js

@@ -0,0 +1,174 @@
+// jscs:disable
+// https://github.com/chunksnbits/jquery-quickfit
+(function ($) {
+  var Quickfit, QuickfitHelper, defaults, pluginName;
+
+  pluginName = 'quickfit';
+
+  defaults = {
+    min: 8,
+    max: 12,
+    tolerance: 0.02,
+    truncate: false,
+    width: null,
+    sampleNumberOfLetters: 10,
+    sampleFontSize: 12
+  };
+  QuickfitHelper = (function () {
+
+    var sharedInstance = null;
+
+    QuickfitHelper.instance = function (options) {
+      if (!sharedInstance) {
+        sharedInstance = new QuickfitHelper(options);
+      }
+      return sharedInstance;
+    };
+
+    function QuickfitHelper(options) {
+      this.options = options;
+
+      this.item = $('<span id="meassure"></span>');
+      this.item.css({
+        position: 'absolute',
+        left: '-1000px',
+        top: '-1000px',
+        'font-size': "" + this.options.sampleFontSize + "px"
+      });
+      $('body').append(this.item);
+
+      this.meassures = {};
+    }
+
+    QuickfitHelper.prototype.getMeassure = function (letter) {
+      var currentMeassure;
+      currentMeassure = this.meassures[letter];
+      if (!currentMeassure) {
+        currentMeassure = this.setMeassure(letter);
+      }
+      return currentMeassure;
+    };
+
+    QuickfitHelper.prototype.setMeassure = function (letter) {
+      var currentMeassure, index, sampleLetter, text, _ref;
+
+      text = '';
+      sampleLetter = letter === ' ' ? '&nbsp;' : letter;
+
+      for (index = 0, _ref = this.options.sampleNumberOfLetters - 1; 0 <= _ref ? index <= _ref : index >= _ref; 0 <= _ref ? index++ : index--) {
+        text += sampleLetter;
+      }
+
+      this.item.html(text);
+      currentMeassure = this.item.width() / this.options.sampleNumberOfLetters / this.options.sampleFontSize;
+      this.meassures[letter] = currentMeassure;
+
+      return currentMeassure;
+    };
+
+    return QuickfitHelper;
+
+  })();
+
+  Quickfit = (function () {
+
+    function Quickfit(element, options) {
+      this.$element = element;
+      this.options = $.extend({}, defaults, options);
+      this.$element = $(this.$element);
+      this._defaults = defaults;
+      this._name = pluginName;
+      this.quickfitHelper = QuickfitHelper.instance(this.options);
+    }
+
+    Quickfit.prototype.fit = function () {
+      var elementWidth;
+      if (!this.options.width) {
+        elementWidth = this.$element.width();
+        this.options.width = elementWidth - this.options.tolerance * elementWidth;
+      }
+      if (this.text = this.$element.attr('data-quickfit')) {
+        this.previouslyTruncated = true;
+      } else {
+        this.text = this.$element.text();
+      }
+      this.calculateFontSize();
+
+      if (this.options.truncate) this.truncate();
+
+      return {
+        $element: this.$element,
+        size: this.fontSize
+      };
+    };
+
+    Quickfit.prototype.calculateFontSize = function () {
+      var letter, textWidth, i;
+
+      textWidth = 0;
+      for (i = 0; i < this.text.length; ++i) {
+        letter = this.text.charAt(i);
+        textWidth += this.quickfitHelper.getMeassure(letter);
+      }
+
+      this.targetFontSize = parseInt(this.options.width / textWidth);
+      return this.fontSize = Math.max(this.options.min, Math.min(this.options.max, this.targetFontSize));
+    };
+
+    Quickfit.prototype.truncate = function () {
+      var index, lastLetter, letter, textToAdd, textWidth;
+
+      if (this.fontSize > this.targetFontSize) {
+        textToAdd = '';
+        textWidth = 3 * this.quickfitHelper.getMeassure('.') * this.fontSize;
+
+        index = 0;
+        while (textWidth < this.options.width && index < this.text.length) {
+          letter = this.text[index++];
+          if (lastLetter) textToAdd += lastLetter;
+          textWidth += this.fontSize * this.quickfitHelper.getMeassure(letter);
+          lastLetter = letter;
+        }
+
+        if (textToAdd.length + 1 === this.text.length) {
+          textToAdd = this.text;
+        } else {
+          textToAdd += '...';
+        }
+        this.textWasTruncated = true;
+
+        return this.$element.attr('data-quickfit', this.text).html(textToAdd);
+
+      } else {
+        if (this.previouslyTruncated) {
+          return this.$element.html(this.text);
+        }
+      }
+    };
+
+    return Quickfit;
+
+  })();
+
+  return $.fn.quickfit = function (options) {
+    var measurements = [];
+
+    // Separate measurements from repaints
+    // First calculate all measurements...
+    var $elements = this.each(function () {
+      var measurement = new Quickfit(this, options).fit();
+      measurements.push(measurement);
+      return measurement.$element;
+    });
+
+    // ... then apply the measurements.
+    for (var i = 0; i < measurements.length; i++) {
+      var measurement = measurements[i];
+
+      measurement.$element.css({ fontSize: measurement.size + 'px' });
+    }
+
+    return $elements;
+  };
+
+})(jQuery, window);

app/client/lib/printing.js

@@ -0,0 +1,12 @@
+Session.setDefault("isPrinting", false);
+if (window.matchMedia) {
+	var mediaQueryList = window.matchMedia("print");
+	mediaQueryList.addListener(function(mql) {
+		if (mql.matches) {
+			Session.set("isPrinting", true);
+			Tracker.flush();
+		} else {
+			Session.set("isPrinting", false);
+		}
+	});
+}

app/client/lib/removeDuplicateProficiencies.js

@@ -0,0 +1,17 @@
+removeDuplicateProficiencies = function(proficiencies) {
+	dict = {};
+	proficiencies.forEach(function(prof) {
+		if (prof.name in dict) { //if we have already gone over another proficiency for the same thing
+			if (dict[prof.name].value < prof.value) {
+				dict[prof.name] = prof; //then take the new one if it's higher, otherwise leave it
+			}
+		} else {
+			dict[prof.name] = prof; //if it wasn't already there, store it
+		}
+	});
+	profs = []
+	_.forEach(dict, function(prof) {
+		profs.push(prof);
+	})
+	return profs;
+};