Merge branch 'master' of https://github.com/discord-open-source/discord-server into master
2 files changed, 23 insertions, 8 deletions
diff --git a/.github/ISSUE_TEMPLATE/-feature--.md b/.github/ISSUE_TEMPLATE/-feature--.md
new file mode 100644
index 00000000..cefcf6b6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/-feature--.md
@@ -0,0 +1,20 @@
+---
+name: "[Feature] "
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/README.md b/README.md
index 4a1c504b..47a12561 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-# Discord Open Source Server
-This repository contains the HTTP API Server and the WebSocket Gateway Server
+# Discord Open Source API Server
+This repository contains the HTTP API Server
## Bug Tracker
[Project Board](https://github.com/discord-open-source/discord-server/projects/4)
@@ -7,11 +7,6 @@ This repository contains the HTTP API Server and the WebSocket Gateway Server
## API
[Project Board](https://github.com/discord-open-source/discord-server/projects/3)
-For the WebSocket we use [ws](https://www.npmjs.com/package/ws) and we'll write our own packet handler for the individual opcodes and events.
-
-## Gateway
-[Project Board](https://github.com/discord-open-source/discord-server/projects/6)
-
We use [express](https://expressjs.com/) for the HTTP Server and
[lambert-server](https://www.npmjs.com/package/lambert-server) for route handling and body validation (customized).
@@ -22,7 +17,7 @@ You should be familiar with:
- [TypeScript](https://www.typescriptlang.org/)
- [Lambert-DB](https://www.npmjs.com/package/lambert-db) (easy database abstraction wrapper)
-and the technologies we use for Gateway/API
+and the other technologies we use
### Getting Started
Clone the Repository:
|