Spacebar/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-12 21:52:40 +01:00
Code Issues Releases Activity

Merge branch 'feat/defaultRights' into slowcord

Browse Source
This commit is contained in:
Madeline 2022-05-31 20:01:25 +10:00
commit eb00351d87
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
util/src/entities/Config.ts
View File

@ -4,6 +4,7 @@ import crypto from "crypto";
import { Snowflake } from "../util/Snowflake";
import { SessionsReplace } from "..";
import { hostname } from "os";
import { Rights } from "../util/Rights";
@Entity("config")
export class ConfigEntity extends BaseClassWithoutId {
@ -120,6 +121,7 @@ export interface ConfigValue {
secret: string | null;
};
ipdataApiKey: string | null;
defaultRights: string;
};
login: {
requireCaptcha: boolean;
@ -311,6 +313,33 @@ export const DefaultConfigOptions: ConfigValue = {
secret: null,
},
ipdataApiKey: "eca677b284b3bac29eb72f5e496aa9047f26543605efe99ff2ce35c9",
defaultRights: (
Rights.FLAGS.CREATE_CHANNELS +
Rights.FLAGS.CREATE_DMS +
Rights.FLAGS.CREATE_DM_GROUPS +
Rights.FLAGS.CREATE_GUILDS +
Rights.FLAGS.CREATE_INVITES +
Rights.FLAGS.CREATE_ROLES +
Rights.FLAGS.CREATE_TEMPLATES +
Rights.FLAGS.CREATE_WEBHOOKS +
Rights.FLAGS.JOIN_GUILDS +
Rights.FLAGS.PIN_MESSAGES +
Rights.FLAGS.SELF_ADD_REACTIONS +
Rights.FLAGS.SELF_DELETE_MESSAGES +
Rights.FLAGS.SELF_EDIT_MESSAGES +
Rights.FLAGS.SELF_EDIT_NAME +
Rights.FLAGS.SEND_MESSAGES +
Rights.FLAGS.USE_ACTIVITIES +
Rights.FLAGS.USE_VIDEO +
Rights.FLAGS.USE_VOICE +
Rights.FLAGS.INVITE_USERS +
Rights.FLAGS.SELF_DELETE_DISABLE +
Rights.FLAGS.DEBTABLE +
Rights.FLAGS.KICK_BAN_MEMBERS +
Rights.FLAGS.SELF_LEAVE_GROUPS +
Rights.FLAGS.SELF_ADD_DISCOVERABLE +
Rights.FLAGS.USE_ACHIEVEMENTS
).toString()
},
login: {
requireCaptcha: false,

2
util/src/entities/User.ts
View File

@ -268,7 +268,7 @@ export class User extends BaseClass {
disabled: false,
deleted: false,
email: email,
rights: "0", // TODO: grant rights correctly, as 0 actually stands for no rights at all
rights: Config.get().security.defaultRights,
nsfw_allowed: true, // TODO: depending on age
public_flags: "0",
flags: "0", // TODO: generate