From 1ff31ac12ba3a85fbcec0805bb27cc2877eba454 Mon Sep 17 00:00:00 2001 From: hydrabolt Date: Fri, 2 Oct 2015 20:04:58 +0100 Subject: [PATCH 1/4] Added member class --- src/Member.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/Member.js diff --git a/src/Member.js b/src/Member.js new file mode 100644 index 000000000..3fa49ebd6 --- /dev/null +++ b/src/Member.js @@ -0,0 +1,12 @@ +var User = require("./user.js"); + +class Member extends User{ + + constructor(data){ + super(data); + + + + } + +} \ No newline at end of file From 6b8dadced8bf2d3692a3dd3b618365e8983c91c7 Mon Sep 17 00:00:00 2001 From: hydrabolt Date: Fri, 2 Oct 2015 21:27:08 +0100 Subject: [PATCH 2/4] added PMChannel --- lib/Client.js | 1 + src/Client.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lib/Client.js b/lib/Client.js index 67c27c047..916039ffa 100644 --- a/lib/Client.js +++ b/lib/Client.js @@ -12,6 +12,7 @@ var Channel = require("./channel.js"); var Message = require("./message.js"); var Invite = require("./invite.js"); var PMChannel = require("./PMChannel.js"); +var Member = require("./Member.js"); var gameMap = require("../ref/gameMap.json"); diff --git a/src/Client.js b/src/Client.js index 336d704f9..459faab75 100644 --- a/src/Client.js +++ b/src/Client.js @@ -6,6 +6,7 @@ var Channel = require("./channel.js"); var Message = require("./message.js"); var Invite = require("./invite.js"); var PMChannel = require("./PMChannel.js"); +var Member = require("./Member.js"); var gameMap = require("../ref/gameMap.json"); @@ -1220,6 +1221,8 @@ class Client { channId = destination.id; } else if (destination instanceof Message) { channId = destination.channel.id; + } else if (destination instanceof PMChannel) { + channId = destination.id; } else if (destination instanceof User) { //check if we have a PM From c7ab2d37dbe0213990b5e0150d529f997c4316fa Mon Sep 17 00:00:00 2001 From: hydrabolt Date: Fri, 2 Oct 2015 21:30:14 +0100 Subject: [PATCH 3/4] Updated reference removed invalid reference so no error --- src/Client.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Client.js b/src/Client.js index 459faab75..aa396fb4e 100644 --- a/src/Client.js +++ b/src/Client.js @@ -6,7 +6,6 @@ var Channel = require("./channel.js"); var Message = require("./message.js"); var Invite = require("./invite.js"); var PMChannel = require("./PMChannel.js"); -var Member = require("./Member.js"); var gameMap = require("../ref/gameMap.json"); From 37d9d23679d88522177695e7e916fc9f1f54e0f3 Mon Sep 17 00:00:00 2001 From: hydrabolt Date: Fri, 2 Oct 2015 21:32:40 +0100 Subject: [PATCH 4/4] actually build changes reference now works when building --- lib/Client.js | 3 ++- lib/Member.js | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 lib/Member.js diff --git a/lib/Client.js b/lib/Client.js index 916039ffa..091424b16 100644 --- a/lib/Client.js +++ b/lib/Client.js @@ -12,7 +12,6 @@ var Channel = require("./channel.js"); var Message = require("./message.js"); var Invite = require("./invite.js"); var PMChannel = require("./PMChannel.js"); -var Member = require("./Member.js"); var gameMap = require("../ref/gameMap.json"); @@ -1457,6 +1456,8 @@ var Client = (function () { channId = destination.id; } else if (destination instanceof Message) { channId = destination.channel.id; + } else if (destination instanceof PMChannel) { + channId = destination.id; } else if (destination instanceof User) { //check if we have a PM diff --git a/lib/Member.js b/lib/Member.js new file mode 100644 index 000000000..7d7b03f1a --- /dev/null +++ b/lib/Member.js @@ -0,0 +1,21 @@ +"use strict"; + +var _get = function get(_x, _x2, _x3) { var _again = true; _function: while (_again) { var object = _x, property = _x2, receiver = _x3; desc = parent = getter = undefined; _again = false; if (object === null) object = Function.prototype; var desc = Object.getOwnPropertyDescriptor(object, property); if (desc === undefined) { var parent = Object.getPrototypeOf(object); if (parent === null) { return undefined; } else { _x = parent; _x2 = property; _x3 = receiver; _again = true; continue _function; } } else if ("value" in desc) { return desc.value; } else { var getter = desc.get; if (getter === undefined) { return undefined; } return getter.call(receiver); } } }; + +function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } + +function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } + +var User = require("./user.js"); + +var Member = (function (_User) { + _inherits(Member, _User); + + function Member(data) { + _classCallCheck(this, Member); + + _get(Object.getPrototypeOf(Member.prototype), "constructor", this).call(this, data); + } + + return Member; +})(User); \ No newline at end of file