Spacebar/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-11 05:02:37 +01:00
Code Issues Releases Activity

Merge pull request #144 from afeuerstein/master

Browse Source 
merge afeuerstein/fosscord-api to fosscord/fosscord-api
This commit is contained in:
Flam3rboy 2021-05-22 19:41:10 +02:00 committed by GitHub
commit 1793c99d03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 356 additions and 628 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

694
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
package.json
View File

@ -9,7 +9,6 @@
"test:watch": "jest --watch",
"start": "npm run build && node dist/start",
"build": "tsc -b .",
"postinstall": "patch-package",
"dev": "tsnd --respawn src/start.ts"
},
"repository": {
@ -47,8 +46,7 @@
"mongoose": "^5.12.3",
"mongoose-autopopulate": "^0.12.3",
"mongoose-long": "^0.3.2",
"multer": "^1.4.2",
"patch-package": "^6.2.2"
"multer": "^1.4.2"
},
"devDependencies": {
"@types/bcrypt": "^3.0.0",

274
patches/i18next-http-middleware+3.1.1.patch
View File

@ -1,274 +0,0 @@
diff --git a/node_modules/i18next-http-middleware/cjs/httpFunctions.js b/node_modules/i18next-http-middleware/cjs/httpFunctions.js
index 47f0d61..c1ebebc 100644
--- a/node_modules/i18next-http-middleware/cjs/httpFunctions.js
+++ b/node_modules/i18next-http-middleware/cjs/httpFunctions.js
@@ -1,175 +1,181 @@
"use strict";
Object.defineProperty(exports, "__esModule", {
- value: true
+ value: true,
});
exports.extendOptionsWithDefaults = exports.getSession = exports.send = exports.setStatus = exports.setContentType = exports.setHeader = exports.getHeader = exports.getBody = exports.getCookies = exports.getHeaders = exports.getParams = exports.getQuery = exports.getOriginalUrl = exports.setUrl = exports.getUrl = exports.getPath = void 0;
var getPath = function getPath(req) {
- if (req.path) return req.path;
- if (req.raw && req.raw.path) return req.raw.path;
- if (req.url) return req.url;
- console.log('no possibility found to get path');
+ if (req.path) return req.path;
+ if (req.raw && req.raw.path) return req.raw.path;
+ if (req.url) return req.url;
+ console.log("no possibility found to get path");
};
exports.getPath = getPath;
var getUrl = function getUrl(req) {
- if (req.url) return req.url;
- if (req.raw && req.raw.url) return req.raw.url;
- console.log('no possibility found to get url');
+ if (req.url) return req.url;
+ if (req.raw && req.raw.url) return req.raw.url;
+ console.log("no possibility found to get url");
};
exports.getUrl = getUrl;
var setUrl = function setUrl(req, url) {
- if (req.url) {
- req.url = url;
- return;
- }
+ if (req.url) {
+ req.url = url;
+ return;
+ }
- console.log('no possibility found to get url');
+ console.log("no possibility found to get url");
};
exports.setUrl = setUrl;
var getOriginalUrl = function getOriginalUrl(req) {
- if (req.originalUrl) return req.originalUrl;
- if (req.raw && req.raw.originalUrl) return req.raw.originalUrl;
- return getUrl(req);
+ if (req.originalUrl) return req.originalUrl;
+ if (req.raw && req.raw.originalUrl) return req.raw.originalUrl;
+ return getUrl(req);
};
exports.getOriginalUrl = getOriginalUrl;
var getQuery = function getQuery(req) {
- if (req.query && typeof req.query.entries === 'function' && typeof Object.fromEntries === 'function') return Object.fromEntries(req.query);
- if (req.query) return req.query;
- if (req.raw && req.raw.query) return req.raw.query;
- if (req.ctx && req.ctx.queryParams) return req.ctx.queryParams;
- var url = req.url || req.raw && req.raw.url;
- if (url && url.indexOf('?') < 0) return {};
- console.log('no possibility found to get query');
- return {};
+ try {
+ if (req.query && typeof req.query.entries === "function" && typeof Object.fromEntries === "function")
+ return Object.fromEntries(req.query);
+ } catch (e) {}
+
+ if (req.query) return req.query;
+ if (req.raw && req.raw.query) return req.raw.query;
+ if (req.ctx && req.ctx.queryParams) return req.ctx.queryParams;
+ var url = req.url || (req.raw && req.raw.url);
+ if (url && url.indexOf("?") < 0) return {};
+ console.log("no possibility found to get query");
+ return {};
};
exports.getQuery = getQuery;
var getParams = function getParams(req) {
- if (req.params) return req.params;
- if (req.raw && req.raw.params) return req.raw.params;
- if (req.ctx && req.ctx.params) return req.ctx.params;
- console.log('no possibility found to get params');
- return {};
+ if (req.params) return req.params;
+ if (req.raw && req.raw.params) return req.raw.params;
+ if (req.ctx && req.ctx.params) return req.ctx.params;
+ console.log("no possibility found to get params");
+ return {};
};
exports.getParams = getParams;
var getHeaders = function getHeaders(req) {
- if (req.headers) return req.headers;
- console.log('no possibility found to get headers');
+ if (req.headers) return req.headers;
+ console.log("no possibility found to get headers");
};
exports.getHeaders = getHeaders;
var getCookies = function getCookies(req) {
- if (req.cookies) return req.cookies;
+ if (req.cookies) return req.cookies;
- if (getHeaders(req)) {
- var list = {};
- var rc = getHeaders(req).cookie;
- rc && rc.split(';').forEach(function (cookie) {
- var parts = cookie.split('=');
- list[parts.shift().trim()] = decodeURI(encodeURI(parts.join('=')));
- });
- return list;
- }
+ if (getHeaders(req)) {
+ var list = {};
+ var rc = getHeaders(req).cookie;
+ rc &&
+ rc.split(";").forEach(function (cookie) {
+ var parts = cookie.split("=");
+ list[parts.shift().trim()] = decodeURI(encodeURI(parts.join("=")));
+ });
+ return list;
+ }
- console.log('no possibility found to get cookies');
+ console.log("no possibility found to get cookies");
};
exports.getCookies = getCookies;
var getBody = function getBody(req) {
- if (req.ctx && typeof req.ctx.body === 'function') return req.ctx.body.bind(req.ctx);
- if (req.ctx && req.ctx.body) return req.ctx.body;
- if (req.json) return req.json;
- if (req.body) return req.body;
- console.log('no possibility found to get body');
- return {};
+ if (req.ctx && typeof req.ctx.body === "function") return req.ctx.body.bind(req.ctx);
+ if (req.ctx && req.ctx.body) return req.ctx.body;
+ if (req.json) return req.json;
+ if (req.body) return req.body;
+ console.log("no possibility found to get body");
+ return {};
};
exports.getBody = getBody;
var getHeader = function getHeader(res, name) {
- if (res.getHeader) return res.getHeader(name);
- if (res.headers) return res.headers[name];
- if (getHeaders(res) && getHeaders(res)[name]) return getHeaders(res)[name];
- console.log('no possibility found to get header');
- return undefined;
+ if (res.getHeader) return res.getHeader(name);
+ if (res.headers) return res.headers[name];
+ if (getHeaders(res) && getHeaders(res)[name]) return getHeaders(res)[name];
+ console.log("no possibility found to get header");
+ return undefined;
};
exports.getHeader = getHeader;
var setHeader = function setHeader(res, name, value) {
- if (res._headerSent || res.headersSent) return;
- if (typeof res.setHeader === 'function') return res.setHeader(name, value);
- if (typeof res.header === 'function') return res.header(name, value);
- if (res.responseHeaders && typeof res.responseHeaders.set === 'function') return res.responseHeaders.set(name, value);
- if (res.headers && typeof res.headers.set === 'function') return res.headers.set(name, value);
- console.log('no possibility found to set header');
+ if (res._headerSent || res.headersSent) return;
+ if (typeof res.setHeader === "function") return res.setHeader(name, value);
+ if (typeof res.header === "function") return res.header(name, value);
+ if (res.responseHeaders && typeof res.responseHeaders.set === "function")
+ return res.responseHeaders.set(name, value);
+ if (res.headers && typeof res.headers.set === "function") return res.headers.set(name, value);
+ console.log("no possibility found to set header");
};
exports.setHeader = setHeader;
var setContentType = function setContentType(res, type) {
- if (typeof res.contentType === 'function') return res.contentType(type);
- if (typeof res.type === 'function') return res.type(type);
- setHeader(res, 'Content-Type', type);
+ if (typeof res.contentType === "function") return res.contentType(type);
+ if (typeof res.type === "function") return res.type(type);
+ setHeader(res, "Content-Type", type);
};
exports.setContentType = setContentType;
var setStatus = function setStatus(res, code) {
- if (typeof res.status === 'function') return res.status(code);
- if (res.status) return res.status = code;
- console.log('no possibility found to set status');
+ if (typeof res.status === "function") return res.status(code);
+ if (res.status) return (res.status = code);
+ console.log("no possibility found to set status");
};
exports.setStatus = setStatus;
var send = function send(res, body) {
- if (typeof res.send === 'function') return res.send(body);
- return body;
+ if (typeof res.send === "function") return res.send(body);
+ return body;
};
exports.send = send;
var getSession = function getSession(req) {
- if (req.session) return req.session;
- if (req.raw && req.raw.session) return req.raw.session;
- console.log('no possibility found to get session');
+ if (req.session) return req.session;
+ if (req.raw && req.raw.session) return req.raw.session;
+ console.log("no possibility found to get session");
};
exports.getSession = getSession;
var extendOptionsWithDefaults = function extendOptionsWithDefaults() {
- var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
- options.getPath = options.getPath || getPath;
- options.getOriginalUrl = options.getOriginalUrl || getOriginalUrl;
- options.getUrl = options.getUrl || getUrl;
- options.setUrl = options.setUrl || setUrl;
- options.getParams = options.getParams || getParams;
- options.getSession = options.getSession || getSession;
- options.getQuery = options.getQuery || getQuery;
- options.getCookies = options.getCookies || getCookies;
- options.getBody = options.getBody || getBody;
- options.getHeaders = options.getHeaders || getHeaders;
- options.getHeader = options.getHeader || getHeader;
- options.setHeader = options.setHeader || setHeader;
- options.setContentType = options.setContentType || setContentType;
- options.setStatus = options.setStatus || setStatus;
- options.send = options.send || send;
- return options;
+ var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+ options.getPath = options.getPath || getPath;
+ options.getOriginalUrl = options.getOriginalUrl || getOriginalUrl;
+ options.getUrl = options.getUrl || getUrl;
+ options.setUrl = options.setUrl || setUrl;
+ options.getParams = options.getParams || getParams;
+ options.getSession = options.getSession || getSession;
+ options.getQuery = options.getQuery || getQuery;
+ options.getCookies = options.getCookies || getCookies;
+ options.getBody = options.getBody || getBody;
+ options.getHeaders = options.getHeaders || getHeaders;
+ options.getHeader = options.getHeader || getHeader;
+ options.setHeader = options.setHeader || setHeader;
+ options.setContentType = options.setContentType || setContentType;
+ options.setStatus = options.setStatus || setStatus;
+ options.send = options.send || send;
+ return options;
};
exports.extendOptionsWithDefaults = extendOptionsWithDefaults;
\ No newline at end of file

12
src/routes/guilds/#guild_id/roles.ts
View File

@ -8,7 +8,8 @@ import {
Snowflake,
MemberModel,
GuildRoleCreateEvent,
GuildRoleUpdateEvent
GuildRoleUpdateEvent,
GuildRoleDeleteEvent
} from "@fosscord/server-util";
import { HTTPError } from "lambert-server";
import { emitEvent } from "../../../util/Event";
@ -85,6 +86,15 @@ router.delete("/:role_id", async (req: Request, res: Response) => {
guild_id: guild_id
}).exec();
await emitEvent({
event: "GUILD_ROLE_DELETE",
guild_id,
data: {
guild_id,
role_id
}
} as GuildRoleDeleteEvent);
res.sendStatus(204);
});