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 branch 'master' into pr/TheArcaneBrony/434

Browse Source
This commit is contained in:
Flam3rboy 2021-10-10 19:02:08 +02:00
commit 3c4764fbc8
3 changed files with 23 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/assets/schemas.json
View File

@ -2909,6 +2909,9 @@
}
}
},
"required": [
"image"
],
"definitions": {
"ChannelPermissionOverwriteType": {
"enum": [
@ -4744,7 +4747,7 @@
"type": "string"
},
"permissions": {
"type": "array"
"type": "string"
},
"color": {
"type": "integer"

6
api/src/routes/guilds/#guild_id/roles.ts
View File

@ -17,7 +17,7 @@ const router: Router = Router();
export interface RoleModifySchema {
name?: string;
permissions?: bigint;
permissions?: string;
color?: number;
hoist?: boolean; // whether the role should be displayed separately in the sidebar
mentionable?: boolean; // whether the role should be mentionable
@ -57,7 +57,7 @@ router.post("/", route({ body: "RoleModifySchema", permission: "MANAGE_ROLES" })
...body,
guild_id: guild_id,
managed: false,
permissions: String(req.permission!.bitfield & (body.permissions || BigInt("0"))),
permissions: String(req.permission!.bitfield & BigInt(body.permissions || "0")),
tags: undefined
});
@ -109,7 +109,7 @@ router.patch("/:role_id", route({ body: "RoleModifySchema", permission: "MANAGE_
...body,
id: role_id,
guild_id,
permissions: String(req.permission!.bitfield & (body.permissions || BigInt("0")))
permissions: String(req.permission!.bitfield & BigInt(body.permissions || "0"))
});
await Promise.all([

61
util/src/migrations/migrate_db_engine.ts → util/src/migrations/migrate_db_engine.js
View File

@ -1,15 +1,14 @@
import { config } from "dotenv";
const { config } = require("dotenv");
config();
import { createConnection, EntityTarget } from "typeorm";
import { initDatabase } from "../util/Database";
import "missing-native-js-functions";
import {
const { createConnection } = require("typeorm");
const { initDatabase } = require("../../dist/util/Database");
require("missing-native-js-functions");
const {
Application,
Attachment,
Ban,
Channel,
ConnectedAccount,
defaultSettings,
Emoji,
Guild,
Invite,
@ -26,7 +25,7 @@ import {
User,
VoiceState,
Webhook,
} from "..";
} = require("../../dist/entities/index");
async function main() {
if (!process.env.TO) throw new Error("TO database env connection string not set");
@ -72,8 +71,7 @@ async function main() {
let i = 0;
try {
for (const e of entities) {
const entity = e as EntityTarget<any>;
for (const entity of entities) {
const entries = await oldDB.manager.find(entity);
// @ts-ignore
@ -82,48 +80,23 @@ async function main() {
for (const entry of entries) {
console.log(i++);
if (entry instanceof User) {
if (entry.bio == null) entry.bio = "";
if (entry.rights == null) entry.rights = "0";
if (entry.disabled == null) entry.disabled = false;
if (entry.fingerprints == null) entry.fingerprints = [];
if (entry.deleted == null) entry.deleted = false;
if (entry.data == null) {
entry.data = {
valid_tokens_since: new Date(0),
hash: undefined,
};
// @ts-ignore
if (entry.user_data) {
// TODO: relationships
entry.data = {
// @ts-ignore
valid_tokens_since: entry.user_data.valid_tokens_since, // @ts-ignore
hash: entry.user_data.hash,
};
}
}
// @ts-ignore
if (entry.settings == null) {
entry.settings = defaultSettings;
// @ts-ignore
if (entry.user_data) entry.settings = entry.user_settings;
}
}
// try {
try {
await newDB.manager.insert(entity, entry);
// } catch (error) {
// if (!entry.id) throw new Error("object doesn't have a unique id: " + entry);
// await newDB.manager.update(entity, { id: entry.id }, entry);
// }
} catch (error) {
try {
if (!entry.id) throw new Error("object doesn't have a unique id: " + entry);
await newDB.manager.update(entity, { id: entry.id }, entry);
} catch (error) {
console.error("couldn't migrate " + i + " " + entity.name, error);
}
}
}
// @ts-ignore
console.log("migrated " + entries.length + " " + entity.name);
}
} catch (error) {
console.error((error as any).message);
console.error(error.message);
}
console.log("SUCCESS migrated all data");