mirror of
https://github.com/spacebarchat/server.git
synced 2024-11-06 10:52:31 +01:00
Merge pull request #491 from TheArcaneBrony/master
Add plugin & css support, add styling to differentiate from discord.com
This commit is contained in:
Samuel
GitHub
commit
90765b0e1c
2
.gitignore
vendored
2
.gitignore
vendored
@ -9,3 +9,5 @@ tsconfig.tsbuildinfo
|
||||
files/
|
||||
.env
|
||||
config.json
|
||||
|
||||
.vscode/settings.json
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
{
|
||||
"tabWidth": 4,
|
||||
"useTabs": true
|
||||
}
|
||||
"useTabs": true,
|
||||
"printWidth": 140,
|
||||
"trailingComma": "none",
|
||||
"useTabs": true
|
||||
}
|
||||
4
.vscode/settings.json
vendored
Normal file
4
.vscode/settings.json
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
{
|
||||
"awooga.originalColorCustomizations": {},
|
||||
"workbench.colorCustomizations": {}
|
||||
}
|
||||
@ -1,57 +0,0 @@
|
||||
// Auto register guest account:
|
||||
const prefix = [
|
||||
"mysterious",
|
||||
"adventurous",
|
||||
"courageous",
|
||||
"precious",
|
||||
"cynical",
|
||||
"despicable",
|
||||
"suspicious",
|
||||
"gorgeous",
|
||||
"lovely",
|
||||
"stunning",
|
||||
"based",
|
||||
"keyed",
|
||||
"ratioed",
|
||||
"twink",
|
||||
"phoned"
|
||||
];
|
||||
const suffix = [
|
||||
"Anonymous",
|
||||
"Lurker",
|
||||
"User",
|
||||
"Enjoyer",
|
||||
"Hunk",
|
||||
"Top",
|
||||
"Bottom",
|
||||
"Sub",
|
||||
"Coolstar",
|
||||
"Wrestling",
|
||||
"TylerTheCreator",
|
||||
"Ad"
|
||||
];
|
||||
|
||||
Array.prototype.random = function () {
|
||||
return this[Math.floor(Math.random() * this.length)];
|
||||
};
|
||||
|
||||
function _generateName() {
|
||||
return `${prefix.random()}${suffix.random()}`;
|
||||
}
|
||||
|
||||
const token = JSON.parse(localStorage.getItem("token"));
|
||||
if (!token && location.pathname !== "/login" && location.pathname !== "/register") {
|
||||
fetch(`${window.GLOBAL_ENV.API_ENDPOINT}/auth/register`, {
|
||||
method: "POST",
|
||||
headers: { "content-type": "application/json" },
|
||||
body: JSON.stringify({ username: `${_generateName()}`, consent: true }) //${Date.now().toString().slice(-4)}
|
||||
})
|
||||
.then((x) => x.json())
|
||||
.then((x) => {
|
||||
localStorage.setItem("token", `"${x.token}"`);
|
||||
if (!window.localStorage) {
|
||||
// client already loaded -> need to reload to apply the newly registered user token
|
||||
location.reload();
|
||||
}
|
||||
});
|
||||
}
|
||||
0
api/assets/dff87c953f43b561d71fbcfe8a93a79a.png
Normal file
0
api/assets/dff87c953f43b561d71fbcfe8a93a79a.png
Normal file
62
api/assets/preload-plugins/autoRegister.js
Normal file
62
api/assets/preload-plugins/autoRegister.js
Normal file
@ -0,0 +1,62 @@
|
||||
// Auto register guest account:
|
||||
const prefix = [
|
||||
"mysterious",
|
||||
"adventurous",
|
||||
"courageous",
|
||||
"precious",
|
||||
"cynical",
|
||||
"flamer ",
|
||||
"despicable",
|
||||
"suspicious",
|
||||
"gorgeous",
|
||||
"impeccable",
|
||||
"lovely",
|
||||
"stunning",
|
||||
"keyed",
|
||||
"phoned",
|
||||
"glorious",
|
||||
"amazing",
|
||||
"strange",
|
||||
"arcane"
|
||||
];
|
||||
const suffix = [
|
||||
"Anonymous",
|
||||
"Boy",
|
||||
"Lurker",
|
||||
"Keyhitter",
|
||||
"User",
|
||||
"Enjoyer",
|
||||
"Hunk",
|
||||
"Coolstar",
|
||||
"Wrestling",
|
||||
"TylerTheCreator",
|
||||
"Ad",
|
||||
"Gamer",
|
||||
"Games",
|
||||
"Programmer"
|
||||
];
|
||||
|
||||
Array.prototype.random = function () {
|
||||
return this[Math.floor(Math.random() * this.length)];
|
||||
};
|
||||
|
||||
function _generateName() {
|
||||
return `${prefix.random()}${suffix.random()}`;
|
||||
}
|
||||
|
||||
var token = JSON.parse(localStorage.getItem("token"));
|
||||
if (!token && location.pathname !== "/login" && location.pathname !== "/register") {
|
||||
fetch(`${window.GLOBAL_ENV.API_ENDPOINT}/auth/register`, {
|
||||
method: "POST",
|
||||
headers: { "content-type": "application/json" },
|
||||
body: JSON.stringify({ username: `${_generateName()}`, consent: true }) //${Date.now().toString().slice(-4)}
|
||||
})
|
||||
.then((x) => x.json())
|
||||
.then((x) => {
|
||||
localStorage.setItem("token", `"${x.token}"`);
|
||||
if (!window.localStorage) {
|
||||
// client already loaded -> need to reload to apply the newly registered user token
|
||||
location.reload();
|
||||
}
|
||||
});
|
||||
}
|
||||
1
api/assets/user.css
Normal file
1
api/assets/user.css
Normal file
@ -0,0 +1 @@
|
||||
/* Your custom CSS goes here, enjoy! */
|
||||
@ -4,6 +4,10 @@
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Discord Test Client</title>
|
||||
<link rel="stylesheet" href="/assets/fosscord.css" />
|
||||
<link id="logincss" rel="stylesheet" href="/assets/fosscord-login.css" />
|
||||
<link id="customcss" rel="stylesheet" href="/assets/user.css" />
|
||||
<!-- preload plugin marker -->
|
||||
</head>
|
||||
|
||||
<body>
|
||||
@ -38,12 +42,34 @@
|
||||
ALGOLIA_KEY: "aca0d7082e4e63af5ba5917d5e96bed0"
|
||||
};
|
||||
GLOBAL_ENV.MEDIA_PROXY_ENDPOINT = location.protocol + "//" + GLOBAL_ENV.CDN_HOST;
|
||||
const localStorage = window.localStorage;
|
||||
// TODO: remote auth
|
||||
// window.GLOBAL_ENV.REMOTE_AUTH_ENDPOINT = window.GLOBAL_ENV.GATEWAY_ENDPOINT.replace(/wss?:/, "");
|
||||
localStorage.setItem("gatewayURL", window.GLOBAL_ENV.GATEWAY_ENDPOINT);
|
||||
localStorage.setItem(
|
||||
"DeveloperOptionsStore",
|
||||
`{"trace":false,"canary":false,"logGatewayEvents":true,"logOverlayEvents":true,"logAnalyticsEvents":true,"sourceMapsEnabled":false,"axeEnabled":false}`
|
||||
);
|
||||
|
||||
setInterval(() => {
|
||||
var token = JSON.parse(localStorage.getItem("token"));
|
||||
if (token) {
|
||||
document.querySelector("#logincss").remove();
|
||||
}
|
||||
}, 1000);
|
||||
|
||||
const settings = JSON.parse(localStorage.getItem("UserSettingsStore"));
|
||||
if (settings && settings.locale.length <= 2) {
|
||||
// fix client locale wrong and client not loading at all
|
||||
settings.locale = "en-US";
|
||||
localStorage.setItem("UserSettingsStore", JSON.stringify(settings));
|
||||
}
|
||||
</script>
|
||||
<script src="/assets/autoRegister.js"></script>
|
||||
<script src="/assets/checkLocale.js"></script>
|
||||
<script src="/assets/479a2f1e7d625dc134b9.js"></script>
|
||||
<script src="/assets/a15fd133a1d2d77a2424.js"></script>
|
||||
<script src="/assets/97e6fa22aa08ee4daa5e.js"></script>
|
||||
<script src="/assets/9b2b7f0632acd0c5e781.js"></script>
|
||||
<!-- plugin marker -->
|
||||
</body>
|
||||
</html>
|
||||
|
||||
2
api/package-lock.json
generated
2
api/package-lock.json
generated
@ -84,6 +84,7 @@
|
||||
"pg": "^8.7.1",
|
||||
"proxy-agent": "^5.0.0",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"sqlite3": "^5.0.2",
|
||||
"typeorm": "^0.2.38",
|
||||
"typescript": "^4.4.2",
|
||||
"typescript-json-schema": "^0.50.1"
|
||||
@ -16162,6 +16163,7 @@
|
||||
"pg": "^8.7.1",
|
||||
"proxy-agent": "^5.0.0",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"sqlite3": "^5.0.2",
|
||||
"ts-node": "^10.2.1",
|
||||
"typeorm": "^0.2.38",
|
||||
"typescript": "^4.4.2",
|
||||
|
||||
1604
bundle/package-lock.json
generated
1604
bundle/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -65,7 +65,6 @@
|
||||
"assert": "^1.5.0",
|
||||
"async-exit-hook": "^2.0.1",
|
||||
"bcrypt": "^5.0.1",
|
||||
"better-sqlite3": "^7.4.3",
|
||||
"body-parser": "^1.19.0",
|
||||
"btoa": "^1.2.1",
|
||||
"cheerio": "^1.0.0-rc.10",
|
||||
|
||||
@ -18,48 +18,31 @@ if (argv.includes("clean")) {
|
||||
});
|
||||
}
|
||||
|
||||
fse.copySync(
|
||||
path.join(__dirname, "..", "..", "api", "assets"),
|
||||
path.join(__dirname, "..", "dist", "api", "assets")
|
||||
);
|
||||
fse.copySync(
|
||||
path.join(__dirname, "..", "..", "api", "client_test"),
|
||||
path.join(__dirname, "..", "dist", "api", "client_test")
|
||||
);
|
||||
fse.copySync(
|
||||
path.join(__dirname, "..", "..", "api", "locales"),
|
||||
path.join(__dirname, "..", "dist", "api", "locales")
|
||||
);
|
||||
fse.copySync(path.join(__dirname, "..", "..", "api", "assets"), path.join(__dirname, "..", "dist", "api", "assets"));
|
||||
fse.copySync(path.join(__dirname, "..", "..", "api", "client_test"), path.join(__dirname, "..", "dist", "api", "client_test"));
|
||||
fse.copySync(path.join(__dirname, "..", "..", "api", "locales"), path.join(__dirname, "..", "dist", "api", "locales"));
|
||||
dirs.forEach((a) => {
|
||||
fse.copySync("../" + a + "/src", "dist/" + a + "/src");
|
||||
if (verbose)
|
||||
console.log(
|
||||
`Copied ${"../" + a + "/dist"} -> ${"dist/" + a + "/src"}!`
|
||||
);
|
||||
if (verbose) console.log(`Copied ${"../" + a + "/dist"} -> ${"dist/" + a + "/src"}!`);
|
||||
});
|
||||
|
||||
console.log("[1/2] Copying src files done");
|
||||
console.log("[2/2] Compiling src files ...");
|
||||
console.log("Copying src files done");
|
||||
if (!argv.includes("copyonly")) {
|
||||
console.log("Compiling src files ...");
|
||||
|
||||
console.log(
|
||||
execSync(
|
||||
'node "' +
|
||||
path.join(
|
||||
__dirname,
|
||||
"..",
|
||||
"node_modules",
|
||||
"typescript",
|
||||
"lib",
|
||||
"tsc.js"
|
||||
) +
|
||||
'" -p "' +
|
||||
path.join(__dirname, "..") +
|
||||
'"',
|
||||
{
|
||||
cwd: path.join(__dirname, ".."),
|
||||
shell: true,
|
||||
env: process.env,
|
||||
encoding: "utf8",
|
||||
}
|
||||
)
|
||||
);
|
||||
console.log(
|
||||
execSync(
|
||||
'node "' +
|
||||
path.join(__dirname, "..", "node_modules", "typescript", "lib", "tsc.js") +
|
||||
'" -p "' +
|
||||
path.join(__dirname, "..") +
|
||||
'"',
|
||||
{
|
||||
cwd: path.join(__dirname, ".."),
|
||||
shell: true,
|
||||
env: process.env,
|
||||
encoding: "utf8"
|
||||
}
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user