mirror of
https://github.com/spacebarchat/server.git
synced 2024-11-10 20:52:42 +01:00
Merge branch 'master' into unittests
This commit is contained in:
commit
c238f86932
@ -26,7 +26,7 @@ This repository contains:
|
|||||||
- [WebRTC Server](https://github.com/fosscord/fosscord-server/tree/master/webrtc)
|
- [WebRTC Server](https://github.com/fosscord/fosscord-server/tree/master/webrtc)
|
||||||
- [Admin Dashboard](https://github.com/fosscord/fosscord-server/tree/master/dashboard)
|
- [Admin Dashboard](https://github.com/fosscord/fosscord-server/tree/master/dashboard)
|
||||||
|
|
||||||
## [Ressources](https://docs.fosscord.com/resources/)
|
## [Resources](https://docs.fosscord.com/resources/)
|
||||||
|
|
||||||
- [Contributing](https://docs.fosscord.com/contributing/server/)
|
- [Contributing](https://docs.fosscord.com/contributing/server/)
|
||||||
|
|
||||||
|
13032
gateway/package-lock.json
generated
13032
gateway/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -41,5 +41,8 @@
|
|||||||
"typeorm": "^0.2.37",
|
"typeorm": "^0.2.37",
|
||||||
"uuid": "^8.3.2",
|
"uuid": "^8.3.2",
|
||||||
"ws": "^7.4.2"
|
"ws": "^7.4.2"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"@yukikaze-bot/erlpack": "^1.0.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@ import { URL } from "url";
|
|||||||
import { Session } from "@fosscord/util";
|
import { Session } from "@fosscord/util";
|
||||||
var erlpack: any;
|
var erlpack: any;
|
||||||
try {
|
try {
|
||||||
erlpack = require("erlpack");
|
erlpack = require("@yukikaze-bot/erlpack");
|
||||||
} catch (error) {}
|
} catch (error) {}
|
||||||
|
|
||||||
// TODO: check rate limit
|
// TODO: check rate limit
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
import { WebSocket, Payload, CLOSECODES, OPCODES } from "@fosscord/gateway";
|
import { WebSocket, Payload, CLOSECODES, OPCODES } from "@fosscord/gateway";
|
||||||
var erlpack: any;
|
var erlpack: any;
|
||||||
try {
|
try {
|
||||||
erlpack = require("erlpack");
|
erlpack = require("@yukikaze-bot/erlpack");
|
||||||
} catch (error) {}
|
} catch (error) {}
|
||||||
import OPCodeHandlers from "../opcodes";
|
import OPCodeHandlers from "../opcodes";
|
||||||
import { instanceOf, Tuple } from "lambert-server";
|
import { instanceOf, Tuple } from "lambert-server";
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
var erlpack: any;
|
var erlpack: any;
|
||||||
try {
|
try {
|
||||||
erlpack = require("erlpack");
|
erlpack = require("@yukikaze-bot/erlpack");
|
||||||
} catch (error) {}
|
} catch (error) {}
|
||||||
import { Payload, WebSocket } from "@fosscord/gateway";
|
import { Payload, WebSocket } from "@fosscord/gateway";
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user