catto.js 0.0.5 → 0.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Server.js +7 -11
- package/User.js +1 -1
- package/package.json +1 -1
package/Server.js
CHANGED
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
/** @module Server */
|
|
2
|
-
|
|
3
1
|
var events = require("events");
|
|
4
2
|
var express = require("express");
|
|
5
3
|
var expressWs = require("express-ws");
|
|
@@ -15,12 +13,6 @@ var FileStore = require("session-file-store")(session);
|
|
|
15
13
|
if (typeof EventEmitter !== "undefined") {} else {
|
|
16
14
|
var { EventEmitter } = events;
|
|
17
15
|
}
|
|
18
|
-
|
|
19
|
-
/**
|
|
20
|
-
* Server.
|
|
21
|
-
* @class
|
|
22
|
-
* @param {object} options
|
|
23
|
-
*/
|
|
24
16
|
class Server extends EventEmitter {
|
|
25
17
|
constructor(options) {
|
|
26
18
|
super();
|
|
@@ -137,8 +129,12 @@ class Server extends EventEmitter {
|
|
|
137
129
|
this.app.ws(...args);
|
|
138
130
|
return this;
|
|
139
131
|
}
|
|
140
|
-
static(folder) {
|
|
141
|
-
|
|
132
|
+
static(folder, path) {
|
|
133
|
+
if (path) {
|
|
134
|
+
this.app.use(path, express.static(path.join(__dirname,"..","..",folder)));
|
|
135
|
+
} else {
|
|
136
|
+
this.app.use(express.static(path.join(__dirname,"..","..",folder)));
|
|
137
|
+
}
|
|
142
138
|
return this;
|
|
143
139
|
}
|
|
144
140
|
static fa(text) {
|
|
@@ -148,4 +144,4 @@ class Server extends EventEmitter {
|
|
|
148
144
|
}
|
|
149
145
|
}
|
|
150
146
|
|
|
151
|
-
module.exports = Server;
|
|
147
|
+
module.exports = Server;
|
package/User.js
CHANGED
|
@@ -47,7 +47,7 @@ module.exports = class {
|
|
|
47
47
|
}
|
|
48
48
|
get badges() {
|
|
49
49
|
var i = 23;
|
|
50
|
-
var p = this.options.
|
|
50
|
+
var p = (this.options.flags ? this.options.flags.bitfield : this.options.public_flags.bitfield);
|
|
51
51
|
var f = [];
|
|
52
52
|
while (--i > -1) {
|
|
53
53
|
if (![21, 20, 15, 13, 12, 11, 5, 4].includes(i) && p >= (1 << i)) {
|