diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 43f3b63b0..35c817d47 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -open_collective: fosscord +open_collective: spacebar diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 8ab6ab5a9..2af76d635 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,11 +1,11 @@ blank_issues_enabled: true contact_links: - - name: Fosscord Documentation - url: https://docs.fosscord.com/ - about: Need documentation and examples for the Fosscord? Head over to Fosscord's official documentation. + - name: Spacebar Documentation + url: https://docs.spacebar.chat/ + about: Need documentation and examples for the Spacebar? Head over to Spacebar's official documentation. - name: Discord's Developer Documentation url: https://discord.com/developers/docs/intro - about: Need help with the Discord resources? Head here instead of asking on Fosscord! - - name: Fosscord' Official Discord server + about: Need help with the Discord resources? Head here instead of asking on Spacebar! + - name: Spacebar' Official Discord server url: https://discord.com/invite/Ms5Ev7S6bF about: Need help with the server? Talk with us in our official server. diff --git a/assets/email_templates/new_login_location.html b/assets/email_templates/new_login_location.html index ff262e992..e4911c5ed 100644 --- a/assets/email_templates/new_login_location.html +++ b/assets/email_templates/new_login_location.html @@ -24,7 +24,7 @@
BrandingVerify Login
Branding Branding Branding Branding div.app-1q1i1E > div > a { /* replace me: original dimensions: 130x36 */ - background: url(https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Wordmark-Gradient.svg); + background: url(https://raw.githubusercontent.com/spacebarchat/spacebarchat/master/branding/svg/Spacebar__Logo-Blue.svg); width: 130px; height: 23px; background-size: contain; diff --git a/assets/public/fosscord.css b/assets/public/fosscord.css index 2ee7b7940..53ffd41b3 100644 --- a/assets/public/fosscord.css +++ b/assets/public/fosscord.css @@ -27,7 +27,7 @@ > foreignObject > div > div { - background-image: url(https://raw.githubusercontent.com/fosscord/fosscord/master/assets-rebrand/svg/Fosscord-Icon-Rounded-Subtract.svg); + background-image: url(https://raw.githubusercontent.com/spacebarchat/spacebarchat/master/branding/svg/Spacebar__Icon-Rounded-Subtract.svg); background-size: contain; border-radius: 50%; } diff --git a/assets/public/index.html b/assets/public/index.html index 2fa07ca9b..3723caba3 100644 --- a/assets/public/index.html +++ b/assets/public/index.html @@ -5,7 +5,7 @@ - Fosscord Server + Spacebar Server @@ -40,24 +40,25 @@ #wordmark { width: min(500px, 50%); + margin-bottom: 20px; } a, a:visited { - color: #FF6D2E; + color: #0185ff; }
- Fosscord Logo + src="https://raw.githubusercontent.com/spacebarchat/spacebarchat/master/branding/svg/Spacebar__Logo-Blue.svg" />

Welcome!

-

If you're viewing this page, that means you've successfully set up your very own Fosscord instance!

-

For information on how to configure your shiny new setup, you should visit our documentation

-

For information on how to connect and use your instance, click here

+

If you're viewing this page, that means you've successfully set up your very own Spacebar instance!

+

For information on how to configure your shiny new setup, you should visit our documentation

+

For information on how to connect and use your instance, click here

diff --git a/assets/webrtc.js b/assets/webrtc.js index 40cb237a6..b56e41c4f 100644 --- a/assets/webrtc.js +++ b/assets/webrtc.js @@ -3,7 +3,7 @@ If you want to use it, throw it into the `preload-plugins` folder. TODO: Make it so this file is not required for webrtc. - Do note that webrtc, as of 17/12/2022, is not implemented yet in fosscord/fosscord-server. + Do note that webrtc, as of 17/12/2022, is not implemented yet in spacebarchat/server. */ (this.webpackChunkdiscord_app = this.webpackChunkdiscord_app || []).push([ diff --git a/nginx.conf b/nginx.conf index 141cf5cac..2a1fd4120 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,8 +1,8 @@ -# This is an example nginx config for Fosscord. +# This is an example nginx config for Spacebar. server { # Change server_name - server_name fosscord.example.com; + server_name spacebar.example.com; listen 80; location / { diff --git a/package-lock.json b/package-lock.json index 8927001f2..8f9d26f61 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/package.json b/package.json index 99a0f2d3a..3780b2bbf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "fosscord-server", + "name": "spacebar-server", "version": "1.0.0", - "description": "A Fosscord server written in Node.js", + "description": "A Spacebar server written in Node.js", "scripts": { "prepare": "husky install", "postinstall": "npx patch-package", @@ -26,17 +26,17 @@ "types": "src/bundle/index.ts", "repository": { "type": "git", - "url": "git+https://github.com/fosscord/fosscord-server.git" + "url": "git+https://github.com/spacebarchat/server.git" }, - "author": "Fosscord", + "author": "Spacebar", "license": "AGPL-3.0-only", "bugs": { - "url": "https://github.com/fosscord/fosscord-server/issues" + "url": "https://github.com/spacebarchat/server/issues" }, "imports": { "#*": "./dist/*/index.js" }, - "homepage": "https://fosscord.com", + "homepage": "https://spacebar.chat", "devDependencies": { "@types/amqplib": "^0.8.2", "@types/bcrypt": "^5.0.0", @@ -108,10 +108,10 @@ "ws": "^8.9.0" }, "_moduleAliases": { - "@fosscord/api": "dist/api", - "@fosscord/cdn": "dist/cdn", - "@fosscord/gateway": "dist/gateway", - "@fosscord/util": "dist/util" + "@spacebar/api": "dist/api", + "@spacebar/cdn": "dist/cdn", + "@spacebar/gateway": "dist/gateway", + "@spacebar/util": "dist/util" }, "optionalDependencies": { "erlpack": "^0.1.4", diff --git a/scripts/changelog.js b/scripts/changelog.js index 221864b48..f6329a46a 100644 --- a/scripts/changelog.js +++ b/scripts/changelog.js @@ -23,9 +23,11 @@ To find which file the changelog is stored in your client, simply grep for the changelog text given by the client, and update the `CHANGELOG_SCRIPT` variable to use that instead. - This grabs the new changelog from `fosscord-server/assets/changelog.txt` + This grabs the new changelog from `spacebarchat/server/assets/changelog.txt` */ +/* eslint-env node */ + const fetch = require("node-fetch"); const fs = require("fs/promises"); const path = require("path"); diff --git a/scripts/license.js b/scripts/license.js index 31321cd14..d36165bb5 100644 --- a/scripts/license.js +++ b/scripts/license.js @@ -5,13 +5,15 @@ Does not prepend is file contains @fc-license-skip */ +/* eslint-env node */ + const Path = require("path"); const fs = require("fs"); const walk = require("./util/walk"); -const FOSSCORD_SOURCE_DIR = Path.join(__dirname, "..", "src"); -const FOSSCORD_SCRIPTS_DIR = Path.join(__dirname); -const FOSSCORD_LICENSE_PREAMBLE = fs +const SPACEBAR_SOURCE_DIR = Path.join(__dirname, "..", "src"); +const SPACEBAR_SCRIPTS_DIR = Path.join(__dirname); +const SPACEBAR_LICENSE_PREAMBLE = fs .readFileSync(Path.join(__dirname, "util", "licensePreamble.txt")) .toString() .split("\r") // remove windows bs @@ -37,7 +39,7 @@ const addToDir = (dir) => { const preamble = commentStrings[0] + "\n" + - FOSSCORD_LICENSE_PREAMBLE + + SPACEBAR_LICENSE_PREAMBLE + "\n" + commentStrings[1]; @@ -56,5 +58,5 @@ const addToDir = (dir) => { } }; -addToDir(FOSSCORD_SOURCE_DIR); -addToDir(FOSSCORD_SCRIPTS_DIR); +addToDir(SPACEBAR_SOURCE_DIR); +addToDir(SPACEBAR_SCRIPTS_DIR); diff --git a/scripts/rights.js b/scripts/rights.js index bf79ef79b..148570eb0 100644 --- a/scripts/rights.js +++ b/scripts/rights.js @@ -20,6 +20,8 @@ Calculates a discord.com-like rights value. */ +/* eslint-env node */ + require("module-alias/register"); const { Rights } = require(".."); diff --git a/scripts/schema.js b/scripts/schema.js index 12e3cdb5e..2a19ea26a 100644 --- a/scripts/schema.js +++ b/scripts/schema.js @@ -17,7 +17,7 @@ */ /* - Regenerates the `fosscord-server/assets/schemas.json` file, used for API/Gateway input validation. + Regenerates the `spacebarchat/server/assets/schemas.json` file, used for API/Gateway input validation. */ /* eslint-env node */ diff --git a/scripts/stresstest/accounts.json.example b/scripts/stresstest/accounts.json.example index 61904c5e6..ec1b2a0d7 100644 --- a/scripts/stresstest/accounts.json.example +++ b/scripts/stresstest/accounts.json.example @@ -1 +1 @@ -[{"email":"org11ncxa8.wi732t9b4o@fosscord.com","password":"x.ibahfyqwle.ne4hajbzp11.gpc4lcup4"},{"email":"rek6kyprik.i5hldol255@fosscord.com","password":"1.o3w16haor2y.0e1ey2yk1x.1r0gn5o5h"},{"email":"07o37povsi.uk5q9dtxbp@fosscord.com","password":"8.6z64gcjavp1n.uar3qqymwfi.g0sfmmbd9m"},{"email":"94di5zaie4.n1vhzdfsj@fosscord.com","password":"1e.k3ijylxme1u.e9xr9yqbrk.3tir7qnvh"},{"email":"zbrqft4chj.yl73e5puq3@fosscord.com","password":"5.nkc3g8cvwl15.dmp8ywmkka.m79e9t4wij"},{"email":"br1wknv7k.6hw6yl69e@fosscord.com","password":"3.gimzx06u7mh.6rjrdflo9j1t.h3d8k2f5t"},{"email":"cdehs12h6h.iexxvg16xf@fosscord.com","password":"1i.5ab7e9rtwl1n.31qtfv7cz9.e1k313py9"},{"email":"pazx37jpra.mgsb8k50ip@fosscord.com","password":"d.eg5dwqvd981e.5qobehiyffe.6k5pb4fqm"},{"email":"vs6k62ak2o.xo1v4w0rj@fosscord.com","password":"c.hrkcrnlxlg1d.w18ztd39d1p.eycgehb49"},{"email":"u5d27rbewm.3p0wa7s899@fosscord.com","password":"s.1r7o1ur8o9k.puzbm1uuta9.an5m8bhh0a"},{"email":"vyp6x66fr.yv74eftomo@fosscord.com","password":"m.w0c7h21asf.pq2lj3uot6a.xnhv9ftqii"},{"email":"da0k6sra2n.qts4gs9ufg@fosscord.com","password":"h.8e42ud5f6r5.896sp1t8y6e.shwe0d8no9"},{"email":"l093koc05n.81vt1v8tsx@fosscord.com","password":"11.zhkv1jbhdf.0ub2po3mnu.no4lq8l4"},{"email":"115tfo7ct.muvy04u0tf@fosscord.com","password":"1c.4bpk2a17z1p.gw2h6qmvhez.57drs0quz"},{"email":"dq6bk1hjch.huw092gkhr@fosscord.com","password":"1l.kp28mclrtee.5i4dmacbpc1j.hcqgemsni"},{"email":"8g8q9v3wmk.l2frwpuds8@fosscord.com","password":"1n.i0wwg0njmv.teaiqjqalt1g.ib6551nh4"},{"email":"5b3y3neqxa.mmi0ex2hxd@fosscord.com","password":"8.tvz7q9uw0hm.6ufz6fu65c1a.88vp9di6e"},{"email":"mg28g3krsp.35h1akxrqj@fosscord.com","password":"s.y8j2n19iffr.qyecyrgo6ig.6hgrc5vy9"},{"email":"ehtumcok2j.2oozlhiq97@fosscord.com","password":"11.uq0up8g8h1q.ofvjsx29yd.pfwen3kr38"},{"email":"le98rah1uc.au4ug9tpnt@fosscord.com","password":"t.q15zsc0q2mt.2nj3jsdxhfc.leb9ba1xku"},{"email":"hrroex9f5n.6cl98h3jsi@fosscord.com","password":"17.qnqqhg2us4.kh92v74atg19.49ufgil7g"},{"email":"w95wrrn48.6gfnue7dcq@fosscord.com","password":"b.jnqgbi89oj1k.8rn0llovbll.kcblui80th"},{"email":"rqo4n0il5w.4gl1u8hlyc@fosscord.com","password":"17.41d1lpjmi0.d8ijhslby11w.sjn7sqhi9"},{"email":"6dv3yp4kon.pk7ye6q1r6@fosscord.com","password":"0.j70py6yysjz.sf56ebpp2gp.z68yo9hiim"},{"email":"knmi9qkige.5v1bg6h09w@fosscord.com","password":"1d.7n58xntwg1s.umnglex7h13.c5xrsfkosm"},{"email":"cefymgc7te.dd81jabws4@fosscord.com","password":"1u.73ea7dde1o.0i1fhyaird.sjk30nky1e"},{"email":"33xcwiqf73.r6khs46a7j@fosscord.com","password":"b.5p5gdmh1891f.11g4590n5a.vfoek6qjb9"},{"email":"9zcgmr84s6.utnlygoubi@fosscord.com","password":"8.g4v53t7kcl16.wgaiufzgg1u.pusdfdneb"},{"email":"26vpzekrdw.3bwq27wla@fosscord.com","password":"11.yxey8293lj1d.nxhkju2eke.hl86mcvswd"},{"email":"vvq6w36r84.lr1auhpfc@fosscord.com","password":"y.7vlqbpftom.6xfrtozd11k.ycf9ifi7o"},{"email":"6ejeiq64yo.zorve5saw4@fosscord.com","password":"o.eue50qp1frq.qi0rwphg3dv.psph7va2fb"},{"email":"6s0hu88ro8.hsckrmud1i@fosscord.com","password":"16.fc836nhb91a.ul37503ppg.l62wgser4i"},{"email":"h8qwchz2x9.5br1kcw1iv@fosscord.com","password":"l.iw1041wgy.6azyc9h6vb.br9cr0dmn8"},{"email":"yx13rst2hu.ybisfdwgv@fosscord.com","password":"8.5yasf5ba619.ir0toxu251p.tbgwjd18f"},{"email":"1j7vrr1trh.wqj0ozl357@fosscord.com","password":"1m.iucscoe7b0.6ca1jfaag361.c2trc36mnvk"},{"email":"9w2w572pzr.fv1rk360pp@fosscord.com","password":"t.labzw6qw8t3.33k42uvhgd1s.e1gj71h14"},{"email":"yf5e43ol4.6509owbcxa@fosscord.com","password":"12.jewy0uvx1m1m.ce28kht6dk.v2p0bzlvz"},{"email":"gzny2o1re.1xrl0ua7yd@fosscord.com","password":"h.3valf7r8jh.6bzfr4ions.r4b2mt0l0g"},{"email":"bc77a5kw9v.hu5barps6q@fosscord.com","password":"1a.jt11azsa81j.4v70jvm9d1o.hflrb1tigk"},{"email":"ltoezpefev.hrvnxmq9ee@fosscord.com","password":"b.v4f5lqrlc912.dx4dd4xq91v.zj345to03"},{"email":"svcpsuoenk.b8mfqxpbzg@fosscord.com","password":"1a.7aobev8b4r.xqqfybkcs1t.cjuswku0a"},{"email":"n0mroewqq.svq5iq57pe@fosscord.com","password":"1l.zxm1xhlavp.65rp7bz57x.01vjajdsc"},{"email":"trly6yupd.dt37kh07dn@fosscord.com","password":"1i.o2ieg72fz1j.er031tzerx.2ngg4dcvlh"},{"email":"ickkf14cqv.9pu2pnmx7n@fosscord.com","password":"18.pyhd9ruatl1k.erfchcjc95.wfd67r5e8x"},{"email":"5o4ornfwy9.yabymb8e2k@fosscord.com","password":"1g.117kmei8df10.cedozr4vee.08te5d44nb"},{"email":"p0ulegfi3.dgmar6qc2v@fosscord.com","password":"1h.tle7s3ed82.un20o5nv3dk.wnz4w802h8"},{"email":"58gejpvr6v.jolxrsl83p@fosscord.com","password":"e.ksw14117hbo.f0pgufr3na.ssrjys23al"},{"email":"vf349zeoja.r8bjel59kd@fosscord.com","password":"1o.79kh6e6glm9.d76d86g1jp16.u37p4jhf7"},{"email":"uc786nn0go.n9ygun6owj@fosscord.com","password":"m.xo4bwhct5be.lpokbj59w8p.z4l52dzv1r"},{"email":"5jgx24s87u.odlx0bfo0r@fosscord.com","password":"1k.ni9jyfol7h1g.vczzsa8dbg.r4bhoh5op"},{"email":"2v44408x8l.unfspunnnm@fosscord.com","password":"16.63njhji5b4.r4xkcf672f1a.x389dr603g"},{"email":"ityj8kcvrm.9djzannsll@fosscord.com","password":"1p.6jdbhaxiqc.nfnpw7e09g8.967dtt2dy3"},{"email":"8csbvl9qot.28etdf4pf@fosscord.com","password":"1b.52rdo5qmj3.ta9jw1wm3k9.m96fe27tp"},{"email":"dqndi38hsq.yv77wk3mov@fosscord.com","password":"k.zpjwpwxmlr1f.tbj03rxayn17.9x451qclu"},{"email":"ohwmvag9j.w6t8ngs4t@fosscord.com","password":"b.h1ta0mly991q.wzu1ssffyk1h.kc10wt8i2"},{"email":"2mmors2h0w.jwukibc7oi@fosscord.com","password":"y.xo4kgepqa1t.b77zwt1in5.3um79fx22r"},{"email":"ux0q6gvwnr.gnywxxrsn@fosscord.com","password":"g.52userbsonu.ny8omqaduf.rvhtwq4jer"},{"email":"0q12b4zet.y87zc04r8r@fosscord.com","password":"1t.79mg1a9q85.k66wagu67j14.ad0gw3caw"},{"email":"gatbconrvq.dsopxa8fkk@fosscord.com","password":"1n.fycl7y9roh1p.4yg37pst4k16.votnvabrf"},{"email":"mmp9g1b1v.xz1w4qzxee@fosscord.com","password":"1k.cjmz3huosl.jh502yz5jf1e.hyce7qc67"},{"email":"5s90s1hbns.b027pfiv3s@fosscord.com","password":"1l.86ipkmi6fg.scabtvproj4.yw4nb9qui9"},{"email":"l4zrvtrbpb.1r627sllk@fosscord.com","password":"1l.zzm1dunzzek.10sr7mp01ly.yyrjj1hsli"},{"email":"xih9rwk90i.rmdifv40g@fosscord.com","password":"15.db9k0pxci1v.hs6l033urm.5a1zv42fhl"},{"email":"55mq93jdq.2dhr1ps4f5@fosscord.com","password":"i.v5hpg2qez1u.xhs32cwes1h.n10pexmfff"},{"email":"5c0vb38rul.5su27w4pn8@fosscord.com","password":"12.y87q6jxq41m.qgiji2j0hm.gmy2wuavc"},{"email":"qjk2eoqeqq.ljq4dig10o@fosscord.com","password":"0.lpu8eio3hra12.mq8qcehpe1e.77p7zilh4"},{"email":"b45ltbf5d.o4oouuik1e@fosscord.com","password":"1u.wb7hn2b1x1k.jys5p3ri4j.9ew9jab3ll"},{"email":"1mw205tjri.gpi2h76eps@fosscord.com","password":"1g.kyh53pnamd13.5yufexmyv1h.r56pmhm7i"},{"email":"8y0psdjq2s.ifqyimhnkj@fosscord.com","password":"1d.fi03hlwk41u.b89w0vrd712.ljudzvdo6"},{"email":"ls73glp0q9.3rtqyb262@fosscord.com","password":"1.z70c4ef5hfi.fes9zmue2it.5cobkz3ah"},{"email":"ipe2um46bi.in93oau1l@fosscord.com","password":"5.a5he7keuru1n.l05ivx4n24.piohqdy51w"},{"email":"mt16ta8diq.krypy2t9cv@fosscord.com","password":"n.zk4goctn5p3.r1fhllqy1m1p.ni2q3y68w"},{"email":"qehwflm0ja.x5uvmxgfle@fosscord.com","password":"1e.r2sj0uimq1f.nmtozr8qd1s.xgvz4d62b"},{"email":"0ppn1iwd6.ivrqbvn17i@fosscord.com","password":"1n.fr6x1pbzjl.c8xwipgo6c.m1me2h2g58"},{"email":"xiiq47ofev.u9z0gndxs6@fosscord.com","password":"1t.7tfe0181ij.jbznx5eebs.ytm50kp5qf"},{"email":"kqhk3lt2mo.o4y7u23zbu@fosscord.com","password":"1b.bkoqmxjcf1l.c5q9oneuz1u.00x93z7l4"},{"email":"ri64c5o5zn.o429slph64@fosscord.com","password":"1r.mre2hu1gpu.401xyxa6eu.j98cetaplg"},{"email":"j5jpukoktw.q5bseyjfu@fosscord.com","password":"h.k1ar11fpx1m.n50t8tz4k4.9oj17rtdjw"},{"email":"cg8gyuhu16.jezv2bo8n@fosscord.com","password":"1c.vyfo117pd1b.hxlc7e9zve.j6ej7ho2rk"},{"email":"7ngysyss7w.yjy0whd5fh@fosscord.com","password":"12.pl4jjp66wi1r.xx7s13gsgy.v2slv2vyx"},{"email":"7uhylwdaiq.w557htx0x@fosscord.com","password":"1j.icm6w8m4mh.4qyoql77m8.ar8kliax0s"},{"email":"y6yn1ckm1e.7xxizerecm@fosscord.com","password":"1e.om7n18zisn1w.usblhxf4p1m.r9ke41xox"},{"email":"uwdsktqhuw.4vmh5gmg7d@fosscord.com","password":"6.cdte4bk24b16.cf1sbtxlx1o.n62w4weh9"},{"email":"8v1nt755y.w0y1jgfcgm@fosscord.com","password":"f.ozxpvznxj41o.bs5s5dhua1l.ffayy0gsy"},{"email":"rmy9b61cij.qir0bjorcm@fosscord.com","password":"1h.bxjxpx0u6f13.e97yh8g761c.j8zog74iql"},{"email":"93ir0yiyi9.1f7bfzt3fb@fosscord.com","password":"18.vky28kwlw14.w1wsoyu6c15.yhxbr725xe"},{"email":"g0kqw9plr.v2zcovhyg6@fosscord.com","password":"1r.3txq1jt4zl1d.ha0ejtekjh.xhjl9e6vqg"},{"email":"xmk2q5zxa.v1ka9gm3a8@fosscord.com","password":"1l.ryvykh3ihm16.rxea04ifq0.h14sz83yisv"},{"email":"mqt2bmltj9.53o16bc6xn@fosscord.com","password":"i.vt66ajtme1f.lllyzaprk16.yb0yh0o1z"},{"email":"4kvjyddsv.7u7lmex2df@fosscord.com","password":"1i.axaegtd0qz.2yvfr5n261g.8s8fprsd8"},{"email":"yigntcopcc.8bchnlmclm@fosscord.com","password":"n.b5yn5xried1d.siep9e4fb1t.h6s6erw5t"},{"email":"meubr1b03t.t97015wih6@fosscord.com","password":"5.wu3izi2gyqi.iurx5qpp7l.znq1htzuel"},{"email":"xz3gta0hi.1x5o83xyee@fosscord.com","password":"14.uafjiryde3.oin9k24w3510.vkjmjleb4i"},{"email":"9jkrkk9r6o.6ossrgj919@fosscord.com","password":"v.u9531wtw2o11.151eg145bf.bk57nd0s6u"},{"email":"kf9fdmnacv.67shfcubvn@fosscord.com","password":"1i.7f1olv2hkt.v2cso7zxlfw.8ylhl33g1"},{"email":"k8zuiett0r.0w299k0t9j@fosscord.com","password":"t.1mrpwsil15.999lbrfvz1h.7od0kjlxo"},{"email":"8m9rt3vgg.vkpf6apx9@fosscord.com","password":"1n.2ohz11tk412.5ezp8ujcwn8.rvqqrozh9s"},{"email":"rfavhpnhc.6xwy7o3ulm@fosscord.com","password":"11.ikd54271zj.vq3brjark7.h1ryvz7ap8"},{"email":"6zmju5azrd.4bes4a3cq@fosscord.com","password":"5.litb6taajto.ownyp3uhjkh.f543o47uc9"},{"email":"ml5pst7t3g.kbvn8b1vg@fosscord.com","password":"1q.co2aumj6fw.fa18frro5e.vnpotfg209"},{"email":"kaa1r6srjs.wjriguic5e@fosscord.com","password":"y.y635jqxai9.s4hcd1weni5.51i7z3c26r"},{"email":"n09uhfkuc5.9aqau9qyk@fosscord.com","password":"1f.wtjqoqzdwg6.mfvvtcwtx91t.8ujt3pwx4"},{"email":"6y5y3px9oa.4183pg5aq6@fosscord.com","password":"11.8a00uh75g1i.d462wzpqv1t.dnd8sdvr"},{"email":"aqdzadem03.f8uv1m4zv4@fosscord.com","password":"4.4ndx89thn53.afcjfzjqe51o.ivaemdp5hf"},{"email":"oqv3944yav.31ccatif3r@fosscord.com","password":"1w.9cstqu9o21f.p40uqca3vl19.iqnn79lqde"},{"email":"akzyzmigv.9c6w5aj4o@fosscord.com","password":"m.m382wa8nznr.szvso4c03ke.ttw2jhnwh8"},{"email":"13dqfm57jo.e05e711ggt@fosscord.com","password":"1b.t1b51jt7lf.rhi4j32rw91u.0foqthilf"},{"email":"3derfs5v66.s2kbedbm3o@fosscord.com","password":"t.e153si8xso1m.9rv9il857fd.e3i0di3ope"},{"email":"92k9vmws7.dt9mvv6ijh@fosscord.com","password":"1r.r8oy0su9c1e.irtwz9gdna.3fddwt8k4n"},{"email":"w1huzvblr.q9qp44japt@fosscord.com","password":"1v.dfdr92srfs.3x2wd25frh15.z73xb3vol"},{"email":"vne3an2fif.32eq9woyl@fosscord.com","password":"7.lurd6n689ek.sf3gedrf711.5xclyfsn3"},{"email":"298zj4dvxf.5sfh7f2e2m@fosscord.com","password":"n.1rbv0z54wr1n.nt2041ujks.0gwbe80zyl"},{"email":"ywp1ssr2zh.gl97epixxu@fosscord.com","password":"1w.gfpvze8vq1p.is7b2795819.4hilzah3"},{"email":"kqzujy4m5j.ocydwl4yyh@fosscord.com","password":"1c.sqxzxuareez.fgczf2qh3en.yi5vo23phn"},{"email":"ck8n5p7d6d.2vu4cdm6iw@fosscord.com","password":"1o.g3lq6grnm1t.otf44zgiw1c.jfdgqubfjl"},{"email":"s3vqe9bzj.muec34461t@fosscord.com","password":"1u.i4u3eidof19.tl8hf5fpdv.mvbij0fdgc"},{"email":"7hedrsktw.oqe4hym4us@fosscord.com","password":"1j.orlptqc2h.hs6661zehh1r.ngepsoldvf"},{"email":"44tm2rsu6j.oxrw5ib1np@fosscord.com","password":"1o.n71dxtllrf9.htwjv6fsi81l.5w9pyr8eee"},{"email":"o28saa2e4t.m49530ir45@fosscord.com","password":"16.z31xrcp6li12.uaklzxvskl.nqyq23zqb"},{"email":"aaz3kkwx2q.u42rdyacy6@fosscord.com","password":"1k.aohk44bxqkq.6lec7k6yfa14.geiq4ok3b"},{"email":"ntw1oc87mh.js3q1iqxrh@fosscord.com","password":"15.li45vduoy15.h90fv4ytl1t.3v78qdvcq"},{"email":"cpkgoh313.lkdhhl039a@fosscord.com","password":"3.fdw00uv0dn1v.qz6frlgeh0.3g0c7xnn9le"},{"email":"wznnajnyww.3f5s5cf0lt@fosscord.com","password":"4.3d2ro1uvag2.9yum8m4gd5t.yd1zriwovn"},{"email":"odwdxlk49g.m113aywba@fosscord.com","password":"y.24hnap1ckh.n0q1dtobf717.0tzaopasse"},{"email":"0xt66uuwbs.24qfa4w82q@fosscord.com","password":"e.3cfcd0usw57.oydvjpl5wm1b.sxnf38ihh"},{"email":"4pxgasro0t.xifcrlp26f@fosscord.com","password":"1d.oxpqgh8jbgb.6epjawtwga1u.o5d33jm"},{"email":"l202g9q8xo.t4ck4xu44v@fosscord.com","password":"d.gyul2yhu7h1g.163rzn4kqik.e5qlstdwp"},{"email":"8mwzma33ko.b9on13ypjl@fosscord.com","password":"b.0sdy90whqr1o.rruwt57r8l14.hjejwclmr"},{"email":"h8dm19fu77.hzpnw8famh@fosscord.com","password":"s.q49kg1uq8gc.046rudurb1o.2lqegjfds"},{"email":"exkp3ve6z7.mdydbk9jy@fosscord.com","password":"16.bq8o0d13sd8.tri7wtdjpro.2ebtbyqgtt"},{"email":"n8fe02yphv.huwi91ywha@fosscord.com","password":"1d.8qp5wkq541k.ulwk4bzjsm19.q3qbxorto"},{"email":"lsslgvrdyb.u86qng3p7o@fosscord.com","password":"11.9q1m8gwavd.9z3kflcg5k1e.lrux8aqm8"},{"email":"0jur86ya2p.gb26btuz7@fosscord.com","password":"n.fflp1f1yksg.10rh6etc61.yld8y7u9hi"},{"email":"raseda2c45.vl9resp89r@fosscord.com","password":"b.6gd8az3ljg.es1yjenqskk.i4i8m466p"},{"email":"jmam7ha069.b96jzg1bkl@fosscord.com","password":"1f.2z41vc92bo.84f3d3j3gra.5yev9enzv"},{"email":"pp2rki7hjd.a037bg6u6@fosscord.com","password":"3.nktq53a97c19.khsapwl0wd.ej16kksime"},{"email":"c35l8m3ikr.e7vx8nmbil@fosscord.com","password":"2.oryjofui8mu.7jes36sirs1u.oclq1geaf"},{"email":"ufhsl7tn5u.j4ey0abswv@fosscord.com","password":"14.uctn73o6h1n.t75arwloxgf.nvgdr4l41o"},{"email":"8ru4fr2ed.kf8ffg9ko8@fosscord.com","password":"n.hqxwr2ypwd1l.vu23byfp3c.nzgszptoqk"},{"email":"6gmjeij67o.ep5256bmf@fosscord.com","password":"1i.237gs5pk5j1w.yvuhvp9ho15.l4qibsw5i"},{"email":"4wrhgqel0w.e0sz7l0zki@fosscord.com","password":"w.g09qtor0p1g.a5uzjl6u3g17.v3z6rhb9h"},{"email":"3860ixs8g.6pha1slnur@fosscord.com","password":"m.o7o62cqw3g.wkkaak7zz8.h82m4nenbf"},{"email":"wnnpg8stto.zwsxqfp38i@fosscord.com","password":"c.k2b6jn1b3r14.ojpvlbxil1r.rpkncuyqp"},{"email":"t04ss33dlw.98dpq7j8rg@fosscord.com","password":"5.7zgfmumai7.iphztcsjfw1h.sq2kp3j9j"},{"email":"hy53et7kw6.vsku4tebj9@fosscord.com","password":"3.ayjddj0roe1m.ngz1qajzlgu.xue35w1d1d"},{"email":"252ueajele.j4euv8la1d@fosscord.com","password":"h.tw1utyw7mh9.ydii1rkvp4.8xafwfxrqd"},{"email":"ye2mi1d86.uqa7ig7qxb@fosscord.com","password":"j.pn3eoar1ft1e.k8febwch91o.fzau5lnbx"},{"email":"4cq5y22mm8.q33hk612wu@fosscord.com","password":"1l.7tx03ihc9e1a.3i2l76ur5.28yffumat8"},{"email":"d9op87vvj7.vbu23p4mnq@fosscord.com","password":"10.z7pgyokesip.0i0axexmwpa.0p5xrlag9k"},{"email":"tnhgsqizxh.14ulf4jinl@fosscord.com","password":"j.8p0jucy5xk10.creosnkf2o.vzznt05x"},{"email":"8h2h3w3ex5.8ogl7f027n@fosscord.com","password":"1b.08wkhdm03g3.8hdklh1zj41t.fq57w9raf"},{"email":"ommn4ocwtn.1fkdjbz2v8@fosscord.com","password":"1e.i8k15b9uk1p.70n34lxbzf.4inv63cwt8"},{"email":"fnxg92zeqn.ljg5uumt3e@fosscord.com","password":"w.ltho2dsgveu.d1ome2w0x8j.7wr2hq1wk8"},{"email":"lzi8aurosp.mck9i974of@fosscord.com","password":"u.zezf4qdz2p0.l2g634tak98.ql0n1tg6sq"},{"email":"fdhv4fccm5.o9x209i94g@fosscord.com","password":"5.2o84u6v43619.4c0c71a9gk7.n9cmjegefv"},{"email":"tuedrm1ajt.bxjgzsyj4s@fosscord.com","password":"1m.ng2h807gvu.rhd056e6bbb.lkvewwp2tg"},{"email":"488bryb32a.x928qzsf8g@fosscord.com","password":"y.n2c3x3irffa.fz9xwiimno8.nnpvm280oc"},{"email":"n928oorjaa.kj35rf9p35@fosscord.com","password":"1l.flvmvopcj16.pmx6n9hi7hi.v9odjzq3at"},{"email":"emzd8qz0f8.b972dvhf0m@fosscord.com","password":"3.7umgbd5apm18.0n6yi8ol9g.m4607npuc"},{"email":"g7jzdulwv5.0a2wzws2ua@fosscord.com","password":"10.1u1sac19wkf.lvi2qwfhtq16.8wbdddpms"},{"email":"giuivahumo.7iqapfnbfr@fosscord.com","password":"q.pzck5qtbype.llhl9ypv6b1e.3dz8gsv0pg"},{"email":"0t84mm2pj9.kycgvqkuag@fosscord.com","password":"1t.kpvjmvipo14.kwv0np3ordv.ustw31ifu"},{"email":"vx5t6yurg7.pocn2c069m@fosscord.com","password":"f.gdwgrk0wia1u.7m1ozam0b0.d5y62kwyih5"},{"email":"p7arvq1hha.7wryrvhvl@fosscord.com","password":"1v.eb62r3rx71h.d3fhbfdxa1l.4gzcu184s"},{"email":"adp64dkhdd.q2nc2qvy3@fosscord.com","password":"q.96rt5rc517h.3f0foodom4.h1wee4z428"},{"email":"pfhrq2kv8.92dq9bxy8a@fosscord.com","password":"1g.nfaha2xx7hi.vtng22emxs1l.fpbra2wo6h"},{"email":"jjnysdssoc.eqr6v2pqeo@fosscord.com","password":"1.112arb9m3cb.w3yfq6ekz1d.keb15ptd5"},{"email":"m5rab6dhrc.p1tnxv9feg@fosscord.com","password":"1.3guc8m7j0uj4.xphgg3121714.7ii7ah6g7f"},{"email":"zgq1iount.blsiqtyvc6@fosscord.com","password":"16.dzt6188au1w.ilwc3p3ds17.7j7lcsqur"},{"email":"ix7nx1ce4a.3wj4gs8b7p@fosscord.com","password":"13.p2v1p2nwa1t.2yarcqsmzk.ay7w9u0p1r"},{"email":"5jh7wm63ug.feyytgy11g@fosscord.com","password":"10.otpp2mz0smb.uv94hcp26c8.a3nlz16n14"},{"email":"9cd7yy1ps4.jet2fn1fdb@fosscord.com","password":"9.bjtfocm7zk12.sushyeb1yg.lhtmj6a70t"},{"email":"20u20f6dlk.l8n5tvh2re@fosscord.com","password":"19.qfrr25rarj.4tzf063a9n4.3i5s3vm30b"},{"email":"b1hnmmwcb.q21mrflg1h@fosscord.com","password":"3.ysh10ultyjz.nz8azt84216.lxn1kgvly"},{"email":"j7nhj8s2d.aqaeidbi8m@fosscord.com","password":"g.nlnw7ejuqbz.41exhwj2wiv.1yr0njmd"}] \ No newline at end of file +[{"email":"org11ncxa8.wi732t9b4o@spacebar.chat","password":"x.ibahfyqwle.ne4hajbzp11.gpc4lcup4"},{"email":"rek6kyprik.i5hldol255@spacebar.chat","password":"1.o3w16haor2y.0e1ey2yk1x.1r0gn5o5h"},{"email":"07o37povsi.uk5q9dtxbp@spacebar.chat","password":"8.6z64gcjavp1n.uar3qqymwfi.g0sfmmbd9m"},{"email":"94di5zaie4.n1vhzdfsj@spacebar.chat","password":"1e.k3ijylxme1u.e9xr9yqbrk.3tir7qnvh"},{"email":"zbrqft4chj.yl73e5puq3@spacebar.chat","password":"5.nkc3g8cvwl15.dmp8ywmkka.m79e9t4wij"},{"email":"br1wknv7k.6hw6yl69e@spacebar.chat","password":"3.gimzx06u7mh.6rjrdflo9j1t.h3d8k2f5t"},{"email":"cdehs12h6h.iexxvg16xf@spacebar.chat","password":"1i.5ab7e9rtwl1n.31qtfv7cz9.e1k313py9"},{"email":"pazx37jpra.mgsb8k50ip@spacebar.chat","password":"d.eg5dwqvd981e.5qobehiyffe.6k5pb4fqm"},{"email":"vs6k62ak2o.xo1v4w0rj@spacebar.chat","password":"c.hrkcrnlxlg1d.w18ztd39d1p.eycgehb49"},{"email":"u5d27rbewm.3p0wa7s899@spacebar.chat","password":"s.1r7o1ur8o9k.puzbm1uuta9.an5m8bhh0a"},{"email":"vyp6x66fr.yv74eftomo@spacebar.chat","password":"m.w0c7h21asf.pq2lj3uot6a.xnhv9ftqii"},{"email":"da0k6sra2n.qts4gs9ufg@spacebar.chat","password":"h.8e42ud5f6r5.896sp1t8y6e.shwe0d8no9"},{"email":"l093koc05n.81vt1v8tsx@spacebar.chat","password":"11.zhkv1jbhdf.0ub2po3mnu.no4lq8l4"},{"email":"115tfo7ct.muvy04u0tf@spacebar.chat","password":"1c.4bpk2a17z1p.gw2h6qmvhez.57drs0quz"},{"email":"dq6bk1hjch.huw092gkhr@spacebar.chat","password":"1l.kp28mclrtee.5i4dmacbpc1j.hcqgemsni"},{"email":"8g8q9v3wmk.l2frwpuds8@spacebar.chat","password":"1n.i0wwg0njmv.teaiqjqalt1g.ib6551nh4"},{"email":"5b3y3neqxa.mmi0ex2hxd@spacebar.chat","password":"8.tvz7q9uw0hm.6ufz6fu65c1a.88vp9di6e"},{"email":"mg28g3krsp.35h1akxrqj@spacebar.chat","password":"s.y8j2n19iffr.qyecyrgo6ig.6hgrc5vy9"},{"email":"ehtumcok2j.2oozlhiq97@spacebar.chat","password":"11.uq0up8g8h1q.ofvjsx29yd.pfwen3kr38"},{"email":"le98rah1uc.au4ug9tpnt@spacebar.chat","password":"t.q15zsc0q2mt.2nj3jsdxhfc.leb9ba1xku"},{"email":"hrroex9f5n.6cl98h3jsi@spacebar.chat","password":"17.qnqqhg2us4.kh92v74atg19.49ufgil7g"},{"email":"w95wrrn48.6gfnue7dcq@spacebar.chat","password":"b.jnqgbi89oj1k.8rn0llovbll.kcblui80th"},{"email":"rqo4n0il5w.4gl1u8hlyc@spacebar.chat","password":"17.41d1lpjmi0.d8ijhslby11w.sjn7sqhi9"},{"email":"6dv3yp4kon.pk7ye6q1r6@spacebar.chat","password":"0.j70py6yysjz.sf56ebpp2gp.z68yo9hiim"},{"email":"knmi9qkige.5v1bg6h09w@spacebar.chat","password":"1d.7n58xntwg1s.umnglex7h13.c5xrsfkosm"},{"email":"cefymgc7te.dd81jabws4@spacebar.chat","password":"1u.73ea7dde1o.0i1fhyaird.sjk30nky1e"},{"email":"33xcwiqf73.r6khs46a7j@spacebar.chat","password":"b.5p5gdmh1891f.11g4590n5a.vfoek6qjb9"},{"email":"9zcgmr84s6.utnlygoubi@spacebar.chat","password":"8.g4v53t7kcl16.wgaiufzgg1u.pusdfdneb"},{"email":"26vpzekrdw.3bwq27wla@spacebar.chat","password":"11.yxey8293lj1d.nxhkju2eke.hl86mcvswd"},{"email":"vvq6w36r84.lr1auhpfc@spacebar.chat","password":"y.7vlqbpftom.6xfrtozd11k.ycf9ifi7o"},{"email":"6ejeiq64yo.zorve5saw4@spacebar.chat","password":"o.eue50qp1frq.qi0rwphg3dv.psph7va2fb"},{"email":"6s0hu88ro8.hsckrmud1i@spacebar.chat","password":"16.fc836nhb91a.ul37503ppg.l62wgser4i"},{"email":"h8qwchz2x9.5br1kcw1iv@spacebar.chat","password":"l.iw1041wgy.6azyc9h6vb.br9cr0dmn8"},{"email":"yx13rst2hu.ybisfdwgv@spacebar.chat","password":"8.5yasf5ba619.ir0toxu251p.tbgwjd18f"},{"email":"1j7vrr1trh.wqj0ozl357@spacebar.chat","password":"1m.iucscoe7b0.6ca1jfaag361.c2trc36mnvk"},{"email":"9w2w572pzr.fv1rk360pp@spacebar.chat","password":"t.labzw6qw8t3.33k42uvhgd1s.e1gj71h14"},{"email":"yf5e43ol4.6509owbcxa@spacebar.chat","password":"12.jewy0uvx1m1m.ce28kht6dk.v2p0bzlvz"},{"email":"gzny2o1re.1xrl0ua7yd@spacebar.chat","password":"h.3valf7r8jh.6bzfr4ions.r4b2mt0l0g"},{"email":"bc77a5kw9v.hu5barps6q@spacebar.chat","password":"1a.jt11azsa81j.4v70jvm9d1o.hflrb1tigk"},{"email":"ltoezpefev.hrvnxmq9ee@spacebar.chat","password":"b.v4f5lqrlc912.dx4dd4xq91v.zj345to03"},{"email":"svcpsuoenk.b8mfqxpbzg@spacebar.chat","password":"1a.7aobev8b4r.xqqfybkcs1t.cjuswku0a"},{"email":"n0mroewqq.svq5iq57pe@spacebar.chat","password":"1l.zxm1xhlavp.65rp7bz57x.01vjajdsc"},{"email":"trly6yupd.dt37kh07dn@spacebar.chat","password":"1i.o2ieg72fz1j.er031tzerx.2ngg4dcvlh"},{"email":"ickkf14cqv.9pu2pnmx7n@spacebar.chat","password":"18.pyhd9ruatl1k.erfchcjc95.wfd67r5e8x"},{"email":"5o4ornfwy9.yabymb8e2k@spacebar.chat","password":"1g.117kmei8df10.cedozr4vee.08te5d44nb"},{"email":"p0ulegfi3.dgmar6qc2v@spacebar.chat","password":"1h.tle7s3ed82.un20o5nv3dk.wnz4w802h8"},{"email":"58gejpvr6v.jolxrsl83p@spacebar.chat","password":"e.ksw14117hbo.f0pgufr3na.ssrjys23al"},{"email":"vf349zeoja.r8bjel59kd@spacebar.chat","password":"1o.79kh6e6glm9.d76d86g1jp16.u37p4jhf7"},{"email":"uc786nn0go.n9ygun6owj@spacebar.chat","password":"m.xo4bwhct5be.lpokbj59w8p.z4l52dzv1r"},{"email":"5jgx24s87u.odlx0bfo0r@spacebar.chat","password":"1k.ni9jyfol7h1g.vczzsa8dbg.r4bhoh5op"},{"email":"2v44408x8l.unfspunnnm@spacebar.chat","password":"16.63njhji5b4.r4xkcf672f1a.x389dr603g"},{"email":"ityj8kcvrm.9djzannsll@spacebar.chat","password":"1p.6jdbhaxiqc.nfnpw7e09g8.967dtt2dy3"},{"email":"8csbvl9qot.28etdf4pf@spacebar.chat","password":"1b.52rdo5qmj3.ta9jw1wm3k9.m96fe27tp"},{"email":"dqndi38hsq.yv77wk3mov@spacebar.chat","password":"k.zpjwpwxmlr1f.tbj03rxayn17.9x451qclu"},{"email":"ohwmvag9j.w6t8ngs4t@spacebar.chat","password":"b.h1ta0mly991q.wzu1ssffyk1h.kc10wt8i2"},{"email":"2mmors2h0w.jwukibc7oi@spacebar.chat","password":"y.xo4kgepqa1t.b77zwt1in5.3um79fx22r"},{"email":"ux0q6gvwnr.gnywxxrsn@spacebar.chat","password":"g.52userbsonu.ny8omqaduf.rvhtwq4jer"},{"email":"0q12b4zet.y87zc04r8r@spacebar.chat","password":"1t.79mg1a9q85.k66wagu67j14.ad0gw3caw"},{"email":"gatbconrvq.dsopxa8fkk@spacebar.chat","password":"1n.fycl7y9roh1p.4yg37pst4k16.votnvabrf"},{"email":"mmp9g1b1v.xz1w4qzxee@spacebar.chat","password":"1k.cjmz3huosl.jh502yz5jf1e.hyce7qc67"},{"email":"5s90s1hbns.b027pfiv3s@spacebar.chat","password":"1l.86ipkmi6fg.scabtvproj4.yw4nb9qui9"},{"email":"l4zrvtrbpb.1r627sllk@spacebar.chat","password":"1l.zzm1dunzzek.10sr7mp01ly.yyrjj1hsli"},{"email":"xih9rwk90i.rmdifv40g@spacebar.chat","password":"15.db9k0pxci1v.hs6l033urm.5a1zv42fhl"},{"email":"55mq93jdq.2dhr1ps4f5@spacebar.chat","password":"i.v5hpg2qez1u.xhs32cwes1h.n10pexmfff"},{"email":"5c0vb38rul.5su27w4pn8@spacebar.chat","password":"12.y87q6jxq41m.qgiji2j0hm.gmy2wuavc"},{"email":"qjk2eoqeqq.ljq4dig10o@spacebar.chat","password":"0.lpu8eio3hra12.mq8qcehpe1e.77p7zilh4"},{"email":"b45ltbf5d.o4oouuik1e@spacebar.chat","password":"1u.wb7hn2b1x1k.jys5p3ri4j.9ew9jab3ll"},{"email":"1mw205tjri.gpi2h76eps@spacebar.chat","password":"1g.kyh53pnamd13.5yufexmyv1h.r56pmhm7i"},{"email":"8y0psdjq2s.ifqyimhnkj@spacebar.chat","password":"1d.fi03hlwk41u.b89w0vrd712.ljudzvdo6"},{"email":"ls73glp0q9.3rtqyb262@spacebar.chat","password":"1.z70c4ef5hfi.fes9zmue2it.5cobkz3ah"},{"email":"ipe2um46bi.in93oau1l@spacebar.chat","password":"5.a5he7keuru1n.l05ivx4n24.piohqdy51w"},{"email":"mt16ta8diq.krypy2t9cv@spacebar.chat","password":"n.zk4goctn5p3.r1fhllqy1m1p.ni2q3y68w"},{"email":"qehwflm0ja.x5uvmxgfle@spacebar.chat","password":"1e.r2sj0uimq1f.nmtozr8qd1s.xgvz4d62b"},{"email":"0ppn1iwd6.ivrqbvn17i@spacebar.chat","password":"1n.fr6x1pbzjl.c8xwipgo6c.m1me2h2g58"},{"email":"xiiq47ofev.u9z0gndxs6@spacebar.chat","password":"1t.7tfe0181ij.jbznx5eebs.ytm50kp5qf"},{"email":"kqhk3lt2mo.o4y7u23zbu@spacebar.chat","password":"1b.bkoqmxjcf1l.c5q9oneuz1u.00x93z7l4"},{"email":"ri64c5o5zn.o429slph64@spacebar.chat","password":"1r.mre2hu1gpu.401xyxa6eu.j98cetaplg"},{"email":"j5jpukoktw.q5bseyjfu@spacebar.chat","password":"h.k1ar11fpx1m.n50t8tz4k4.9oj17rtdjw"},{"email":"cg8gyuhu16.jezv2bo8n@spacebar.chat","password":"1c.vyfo117pd1b.hxlc7e9zve.j6ej7ho2rk"},{"email":"7ngysyss7w.yjy0whd5fh@spacebar.chat","password":"12.pl4jjp66wi1r.xx7s13gsgy.v2slv2vyx"},{"email":"7uhylwdaiq.w557htx0x@spacebar.chat","password":"1j.icm6w8m4mh.4qyoql77m8.ar8kliax0s"},{"email":"y6yn1ckm1e.7xxizerecm@spacebar.chat","password":"1e.om7n18zisn1w.usblhxf4p1m.r9ke41xox"},{"email":"uwdsktqhuw.4vmh5gmg7d@spacebar.chat","password":"6.cdte4bk24b16.cf1sbtxlx1o.n62w4weh9"},{"email":"8v1nt755y.w0y1jgfcgm@spacebar.chat","password":"f.ozxpvznxj41o.bs5s5dhua1l.ffayy0gsy"},{"email":"rmy9b61cij.qir0bjorcm@spacebar.chat","password":"1h.bxjxpx0u6f13.e97yh8g761c.j8zog74iql"},{"email":"93ir0yiyi9.1f7bfzt3fb@spacebar.chat","password":"18.vky28kwlw14.w1wsoyu6c15.yhxbr725xe"},{"email":"g0kqw9plr.v2zcovhyg6@spacebar.chat","password":"1r.3txq1jt4zl1d.ha0ejtekjh.xhjl9e6vqg"},{"email":"xmk2q5zxa.v1ka9gm3a8@spacebar.chat","password":"1l.ryvykh3ihm16.rxea04ifq0.h14sz83yisv"},{"email":"mqt2bmltj9.53o16bc6xn@spacebar.chat","password":"i.vt66ajtme1f.lllyzaprk16.yb0yh0o1z"},{"email":"4kvjyddsv.7u7lmex2df@spacebar.chat","password":"1i.axaegtd0qz.2yvfr5n261g.8s8fprsd8"},{"email":"yigntcopcc.8bchnlmclm@spacebar.chat","password":"n.b5yn5xried1d.siep9e4fb1t.h6s6erw5t"},{"email":"meubr1b03t.t97015wih6@spacebar.chat","password":"5.wu3izi2gyqi.iurx5qpp7l.znq1htzuel"},{"email":"xz3gta0hi.1x5o83xyee@spacebar.chat","password":"14.uafjiryde3.oin9k24w3510.vkjmjleb4i"},{"email":"9jkrkk9r6o.6ossrgj919@spacebar.chat","password":"v.u9531wtw2o11.151eg145bf.bk57nd0s6u"},{"email":"kf9fdmnacv.67shfcubvn@spacebar.chat","password":"1i.7f1olv2hkt.v2cso7zxlfw.8ylhl33g1"},{"email":"k8zuiett0r.0w299k0t9j@spacebar.chat","password":"t.1mrpwsil15.999lbrfvz1h.7od0kjlxo"},{"email":"8m9rt3vgg.vkpf6apx9@spacebar.chat","password":"1n.2ohz11tk412.5ezp8ujcwn8.rvqqrozh9s"},{"email":"rfavhpnhc.6xwy7o3ulm@spacebar.chat","password":"11.ikd54271zj.vq3brjark7.h1ryvz7ap8"},{"email":"6zmju5azrd.4bes4a3cq@spacebar.chat","password":"5.litb6taajto.ownyp3uhjkh.f543o47uc9"},{"email":"ml5pst7t3g.kbvn8b1vg@spacebar.chat","password":"1q.co2aumj6fw.fa18frro5e.vnpotfg209"},{"email":"kaa1r6srjs.wjriguic5e@spacebar.chat","password":"y.y635jqxai9.s4hcd1weni5.51i7z3c26r"},{"email":"n09uhfkuc5.9aqau9qyk@spacebar.chat","password":"1f.wtjqoqzdwg6.mfvvtcwtx91t.8ujt3pwx4"},{"email":"6y5y3px9oa.4183pg5aq6@spacebar.chat","password":"11.8a00uh75g1i.d462wzpqv1t.dnd8sdvr"},{"email":"aqdzadem03.f8uv1m4zv4@spacebar.chat","password":"4.4ndx89thn53.afcjfzjqe51o.ivaemdp5hf"},{"email":"oqv3944yav.31ccatif3r@spacebar.chat","password":"1w.9cstqu9o21f.p40uqca3vl19.iqnn79lqde"},{"email":"akzyzmigv.9c6w5aj4o@spacebar.chat","password":"m.m382wa8nznr.szvso4c03ke.ttw2jhnwh8"},{"email":"13dqfm57jo.e05e711ggt@spacebar.chat","password":"1b.t1b51jt7lf.rhi4j32rw91u.0foqthilf"},{"email":"3derfs5v66.s2kbedbm3o@spacebar.chat","password":"t.e153si8xso1m.9rv9il857fd.e3i0di3ope"},{"email":"92k9vmws7.dt9mvv6ijh@spacebar.chat","password":"1r.r8oy0su9c1e.irtwz9gdna.3fddwt8k4n"},{"email":"w1huzvblr.q9qp44japt@spacebar.chat","password":"1v.dfdr92srfs.3x2wd25frh15.z73xb3vol"},{"email":"vne3an2fif.32eq9woyl@spacebar.chat","password":"7.lurd6n689ek.sf3gedrf711.5xclyfsn3"},{"email":"298zj4dvxf.5sfh7f2e2m@spacebar.chat","password":"n.1rbv0z54wr1n.nt2041ujks.0gwbe80zyl"},{"email":"ywp1ssr2zh.gl97epixxu@spacebar.chat","password":"1w.gfpvze8vq1p.is7b2795819.4hilzah3"},{"email":"kqzujy4m5j.ocydwl4yyh@spacebar.chat","password":"1c.sqxzxuareez.fgczf2qh3en.yi5vo23phn"},{"email":"ck8n5p7d6d.2vu4cdm6iw@spacebar.chat","password":"1o.g3lq6grnm1t.otf44zgiw1c.jfdgqubfjl"},{"email":"s3vqe9bzj.muec34461t@spacebar.chat","password":"1u.i4u3eidof19.tl8hf5fpdv.mvbij0fdgc"},{"email":"7hedrsktw.oqe4hym4us@spacebar.chat","password":"1j.orlptqc2h.hs6661zehh1r.ngepsoldvf"},{"email":"44tm2rsu6j.oxrw5ib1np@spacebar.chat","password":"1o.n71dxtllrf9.htwjv6fsi81l.5w9pyr8eee"},{"email":"o28saa2e4t.m49530ir45@spacebar.chat","password":"16.z31xrcp6li12.uaklzxvskl.nqyq23zqb"},{"email":"aaz3kkwx2q.u42rdyacy6@spacebar.chat","password":"1k.aohk44bxqkq.6lec7k6yfa14.geiq4ok3b"},{"email":"ntw1oc87mh.js3q1iqxrh@spacebar.chat","password":"15.li45vduoy15.h90fv4ytl1t.3v78qdvcq"},{"email":"cpkgoh313.lkdhhl039a@spacebar.chat","password":"3.fdw00uv0dn1v.qz6frlgeh0.3g0c7xnn9le"},{"email":"wznnajnyww.3f5s5cf0lt@spacebar.chat","password":"4.3d2ro1uvag2.9yum8m4gd5t.yd1zriwovn"},{"email":"odwdxlk49g.m113aywba@spacebar.chat","password":"y.24hnap1ckh.n0q1dtobf717.0tzaopasse"},{"email":"0xt66uuwbs.24qfa4w82q@spacebar.chat","password":"e.3cfcd0usw57.oydvjpl5wm1b.sxnf38ihh"},{"email":"4pxgasro0t.xifcrlp26f@spacebar.chat","password":"1d.oxpqgh8jbgb.6epjawtwga1u.o5d33jm"},{"email":"l202g9q8xo.t4ck4xu44v@spacebar.chat","password":"d.gyul2yhu7h1g.163rzn4kqik.e5qlstdwp"},{"email":"8mwzma33ko.b9on13ypjl@spacebar.chat","password":"b.0sdy90whqr1o.rruwt57r8l14.hjejwclmr"},{"email":"h8dm19fu77.hzpnw8famh@spacebar.chat","password":"s.q49kg1uq8gc.046rudurb1o.2lqegjfds"},{"email":"exkp3ve6z7.mdydbk9jy@spacebar.chat","password":"16.bq8o0d13sd8.tri7wtdjpro.2ebtbyqgtt"},{"email":"n8fe02yphv.huwi91ywha@spacebar.chat","password":"1d.8qp5wkq541k.ulwk4bzjsm19.q3qbxorto"},{"email":"lsslgvrdyb.u86qng3p7o@spacebar.chat","password":"11.9q1m8gwavd.9z3kflcg5k1e.lrux8aqm8"},{"email":"0jur86ya2p.gb26btuz7@spacebar.chat","password":"n.fflp1f1yksg.10rh6etc61.yld8y7u9hi"},{"email":"raseda2c45.vl9resp89r@spacebar.chat","password":"b.6gd8az3ljg.es1yjenqskk.i4i8m466p"},{"email":"jmam7ha069.b96jzg1bkl@spacebar.chat","password":"1f.2z41vc92bo.84f3d3j3gra.5yev9enzv"},{"email":"pp2rki7hjd.a037bg6u6@spacebar.chat","password":"3.nktq53a97c19.khsapwl0wd.ej16kksime"},{"email":"c35l8m3ikr.e7vx8nmbil@spacebar.chat","password":"2.oryjofui8mu.7jes36sirs1u.oclq1geaf"},{"email":"ufhsl7tn5u.j4ey0abswv@spacebar.chat","password":"14.uctn73o6h1n.t75arwloxgf.nvgdr4l41o"},{"email":"8ru4fr2ed.kf8ffg9ko8@spacebar.chat","password":"n.hqxwr2ypwd1l.vu23byfp3c.nzgszptoqk"},{"email":"6gmjeij67o.ep5256bmf@spacebar.chat","password":"1i.237gs5pk5j1w.yvuhvp9ho15.l4qibsw5i"},{"email":"4wrhgqel0w.e0sz7l0zki@spacebar.chat","password":"w.g09qtor0p1g.a5uzjl6u3g17.v3z6rhb9h"},{"email":"3860ixs8g.6pha1slnur@spacebar.chat","password":"m.o7o62cqw3g.wkkaak7zz8.h82m4nenbf"},{"email":"wnnpg8stto.zwsxqfp38i@spacebar.chat","password":"c.k2b6jn1b3r14.ojpvlbxil1r.rpkncuyqp"},{"email":"t04ss33dlw.98dpq7j8rg@spacebar.chat","password":"5.7zgfmumai7.iphztcsjfw1h.sq2kp3j9j"},{"email":"hy53et7kw6.vsku4tebj9@spacebar.chat","password":"3.ayjddj0roe1m.ngz1qajzlgu.xue35w1d1d"},{"email":"252ueajele.j4euv8la1d@spacebar.chat","password":"h.tw1utyw7mh9.ydii1rkvp4.8xafwfxrqd"},{"email":"ye2mi1d86.uqa7ig7qxb@spacebar.chat","password":"j.pn3eoar1ft1e.k8febwch91o.fzau5lnbx"},{"email":"4cq5y22mm8.q33hk612wu@spacebar.chat","password":"1l.7tx03ihc9e1a.3i2l76ur5.28yffumat8"},{"email":"d9op87vvj7.vbu23p4mnq@spacebar.chat","password":"10.z7pgyokesip.0i0axexmwpa.0p5xrlag9k"},{"email":"tnhgsqizxh.14ulf4jinl@spacebar.chat","password":"j.8p0jucy5xk10.creosnkf2o.vzznt05x"},{"email":"8h2h3w3ex5.8ogl7f027n@spacebar.chat","password":"1b.08wkhdm03g3.8hdklh1zj41t.fq57w9raf"},{"email":"ommn4ocwtn.1fkdjbz2v8@spacebar.chat","password":"1e.i8k15b9uk1p.70n34lxbzf.4inv63cwt8"},{"email":"fnxg92zeqn.ljg5uumt3e@spacebar.chat","password":"w.ltho2dsgveu.d1ome2w0x8j.7wr2hq1wk8"},{"email":"lzi8aurosp.mck9i974of@spacebar.chat","password":"u.zezf4qdz2p0.l2g634tak98.ql0n1tg6sq"},{"email":"fdhv4fccm5.o9x209i94g@spacebar.chat","password":"5.2o84u6v43619.4c0c71a9gk7.n9cmjegefv"},{"email":"tuedrm1ajt.bxjgzsyj4s@spacebar.chat","password":"1m.ng2h807gvu.rhd056e6bbb.lkvewwp2tg"},{"email":"488bryb32a.x928qzsf8g@spacebar.chat","password":"y.n2c3x3irffa.fz9xwiimno8.nnpvm280oc"},{"email":"n928oorjaa.kj35rf9p35@spacebar.chat","password":"1l.flvmvopcj16.pmx6n9hi7hi.v9odjzq3at"},{"email":"emzd8qz0f8.b972dvhf0m@spacebar.chat","password":"3.7umgbd5apm18.0n6yi8ol9g.m4607npuc"},{"email":"g7jzdulwv5.0a2wzws2ua@spacebar.chat","password":"10.1u1sac19wkf.lvi2qwfhtq16.8wbdddpms"},{"email":"giuivahumo.7iqapfnbfr@spacebar.chat","password":"q.pzck5qtbype.llhl9ypv6b1e.3dz8gsv0pg"},{"email":"0t84mm2pj9.kycgvqkuag@spacebar.chat","password":"1t.kpvjmvipo14.kwv0np3ordv.ustw31ifu"},{"email":"vx5t6yurg7.pocn2c069m@spacebar.chat","password":"f.gdwgrk0wia1u.7m1ozam0b0.d5y62kwyih5"},{"email":"p7arvq1hha.7wryrvhvl@spacebar.chat","password":"1v.eb62r3rx71h.d3fhbfdxa1l.4gzcu184s"},{"email":"adp64dkhdd.q2nc2qvy3@spacebar.chat","password":"q.96rt5rc517h.3f0foodom4.h1wee4z428"},{"email":"pfhrq2kv8.92dq9bxy8a@spacebar.chat","password":"1g.nfaha2xx7hi.vtng22emxs1l.fpbra2wo6h"},{"email":"jjnysdssoc.eqr6v2pqeo@spacebar.chat","password":"1.112arb9m3cb.w3yfq6ekz1d.keb15ptd5"},{"email":"m5rab6dhrc.p1tnxv9feg@spacebar.chat","password":"1.3guc8m7j0uj4.xphgg3121714.7ii7ah6g7f"},{"email":"zgq1iount.blsiqtyvc6@spacebar.chat","password":"16.dzt6188au1w.ilwc3p3ds17.7j7lcsqur"},{"email":"ix7nx1ce4a.3wj4gs8b7p@spacebar.chat","password":"13.p2v1p2nwa1t.2yarcqsmzk.ay7w9u0p1r"},{"email":"5jh7wm63ug.feyytgy11g@spacebar.chat","password":"10.otpp2mz0smb.uv94hcp26c8.a3nlz16n14"},{"email":"9cd7yy1ps4.jet2fn1fdb@spacebar.chat","password":"9.bjtfocm7zk12.sushyeb1yg.lhtmj6a70t"},{"email":"20u20f6dlk.l8n5tvh2re@spacebar.chat","password":"19.qfrr25rarj.4tzf063a9n4.3i5s3vm30b"},{"email":"b1hnmmwcb.q21mrflg1h@spacebar.chat","password":"3.ysh10ultyjz.nz8azt84216.lxn1kgvly"},{"email":"j7nhj8s2d.aqaeidbi8m@spacebar.chat","password":"g.nlnw7ejuqbz.41exhwj2wiv.1yr0njmd"}] \ No newline at end of file diff --git a/scripts/stresstest/index.js b/scripts/stresstest/index.js index bb8c72e48..d3f2d2ba5 100644 --- a/scripts/stresstest/index.js +++ b/scripts/stresstest/index.js @@ -16,13 +16,15 @@ along with this program. If not, see . */ +/* eslint-env node */ + const register = require("./src/register"); const login = require("./src/login/index"); const config = require("./config.json"); const figlet = require("figlet"); const sendMessage = require("./src/message/send"); const fs = require("fs"); -figlet("Fosscord Stress Test :)", function (err, data) { +figlet("Spacebar Stress Test :)", function (err, data) { if (err) { console.log("Something went wrong..."); console.dir(err); diff --git a/scripts/stresstest/src/register/index.js b/scripts/stresstest/src/register/index.js index f1e56813a..f085386f9 100644 --- a/scripts/stresstest/src/register/index.js +++ b/scripts/stresstest/src/register/index.js @@ -16,6 +16,8 @@ along with this program. If not, see . */ +/* eslint-env node */ + const fetch = require("node-fetch"); const fs = require("fs"); var config = require("../../config.json"); @@ -36,7 +38,7 @@ async function generate() { var body = { fingerprint: "805826570869932034.wR8vi8lGlFBJerErO9LG5NViJFw", email: mail, - username: "Fosscord Stress Test", + username: "Spacebar Stress Test", password: password, invite: config.invite, consent: true, diff --git a/scripts/syncronise.js b/scripts/syncronise.js index 34cd0dddd..5f6987c37 100644 --- a/scripts/syncronise.js +++ b/scripts/syncronise.js @@ -25,6 +25,8 @@ it doesn't break the below, thus we're left with this :sob: */ +/* eslint-env node */ + require("module-alias/register"); require("dotenv").config(); const { initDatabase } = require(".."); diff --git a/src/api/Server.ts b/src/api/Server.ts index 032e923e6..447a48022 100644 --- a/src/api/Server.ts +++ b/src/api/Server.ts @@ -25,7 +25,7 @@ import { registerRoutes, Sentry, WebAuthn, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; import { Server, ServerOptions } from "lambert-server"; import "missing-native-js-functions"; @@ -38,7 +38,6 @@ import { ErrorHandler } from "./middlewares/ErrorHandler"; import { initRateLimits } from "./middlewares/RateLimit"; import { initTranslation } from "./middlewares/Translation"; import { initInstance } from "./util/handlers/Instance"; -import express from "express"; const PUBLIC_ASSETS_FOLDER = path.join( __dirname, @@ -48,21 +47,21 @@ const PUBLIC_ASSETS_FOLDER = path.join( "public", ); -export type FosscordServerOptions = ServerOptions; +export type SpacebarServerOptions = ServerOptions; declare global { // eslint-disable-next-line @typescript-eslint/no-namespace namespace Express { interface Request { - server: FosscordServer; + server: SpacebarServer; } } } -export class FosscordServer extends Server { - public declare options: FosscordServerOptions; +export class SpacebarServer extends Server { + public declare options: SpacebarServerOptions; - constructor(opts?: Partial) { + constructor(opts?: Partial) { // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore super({ ...opts, errorHandler: false, jsonBody: false }); diff --git a/src/api/middlewares/Authentication.ts b/src/api/middlewares/Authentication.ts index 400a16f45..09644eeee 100644 --- a/src/api/middlewares/Authentication.ts +++ b/src/api/middlewares/Authentication.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { checkToken, Config, Rights } from "@fosscord/util"; +import { checkToken, Config, Rights } from "@spacebar/util"; import * as Sentry from "@sentry/node"; import { NextFunction, Request, Response } from "express"; import { HTTPError } from "lambert-server"; diff --git a/src/api/middlewares/ErrorHandler.ts b/src/api/middlewares/ErrorHandler.ts index 439fce68d..b8a732989 100644 --- a/src/api/middlewares/ErrorHandler.ts +++ b/src/api/middlewares/ErrorHandler.ts @@ -18,7 +18,7 @@ import { NextFunction, Request, Response } from "express"; import { HTTPError } from "lambert-server"; -import { ApiError, FieldError } from "@fosscord/util"; +import { ApiError, FieldError } from "@spacebar/util"; const EntityNotFoundErrorRegex = /"(\w+)"/; export function ErrorHandler( diff --git a/src/api/middlewares/RateLimit.ts b/src/api/middlewares/RateLimit.ts index f50d65685..0da292e91 100644 --- a/src/api/middlewares/RateLimit.ts +++ b/src/api/middlewares/RateLimit.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { getIpAdress } from "@fosscord/api"; -import { Config, getRights, listenEvent } from "@fosscord/util"; +import { getIpAdress } from "@spacebar/api"; +import { Config, getRights, listenEvent } from "@spacebar/util"; import { NextFunction, Request, Response, Router } from "express"; import { API_PREFIX_TRAILING_SLASH } from "./Authentication"; @@ -27,7 +27,7 @@ import { API_PREFIX_TRAILING_SLASH } from "./Authentication"; /* ? bucket limit? Max actions/sec per bucket? -(ANSWER: a small fosscord instance might not need a complex rate limiting system) +(ANSWER: a small spacebar instance might not need a complex rate limiting system) TODO: delay database requests to include multiple queries TODO: different for methods (GET/POST) > IP addresses that make too many invalid HTTP requests are automatically and temporarily restricted from accessing the Discord API. Currently, this limit is 10,000 per 10 minutes. An invalid request is one that results in 401, 403, or 429 statuses. diff --git a/src/api/routes/-/healthz.ts b/src/api/routes/-/healthz.ts index 555ccf116..6a2f65de3 100644 --- a/src/api/routes/-/healthz.ts +++ b/src/api/routes/-/healthz.ts @@ -17,8 +17,8 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; -import { getDatabase } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { getDatabase } from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/-/readyz.ts b/src/api/routes/-/readyz.ts index 555ccf116..6a2f65de3 100644 --- a/src/api/routes/-/readyz.ts +++ b/src/api/routes/-/readyz.ts @@ -17,8 +17,8 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; -import { getDatabase } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { getDatabase } from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/applications/#id/bot/index.ts b/src/api/routes/applications/#id/bot/index.ts index 89e185b41..e3f1832cc 100644 --- a/src/api/routes/applications/#id/bot/index.ts +++ b/src/api/routes/applications/#id/bot/index.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Application, generateToken, @@ -25,7 +25,7 @@ import { BotModifySchema, handleFile, DiscordApiErrors, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; import { verifyToken } from "node-2fa"; diff --git a/src/api/routes/applications/#id/entitlements.ts b/src/api/routes/applications/#id/entitlements.ts index fa8609bf9..e88fb7f72 100644 --- a/src/api/routes/applications/#id/entitlements.ts +++ b/src/api/routes/applications/#id/entitlements.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/applications/#id/index.ts b/src/api/routes/applications/#id/index.ts index 1cd792ba7..067f5dad4 100644 --- a/src/api/routes/applications/#id/index.ts +++ b/src/api/routes/applications/#id/index.ts @@ -17,12 +17,12 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Application, DiscordApiErrors, ApplicationModifySchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { verifyToken } from "node-2fa"; import { HTTPError } from "lambert-server"; diff --git a/src/api/routes/applications/#id/skus.ts b/src/api/routes/applications/#id/skus.ts index 973761c31..fcb754237 100644 --- a/src/api/routes/applications/#id/skus.ts +++ b/src/api/routes/applications/#id/skus.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/applications/detectable.ts b/src/api/routes/applications/detectable.ts index 2e9723356..a8e308944 100644 --- a/src/api/routes/applications/detectable.ts +++ b/src/api/routes/applications/detectable.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/applications/index.ts b/src/api/routes/applications/index.ts index c4c2c3260..80a19aa82 100644 --- a/src/api/routes/applications/index.ts +++ b/src/api/routes/applications/index.ts @@ -17,13 +17,13 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Application, ApplicationCreateSchema, trimSpecial, User, -} from "@fosscord/util"; +} from "@spacebar/util"; const router: Router = Router(); diff --git a/src/api/routes/auth/forgot.ts b/src/api/routes/auth/forgot.ts index 3a3af3cb2..e240dff2d 100644 --- a/src/api/routes/auth/forgot.ts +++ b/src/api/routes/auth/forgot.ts @@ -16,14 +16,14 @@ along with this program. If not, see . */ -import { getIpAdress, route, verifyCaptcha } from "@fosscord/api"; +import { getIpAdress, route, verifyCaptcha } from "@spacebar/api"; import { Config, Email, FieldErrors, ForgotPasswordSchema, User, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/auth/generate-registration-tokens.ts b/src/api/routes/auth/generate-registration-tokens.ts index 45ebc2e8c..723875f86 100644 --- a/src/api/routes/auth/generate-registration-tokens.ts +++ b/src/api/routes/auth/generate-registration-tokens.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { route, random } from "@fosscord/api"; -import { Config, ValidRegistrationToken } from "@fosscord/util"; +import { route, random } from "@spacebar/api"; +import { Config, ValidRegistrationToken } from "@spacebar/util"; import { Request, Response, Router } from "express"; const router: Router = Router(); diff --git a/src/api/routes/auth/location-metadata.ts b/src/api/routes/auth/location-metadata.ts index d7c7adf1e..52a45c678 100644 --- a/src/api/routes/auth/location-metadata.ts +++ b/src/api/routes/auth/location-metadata.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { getIpAdress, IPAnalysis } from "@fosscord/api"; +import { route } from "@spacebar/api"; +import { getIpAdress, IPAnalysis } from "@spacebar/api"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/auth/login.ts b/src/api/routes/auth/login.ts index 280d34619..fe0b4f998 100644 --- a/src/api/routes/auth/login.ts +++ b/src/api/routes/auth/login.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { getIpAdress, route, verifyCaptcha } from "@fosscord/api"; +import { getIpAdress, route, verifyCaptcha } from "@spacebar/api"; import { adjustEmail, Config, @@ -26,7 +26,7 @@ import { LoginSchema, User, WebAuthn, -} from "@fosscord/util"; +} from "@spacebar/util"; import bcrypt from "bcrypt"; import crypto from "crypto"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/auth/logout.ts b/src/api/routes/auth/logout.ts index 33ad144ca..51909afac 100644 --- a/src/api/routes/auth/logout.ts +++ b/src/api/routes/auth/logout.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Request, Response, Router } from "express"; const router: Router = Router(); diff --git a/src/api/routes/auth/mfa/totp.ts b/src/api/routes/auth/mfa/totp.ts index 83c4ba56a..2396443d4 100644 --- a/src/api/routes/auth/mfa/totp.ts +++ b/src/api/routes/auth/mfa/totp.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { BackupCode, generateToken, User, TotpSchema } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { BackupCode, generateToken, User, TotpSchema } from "@spacebar/util"; import { verifyToken } from "node-2fa"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/auth/mfa/webauthn.ts b/src/api/routes/auth/mfa/webauthn.ts index 8ffe1ee23..1b3874110 100644 --- a/src/api/routes/auth/mfa/webauthn.ts +++ b/src/api/routes/auth/mfa/webauthn.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { generateToken, SecurityKey, @@ -24,7 +24,7 @@ import { verifyWebAuthnToken, WebAuthn, WebAuthnTotpSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; import { ExpectedAssertionResult } from "fido2-lib"; import { HTTPError } from "lambert-server"; diff --git a/src/api/routes/auth/register.ts b/src/api/routes/auth/register.ts index aa09cf242..430c95326 100644 --- a/src/api/routes/auth/register.ts +++ b/src/api/routes/auth/register.ts @@ -26,14 +26,14 @@ import { adjustEmail, RegisterSchema, ValidRegistrationToken, -} from "@fosscord/util"; +} from "@spacebar/util"; import { route, getIpAdress, IPAnalysis, isProxy, verifyCaptcha, -} from "@fosscord/api"; +} from "@spacebar/api"; import bcrypt from "bcrypt"; import { HTTPError } from "lambert-server"; import { MoreThan } from "typeorm"; @@ -52,7 +52,7 @@ router.post( // They're a one time use token that bypasses registration limits ( rates, disabled reg, etc ) let regTokenUsed = false; if (req.get("Referrer") && req.get("Referrer")?.includes("token=")) { - // eg theyre on https://staging.fosscord.com/register?token=whatever + // eg theyre on https://staging.spacebar.chat/register?token=whatever const token = req.get("Referrer")?.split("token=")[1].split("&")[0]; if (token) { const regToken = await ValidRegistrationToken.findOneOrFail({ diff --git a/src/api/routes/auth/reset.ts b/src/api/routes/auth/reset.ts index a1fd218fb..852a43c71 100644 --- a/src/api/routes/auth/reset.ts +++ b/src/api/routes/auth/reset.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { checkToken, Config, @@ -25,7 +25,7 @@ import { generateToken, PasswordResetSchema, User, -} from "@fosscord/util"; +} from "@spacebar/util"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; diff --git a/src/api/routes/auth/verify/index.ts b/src/api/routes/auth/verify/index.ts index 1cde3691e..c1afcde9a 100644 --- a/src/api/routes/auth/verify/index.ts +++ b/src/api/routes/auth/verify/index.ts @@ -16,14 +16,14 @@ along with this program. If not, see . */ -import { getIpAdress, route, verifyCaptcha } from "@fosscord/api"; +import { getIpAdress, route, verifyCaptcha } from "@spacebar/api"; import { checkToken, Config, FieldErrors, generateToken, User, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/auth/verify/resend.ts b/src/api/routes/auth/verify/resend.ts index d9751ee74..f2727abd6 100644 --- a/src/api/routes/auth/verify/resend.ts +++ b/src/api/routes/auth/verify/resend.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; -import { Email, User } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { Email, User } from "@spacebar/util"; import { Request, Response, Router } from "express"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/auth/verify/view-backup-codes-challenge.ts b/src/api/routes/auth/verify/view-backup-codes-challenge.ts index e02e41f75..b12719ffd 100644 --- a/src/api/routes/auth/verify/view-backup-codes-challenge.ts +++ b/src/api/routes/auth/verify/view-backup-codes-challenge.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { FieldErrors, User, BackupCodesChallengeSchema } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { FieldErrors, User, BackupCodesChallengeSchema } from "@spacebar/util"; import bcrypt from "bcrypt"; const router = Router(); diff --git a/src/api/routes/channels/#channel_id/index.ts b/src/api/routes/channels/#channel_id/index.ts index 2033e444c..db0d42421 100644 --- a/src/api/routes/channels/#channel_id/index.ts +++ b/src/api/routes/channels/#channel_id/index.ts @@ -25,9 +25,9 @@ import { Recipient, handleFile, ChannelModifySchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); // TODO: delete channel diff --git a/src/api/routes/channels/#channel_id/invites.ts b/src/api/routes/channels/#channel_id/invites.ts index 9bb540267..9f247fe89 100644 --- a/src/api/routes/channels/#channel_id/invites.ts +++ b/src/api/routes/channels/#channel_id/invites.ts @@ -18,8 +18,8 @@ import { Router, Request, Response } from "express"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; -import { random } from "@fosscord/api"; +import { route } from "@spacebar/api"; +import { random } from "@spacebar/api"; import { Channel, Invite, @@ -28,7 +28,7 @@ import { User, Guild, PublicInviteRelation, -} from "@fosscord/util"; +} from "@spacebar/util"; import { isTextChannel } from "./messages"; const router: Router = Router(); diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts b/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts index 42c1c3465..f098fa8e4 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/ack.ts @@ -21,9 +21,9 @@ import { getPermission, MessageAckEvent, ReadState, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts index d2ece163c..909a459e7 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/crosspost.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts index 62e18be45..cd4b243ee 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts @@ -20,7 +20,7 @@ import { Attachment, Channel, emitEvent, - FosscordApiErrors, + SpacebarApiErrors, getPermission, getRights, Message, @@ -31,11 +31,11 @@ import { uploadFile, MessageCreateSchema, MessageEditSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Response, Request } from "express"; import multer from "multer"; -import { route } from "@fosscord/api"; -import { handleMessage, postHandleMessage } from "@fosscord/api"; +import { route } from "@spacebar/api"; +import { handleMessage, postHandleMessage } from "@spacebar/api"; import { HTTPError } from "lambert-server"; const router = Router(); @@ -163,14 +163,14 @@ router.put( const snowflake = Snowflake.deconstruct(message_id); if (Date.now() < snowflake.timestamp) { // message is in the future - throw FosscordApiErrors.CANNOT_BACKFILL_TO_THE_FUTURE; + throw SpacebarApiErrors.CANNOT_BACKFILL_TO_THE_FUTURE; } const exists = await Message.findOne({ where: { id: message_id, channel_id: channel_id }, }); if (exists) { - throw FosscordApiErrors.CANNOT_REPLACE_BY_BACKFILL; + throw SpacebarApiErrors.CANNOT_REPLACE_BY_BACKFILL; } if (req.file) { diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts index 5f86c966d..eafa70c8f 100644 --- a/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts +++ b/src/api/routes/channels/#channel_id/messages/#message_id/reactions.ts @@ -30,8 +30,8 @@ import { PartialEmoji, PublicUserProjection, User, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Router, Response, Request } from "express"; import { HTTPError } from "lambert-server"; import { In } from "typeorm"; diff --git a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts index d97b97e52..18476d5cf 100644 --- a/src/api/routes/channels/#channel_id/messages/bulk-delete.ts +++ b/src/api/routes/channels/#channel_id/messages/bulk-delete.ts @@ -25,9 +25,9 @@ import { getRights, MessageDeleteBulkEvent, Message, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts index b68bbcd46..c871087ac 100644 --- a/src/api/routes/channels/#channel_id/messages/index.ts +++ b/src/api/routes/channels/#channel_id/messages/index.ts @@ -36,9 +36,9 @@ import { Rights, Reaction, User, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { handleMessage, postHandleMessage, route } from "@fosscord/api"; +import { handleMessage, postHandleMessage, route } from "@spacebar/api"; import multer from "multer"; import { FindManyOptions, FindOperator, LessThan, MoreThan } from "typeorm"; import { URL } from "url"; @@ -146,7 +146,7 @@ router.get("/", async (req: Request, res: Response) => { x.author = User.create({ id: "4", discriminator: "0000", - username: "Fosscord Ghost", + username: "Spacebar Ghost", public_flags: 0, }); x.attachments?.forEach((y: Attachment) => { diff --git a/src/api/routes/channels/#channel_id/permissions.ts b/src/api/routes/channels/#channel_id/permissions.ts index 1794cd9a3..68dbc2f2e 100644 --- a/src/api/routes/channels/#channel_id/permissions.ts +++ b/src/api/routes/channels/#channel_id/permissions.ts @@ -24,11 +24,11 @@ import { Member, Role, ChannelPermissionOverwriteSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Response, Request } from "express"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); // TODO: Only permissions your bot has in the guild or channel can be allowed/denied (unless your bot has a MANAGE_ROLES overwrite in the channel) diff --git a/src/api/routes/channels/#channel_id/pins.ts b/src/api/routes/channels/#channel_id/pins.ts index bd4c6ae27..328209163 100644 --- a/src/api/routes/channels/#channel_id/pins.ts +++ b/src/api/routes/channels/#channel_id/pins.ts @@ -24,9 +24,9 @@ import { Message, MessageUpdateEvent, DiscordApiErrors, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/channels/#channel_id/purge.ts b/src/api/routes/channels/#channel_id/purge.ts index 5ff53129f..c8da67603 100644 --- a/src/api/routes/channels/#channel_id/purge.ts +++ b/src/api/routes/channels/#channel_id/purge.ts @@ -17,7 +17,7 @@ */ import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { isTextChannel } from "./messages"; import { FindManyOptions, Between, Not, FindOperator } from "typeorm"; import { @@ -28,7 +28,7 @@ import { Message, MessageDeleteBulkEvent, PurgeSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Response, Request } from "express"; const router: Router = Router(); diff --git a/src/api/routes/channels/#channel_id/recipients.ts b/src/api/routes/channels/#channel_id/recipients.ts index 4cdc55ed1..f1fb48afb 100644 --- a/src/api/routes/channels/#channel_id/recipients.ts +++ b/src/api/routes/channels/#channel_id/recipients.ts @@ -27,8 +27,8 @@ import { PublicUserProjection, Recipient, User, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/channels/#channel_id/typing.ts b/src/api/routes/channels/#channel_id/typing.ts index e697ac96c..6a2fef398 100644 --- a/src/api/routes/channels/#channel_id/typing.ts +++ b/src/api/routes/channels/#channel_id/typing.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { Channel, emitEvent, Member, TypingStartEvent } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { Channel, emitEvent, Member, TypingStartEvent } from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Router, Request, Response } from "express"; const router: Router = Router(); diff --git a/src/api/routes/channels/#channel_id/webhooks.ts b/src/api/routes/channels/#channel_id/webhooks.ts index d5dd25224..14791a1cb 100644 --- a/src/api/routes/channels/#channel_id/webhooks.ts +++ b/src/api/routes/channels/#channel_id/webhooks.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Channel, Config, @@ -27,10 +27,10 @@ import { Webhook, WebhookCreateSchema, WebhookType, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; import { isTextChannel } from "./messages/index"; -import { DiscordApiErrors } from "@fosscord/util"; +import { DiscordApiErrors } from "@spacebar/util"; import crypto from "crypto"; const router: Router = Router(); @@ -63,7 +63,7 @@ router.post( // TODO: move this if (name === "clyde") throw new HTTPError("Invalid name", 400); - if (name === "Fosscord Ghost") throw new HTTPError("Invalid name", 400); + if (name === "Spacebar Ghost") throw new HTTPError("Invalid name", 400); if (avatar) avatar = await handleFile(`/avatars/${channel_id}`, avatar); diff --git a/src/api/routes/discoverable-guilds.ts b/src/api/routes/discoverable-guilds.ts index 383fa2980..75eb60887 100644 --- a/src/api/routes/discoverable-guilds.ts +++ b/src/api/routes/discoverable-guilds.ts @@ -16,10 +16,10 @@ along with this program. If not, see . */ -import { Guild, Config } from "@fosscord/util"; +import { Guild, Config } from "@spacebar/util"; import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Like } from "typeorm"; const router = Router(); diff --git a/src/api/routes/discovery.ts b/src/api/routes/discovery.ts index f9f620fb6..0c8089e47 100644 --- a/src/api/routes/discovery.ts +++ b/src/api/routes/discovery.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Categories } from "@fosscord/util"; +import { Categories } from "@spacebar/util"; import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/download.ts b/src/api/routes/download.ts index 916e9208c..c4eea8e80 100644 --- a/src/api/routes/download.ts +++ b/src/api/routes/download.ts @@ -17,8 +17,8 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; -import { FieldErrors, Release } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { FieldErrors, Release } from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/experiments.ts b/src/api/routes/experiments.ts index a29dd8947..cd206d79f 100644 --- a/src/api/routes/experiments.ts +++ b/src/api/routes/experiments.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/gateway/bot.ts b/src/api/routes/gateway/bot.ts index 1cce93b07..243159ec4 100644 --- a/src/api/routes/gateway/bot.ts +++ b/src/api/routes/gateway/bot.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import { Router, Response, Request } from "express"; -import { route, RouteOptions } from "@fosscord/api"; +import { route, RouteOptions } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/gateway/index.ts b/src/api/routes/gateway/index.ts index ee500e9b6..12e969195 100644 --- a/src/api/routes/gateway/index.ts +++ b/src/api/routes/gateway/index.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import { Router, Response, Request } from "express"; -import { route, RouteOptions } from "@fosscord/api"; +import { route, RouteOptions } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/gifs/search.ts b/src/api/routes/gifs/search.ts index d3e8ef1c8..fb99374bc 100644 --- a/src/api/routes/gifs/search.ts +++ b/src/api/routes/gifs/search.ts @@ -19,7 +19,7 @@ import { Router, Response, Request } from "express"; import fetch from "node-fetch"; import ProxyAgent from "proxy-agent"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { getGifApiKey, parseGifResult } from "./trending"; const router = Router(); diff --git a/src/api/routes/gifs/trending-gifs.ts b/src/api/routes/gifs/trending-gifs.ts index a05bc9aa8..238a2abd2 100644 --- a/src/api/routes/gifs/trending-gifs.ts +++ b/src/api/routes/gifs/trending-gifs.ts @@ -19,7 +19,7 @@ import { Router, Response, Request } from "express"; import fetch from "node-fetch"; import ProxyAgent from "proxy-agent"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { getGifApiKey, parseGifResult } from "./trending"; const router = Router(); diff --git a/src/api/routes/gifs/trending.ts b/src/api/routes/gifs/trending.ts index e7b5f2186..5cccdb2d2 100644 --- a/src/api/routes/gifs/trending.ts +++ b/src/api/routes/gifs/trending.ts @@ -19,8 +19,8 @@ import { Router, Response, Request } from "express"; import fetch from "node-fetch"; import ProxyAgent from "proxy-agent"; -import { route } from "@fosscord/api"; -import { Config } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { Config } from "@spacebar/util"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/guild-recommendations.ts b/src/api/routes/guild-recommendations.ts index c60873862..67f43c140 100644 --- a/src/api/routes/guild-recommendations.ts +++ b/src/api/routes/guild-recommendations.ts @@ -16,10 +16,10 @@ along with this program. If not, see . */ -import { Guild, Config } from "@fosscord/util"; +import { Guild, Config } from "@spacebar/util"; import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Like } from "typeorm"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/audit-logs.ts b/src/api/routes/guilds/#guild_id/audit-logs.ts index 82c4f2549..5dbb0e3fe 100644 --- a/src/api/routes/guilds/#guild_id/audit-logs.ts +++ b/src/api/routes/guilds/#guild_id/audit-logs.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); //TODO: implement audit logs diff --git a/src/api/routes/guilds/#guild_id/bans.ts b/src/api/routes/guilds/#guild_id/bans.ts index 3ecb31c37..31aed6b9f 100644 --- a/src/api/routes/guilds/#guild_id/bans.ts +++ b/src/api/routes/guilds/#guild_id/bans.ts @@ -27,9 +27,9 @@ import { Member, BanRegistrySchema, BanModeratorSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { getIpAdress, route } from "@fosscord/api"; +import { getIpAdress, route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/guilds/#guild_id/channels.ts b/src/api/routes/guilds/#guild_id/channels.ts index 0f6225d7c..d74d9f840 100644 --- a/src/api/routes/guilds/#guild_id/channels.ts +++ b/src/api/routes/guilds/#guild_id/channels.ts @@ -23,9 +23,9 @@ import { emitEvent, ChannelModifySchema, ChannelReorderSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/guilds/#guild_id/delete.ts b/src/api/routes/guilds/#guild_id/delete.ts index 184e17988..ec72a4aed 100644 --- a/src/api/routes/guilds/#guild_id/delete.ts +++ b/src/api/routes/guilds/#guild_id/delete.ts @@ -16,10 +16,10 @@ along with this program. If not, see . */ -import { emitEvent, GuildDeleteEvent, Guild } from "@fosscord/util"; +import { emitEvent, GuildDeleteEvent, Guild } from "@spacebar/util"; import { Router, Request, Response } from "express"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/discovery-requirements.ts b/src/api/routes/guilds/#guild_id/discovery-requirements.ts index badde8781..5e15676ae 100644 --- a/src/api/routes/guilds/#guild_id/discovery-requirements.ts +++ b/src/api/routes/guilds/#guild_id/discovery-requirements.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/emojis.ts b/src/api/routes/guilds/#guild_id/emojis.ts index 85fcabc11..c661202ee 100644 --- a/src/api/routes/guilds/#guild_id/emojis.ts +++ b/src/api/routes/guilds/#guild_id/emojis.ts @@ -29,8 +29,8 @@ import { User, EmojiCreateSchema, EmojiModifySchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/index.ts b/src/api/routes/guilds/#guild_id/index.ts index 494933427..672bc92e7 100644 --- a/src/api/routes/guilds/#guild_id/index.ts +++ b/src/api/routes/guilds/#guild_id/index.ts @@ -27,10 +27,10 @@ import { handleFile, Member, GuildUpdateSchema, - FosscordApiErrors, -} from "@fosscord/util"; + SpacebarApiErrors, +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); @@ -113,7 +113,7 @@ router.patch( for (const feature of diff) { if (MUTABLE_FEATURES.includes(feature)) continue; - throw FosscordApiErrors.FEATURE_IS_IMMUTABLE.withParams( + throw SpacebarApiErrors.FEATURE_IS_IMMUTABLE.withParams( feature, ); } diff --git a/src/api/routes/guilds/#guild_id/integrations.ts b/src/api/routes/guilds/#guild_id/integrations.ts index d53183289..3d963af13 100644 --- a/src/api/routes/guilds/#guild_id/integrations.ts +++ b/src/api/routes/guilds/#guild_id/integrations.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); //TODO: implement integrations list diff --git a/src/api/routes/guilds/#guild_id/invites.ts b/src/api/routes/guilds/#guild_id/invites.ts index 04a89af76..9c4469282 100644 --- a/src/api/routes/guilds/#guild_id/invites.ts +++ b/src/api/routes/guilds/#guild_id/invites.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { Invite, PublicInviteRelation } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { Invite, PublicInviteRelation } from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/member-verification.ts b/src/api/routes/guilds/#guild_id/member-verification.ts index 7bb46cbc5..242f3684c 100644 --- a/src/api/routes/guilds/#guild_id/member-verification.ts +++ b/src/api/routes/guilds/#guild_id/member-verification.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts index e76c96072..a14691f2b 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts @@ -29,8 +29,8 @@ import { Guild, handleFile, MemberChangeSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts b/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts index ac40f0db5..14e7467f4 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/nick.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { getPermission, Member, PermissionResolvable } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { getPermission, Member, PermissionResolvable } from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts b/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts index 071883d67..698df88fa 100644 --- a/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts +++ b/src/api/routes/guilds/#guild_id/members/#member_id/roles/#role_id/index.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { Member } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { Member } from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/members/index.ts b/src/api/routes/guilds/#guild_id/members/index.ts index 87c2af203..f7a55cf14 100644 --- a/src/api/routes/guilds/#guild_id/members/index.ts +++ b/src/api/routes/guilds/#guild_id/members/index.ts @@ -17,8 +17,8 @@ */ import { Request, Response, Router } from "express"; -import { Member, PublicMemberProjection } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { Member, PublicMemberProjection } from "@spacebar/util"; +import { route } from "@spacebar/api"; import { MoreThan } from "typeorm"; import { HTTPError } from "lambert-server"; diff --git a/src/api/routes/guilds/#guild_id/messages/search.ts b/src/api/routes/guilds/#guild_id/messages/search.ts index b4869bc09..bc5f1b6e9 100644 --- a/src/api/routes/guilds/#guild_id/messages/search.ts +++ b/src/api/routes/guilds/#guild_id/messages/search.ts @@ -19,8 +19,8 @@ /* eslint-disable @typescript-eslint/ban-ts-comment */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; -import { getPermission, FieldErrors, Message, Channel } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { getPermission, FieldErrors, Message, Channel } from "@spacebar/util"; import { HTTPError } from "lambert-server"; import { FindManyOptions, In, Like } from "typeorm"; diff --git a/src/api/routes/guilds/#guild_id/premium.ts b/src/api/routes/guilds/#guild_id/premium.ts index 1a3a8497b..7b343daf4 100644 --- a/src/api/routes/guilds/#guild_id/premium.ts +++ b/src/api/routes/guilds/#guild_id/premium.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get("/subscriptions", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/guilds/#guild_id/profile/index.ts b/src/api/routes/guilds/#guild_id/profile/index.ts index 1511fab4c..8ec22ea41 100644 --- a/src/api/routes/guilds/#guild_id/profile/index.ts +++ b/src/api/routes/guilds/#guild_id/profile/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { emitEvent, GuildMemberUpdateEvent, @@ -24,7 +24,7 @@ import { Member, MemberChangeProfileSchema, OrmUtils, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/prune.ts b/src/api/routes/guilds/#guild_id/prune.ts index e29ef641c..dbed546bc 100644 --- a/src/api/routes/guilds/#guild_id/prune.ts +++ b/src/api/routes/guilds/#guild_id/prune.ts @@ -17,9 +17,9 @@ */ import { Router, Request, Response } from "express"; -import { Guild, Member, Snowflake } from "@fosscord/util"; +import { Guild, Member, Snowflake } from "@spacebar/util"; import { LessThan, IsNull } from "typeorm"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); //Returns all inactive members, respecting role hierarchy diff --git a/src/api/routes/guilds/#guild_id/regions.ts b/src/api/routes/guilds/#guild_id/regions.ts index 83dc9144e..de1e87696 100644 --- a/src/api/routes/guilds/#guild_id/regions.ts +++ b/src/api/routes/guilds/#guild_id/regions.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Guild } from "@fosscord/util"; +import { Guild } from "@spacebar/util"; import { Request, Response, Router } from "express"; -import { getVoiceRegions, route, getIpAdress } from "@fosscord/api"; +import { getVoiceRegions, route, getIpAdress } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts b/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts index f783e27b6..de3fc35b6 100644 --- a/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts +++ b/src/api/routes/guilds/#guild_id/roles/#role_id/index.ts @@ -25,8 +25,8 @@ import { emitEvent, handleFile, RoleModifySchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/roles/index.ts b/src/api/routes/guilds/#guild_id/roles/index.ts index 6f3fab48a..f93e93857 100644 --- a/src/api/routes/guilds/#guild_id/roles/index.ts +++ b/src/api/routes/guilds/#guild_id/roles/index.ts @@ -29,8 +29,8 @@ import { RoleModifySchema, RolePositionUpdateSchema, Snowflake, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Not } from "typeorm"; const router: Router = Router(); diff --git a/src/api/routes/guilds/#guild_id/stickers.ts b/src/api/routes/guilds/#guild_id/stickers.ts index 3d0c494e7..84a236701 100644 --- a/src/api/routes/guilds/#guild_id/stickers.ts +++ b/src/api/routes/guilds/#guild_id/stickers.ts @@ -26,9 +26,9 @@ import { StickerType, uploadFile, ModifyGuildStickerSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import multer from "multer"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/templates.ts b/src/api/routes/guilds/#guild_id/templates.ts index 8a8c53fec..3bd28e05e 100644 --- a/src/api/routes/guilds/#guild_id/templates.ts +++ b/src/api/routes/guilds/#guild_id/templates.ts @@ -17,10 +17,10 @@ */ import { Request, Response, Router } from "express"; -import { Guild, Template } from "@fosscord/util"; +import { Guild, Template } from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; -import { generateCode } from "@fosscord/api"; +import { route } from "@spacebar/api"; +import { generateCode } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/guilds/#guild_id/vanity-url.ts b/src/api/routes/guilds/#guild_id/vanity-url.ts index e97c92c58..c85c943f3 100644 --- a/src/api/routes/guilds/#guild_id/vanity-url.ts +++ b/src/api/routes/guilds/#guild_id/vanity-url.ts @@ -22,9 +22,9 @@ import { Guild, Invite, VanityUrlSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { HTTPError } from "lambert-server"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts b/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts index 784d7746b..791ac1021 100644 --- a/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts +++ b/src/api/routes/guilds/#guild_id/voice-states/#user_id/index.ts @@ -25,8 +25,8 @@ import { VoiceState, VoiceStateUpdateEvent, VoiceStateUpdateSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/guilds/#guild_id/webhooks.ts b/src/api/routes/guilds/#guild_id/webhooks.ts index caa252d2b..d58659a41 100644 --- a/src/api/routes/guilds/#guild_id/webhooks.ts +++ b/src/api/routes/guilds/#guild_id/webhooks.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); //TODO: implement webhooks diff --git a/src/api/routes/guilds/#guild_id/welcome-screen.ts b/src/api/routes/guilds/#guild_id/welcome-screen.ts index 938eef098..696e20dbd 100644 --- a/src/api/routes/guilds/#guild_id/welcome-screen.ts +++ b/src/api/routes/guilds/#guild_id/welcome-screen.ts @@ -17,9 +17,9 @@ */ import { Request, Response, Router } from "express"; -import { Guild, Member, GuildUpdateWelcomeScreenSchema } from "@fosscord/util"; +import { Guild, Member, GuildUpdateWelcomeScreenSchema } from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/guilds/#guild_id/widget.json.ts b/src/api/routes/guilds/#guild_id/widget.json.ts index 57186e80d..1799f0beb 100644 --- a/src/api/routes/guilds/#guild_id/widget.json.ts +++ b/src/api/routes/guilds/#guild_id/widget.json.ts @@ -17,9 +17,9 @@ */ import { Request, Response, Router } from "express"; -import { Permissions, Guild, Invite, Channel, Member } from "@fosscord/util"; +import { Permissions, Guild, Invite, Channel, Member } from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { random, route } from "@fosscord/api"; +import { random, route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/guilds/#guild_id/widget.png.ts b/src/api/routes/guilds/#guild_id/widget.png.ts index e4a7713c8..4e9756030 100644 --- a/src/api/routes/guilds/#guild_id/widget.png.ts +++ b/src/api/routes/guilds/#guild_id/widget.png.ts @@ -19,9 +19,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Request, Response, Router } from "express"; -import { Guild } from "@fosscord/util"; +import { Guild } from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import fs from "fs"; import path from "path"; @@ -58,7 +58,7 @@ router.get("/", route({}), async (req: Request, res: Response) => { const { loadImage } = require("canvas"); const sizeOf = require("image-size"); - // TODO: Widget style templates need Fosscord branding + // TODO: Widget style templates need Spacebar branding const source = path.join( __dirname, "..", diff --git a/src/api/routes/guilds/#guild_id/widget.ts b/src/api/routes/guilds/#guild_id/widget.ts index c8b47c4f1..77af25dcf 100644 --- a/src/api/routes/guilds/#guild_id/widget.ts +++ b/src/api/routes/guilds/#guild_id/widget.ts @@ -17,8 +17,8 @@ */ import { Request, Response, Router } from "express"; -import { Guild, WidgetModifySchema } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { Guild, WidgetModifySchema } from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/guilds/index.ts b/src/api/routes/guilds/index.ts index 6b95bd970..c793d185c 100644 --- a/src/api/routes/guilds/index.ts +++ b/src/api/routes/guilds/index.ts @@ -24,8 +24,8 @@ import { Member, DiscordApiErrors, GuildCreateSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/guilds/templates/index.ts b/src/api/routes/guilds/templates/index.ts index df753a2ca..bfbb7d3bf 100644 --- a/src/api/routes/guilds/templates/index.ts +++ b/src/api/routes/guilds/templates/index.ts @@ -25,9 +25,9 @@ import { Config, Member, GuildTemplateCreateSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; -import { DiscordApiErrors } from "@fosscord/util"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; +import { DiscordApiErrors } from "@spacebar/util"; import fetch from "node-fetch"; const router: Router = Router(); diff --git a/src/api/routes/invites/index.ts b/src/api/routes/invites/index.ts index 805e5e6e7..6680e3755 100644 --- a/src/api/routes/invites/index.ts +++ b/src/api/routes/invites/index.ts @@ -25,8 +25,8 @@ import { InviteDeleteEvent, User, PublicInviteRelation, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import { HTTPError } from "lambert-server"; const router: Router = Router(); diff --git a/src/api/routes/oauth2/authorize.ts b/src/api/routes/oauth2/authorize.ts index b06be724d..c041f6711 100644 --- a/src/api/routes/oauth2/authorize.ts +++ b/src/api/routes/oauth2/authorize.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { ApiError, Application, @@ -27,7 +27,7 @@ import { Member, Permissions, User, -} from "@fosscord/util"; +} from "@spacebar/util"; const router = Router(); // TODO: scopes, other oauth types diff --git a/src/api/routes/oauth2/tokens.ts b/src/api/routes/oauth2/tokens.ts index cff331374..86290721e 100644 --- a/src/api/routes/oauth2/tokens.ts +++ b/src/api/routes/oauth2/tokens.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/outbound-promotions.ts b/src/api/routes/outbound-promotions.ts index a260bb4ca..1d4564daf 100644 --- a/src/api/routes/outbound-promotions.ts +++ b/src/api/routes/outbound-promotions.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/partners/#guild_id/requirements.ts b/src/api/routes/partners/#guild_id/requirements.ts index badde8781..5e15676ae 100644 --- a/src/api/routes/partners/#guild_id/requirements.ts +++ b/src/api/routes/partners/#guild_id/requirements.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/ping.ts b/src/api/routes/ping.ts index 8deefd328..0fb6d9d0f 100644 --- a/src/api/routes/ping.ts +++ b/src/api/routes/ping.ts @@ -17,8 +17,8 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; -import { Config } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { Config } from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/policies/instance/domains.ts b/src/api/routes/policies/instance/domains.ts index d97f87110..fe032b50b 100644 --- a/src/api/routes/policies/instance/domains.ts +++ b/src/api/routes/policies/instance/domains.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { Config } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { Config } from "@spacebar/util"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/policies/instance/index.ts b/src/api/routes/policies/instance/index.ts index 163c9c23f..68ce3b429 100644 --- a/src/api/routes/policies/instance/index.ts +++ b/src/api/routes/policies/instance/index.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { Config } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { Config } from "@spacebar/util"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/policies/instance/limits.ts b/src/api/routes/policies/instance/limits.ts index 732d8a482..a6f131702 100644 --- a/src/api/routes/policies/instance/limits.ts +++ b/src/api/routes/policies/instance/limits.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { Config } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { Config } from "@spacebar/util"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/policies/stats.ts b/src/api/routes/policies/stats.ts index 764a57903..3939e1e82 100644 --- a/src/api/routes/policies/stats.ts +++ b/src/api/routes/policies/stats.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { Config, getRights, @@ -24,7 +24,7 @@ import { Member, Message, User, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/read-states/ack-bulk.ts b/src/api/routes/read-states/ack-bulk.ts index cab16c8c0..2c51893b7 100644 --- a/src/api/routes/read-states/ack-bulk.ts +++ b/src/api/routes/read-states/ack-bulk.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; -import { AckBulkSchema, ReadState } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { AckBulkSchema, ReadState } from "@spacebar/util"; const router = Router(); router.post( diff --git a/src/api/routes/scheduled-maintenances/upcoming_json.ts b/src/api/routes/scheduled-maintenances/upcoming_json.ts index b85d85fa8..c1fc0ff39 100644 --- a/src/api/routes/scheduled-maintenances/upcoming_json.ts +++ b/src/api/routes/scheduled-maintenances/upcoming_json.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get( diff --git a/src/api/routes/science.ts b/src/api/routes/science.ts index 52c6d903f..099da18bc 100644 --- a/src/api/routes/science.ts +++ b/src/api/routes/science.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/stage-instances.ts b/src/api/routes/stage-instances.ts index a260bb4ca..1d4564daf 100644 --- a/src/api/routes/stage-instances.ts +++ b/src/api/routes/stage-instances.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/sticker-packs/index.ts b/src/api/routes/sticker-packs/index.ts index d5c6cb11f..234e03c68 100644 --- a/src/api/routes/sticker-packs/index.ts +++ b/src/api/routes/sticker-packs/index.ts @@ -17,8 +17,8 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; -import { StickerPack } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { StickerPack } from "@spacebar/util"; const router: Router = Router(); diff --git a/src/api/routes/stickers/#sticker_id/index.ts b/src/api/routes/stickers/#sticker_id/index.ts index 0c986320a..360149b59 100644 --- a/src/api/routes/stickers/#sticker_id/index.ts +++ b/src/api/routes/stickers/#sticker_id/index.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Sticker } from "@fosscord/util"; +import { Sticker } from "@spacebar/util"; import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get("/", route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/stop.ts b/src/api/routes/stop.ts index a1761e671..6a6e6277c 100644 --- a/src/api/routes/stop.ts +++ b/src/api/routes/stop.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/store/published-listings/applications.ts b/src/api/routes/store/published-listings/applications.ts index 483429e5f..5ee63e532 100644 --- a/src/api/routes/store/published-listings/applications.ts +++ b/src/api/routes/store/published-listings/applications.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts b/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts index 5bc36b7a6..a15e0bf71 100644 --- a/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts +++ b/src/api/routes/store/published-listings/applications/#id/subscription-plans.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/store/published-listings/skus.ts b/src/api/routes/store/published-listings/skus.ts index 483429e5f..5ee63e532 100644 --- a/src/api/routes/store/published-listings/skus.ts +++ b/src/api/routes/store/published-listings/skus.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts b/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts index 4d9f7cacc..4ea35c18a 100644 --- a/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts +++ b/src/api/routes/store/published-listings/skus/#sku_id/subscription-plans.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/teams.ts b/src/api/routes/teams.ts index bca5b915f..26570165a 100644 --- a/src/api/routes/teams.ts +++ b/src/api/routes/teams.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/template.ts.disabled b/src/api/routes/template.ts.disabled index fcc59ef4d..c9d78a034 100644 --- a/src/api/routes/template.ts.disabled +++ b/src/api/routes/template.ts.disabled @@ -1,7 +1,7 @@ //TODO: this is a template for a generic route import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); router.get("/",route({}), async (req: Request, res: Response) => { diff --git a/src/api/routes/track.ts b/src/api/routes/track.ts index 52c6d903f..099da18bc 100644 --- a/src/api/routes/track.ts +++ b/src/api/routes/track.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/updates.ts b/src/api/routes/updates.ts index 2458871f9..f74038999 100644 --- a/src/api/routes/updates.ts +++ b/src/api/routes/updates.ts @@ -17,8 +17,8 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; -import { FieldErrors, Release } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { FieldErrors, Release } from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/users/#id/delete.ts b/src/api/routes/users/#id/delete.ts index df9d1d6a2..e36a35e66 100644 --- a/src/api/routes/users/#id/delete.ts +++ b/src/api/routes/users/#id/delete.ts @@ -16,14 +16,14 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { emitEvent, Member, PrivateUserProjection, User, UserDeleteEvent, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/users/#id/index.ts b/src/api/routes/users/#id/index.ts index 9d418bfde..0c7cfe375 100644 --- a/src/api/routes/users/#id/index.ts +++ b/src/api/routes/users/#id/index.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { User } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { User } from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/#id/profile.ts b/src/api/routes/users/#id/profile.ts index 78e704baa..4727e2151 100644 --- a/src/api/routes/users/#id/profile.ts +++ b/src/api/routes/users/#id/profile.ts @@ -25,8 +25,8 @@ import { PrivateUserProjection, emitEvent, UserUpdateEvent, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/#id/relationships.ts b/src/api/routes/users/#id/relationships.ts index 241b097d4..dfe52a5ef 100644 --- a/src/api/routes/users/#id/relationships.ts +++ b/src/api/routes/users/#id/relationships.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { User } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { User } from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/activities/statistics/applications.ts b/src/api/routes/users/@me/activities/statistics/applications.ts index 222261bfe..5e797ce87 100644 --- a/src/api/routes/users/@me/activities/statistics/applications.ts +++ b/src/api/routes/users/@me/activities/statistics/applications.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/affinities/guilds.ts b/src/api/routes/users/@me/affinities/guilds.ts index 752ab159c..e49661483 100644 --- a/src/api/routes/users/@me/affinities/guilds.ts +++ b/src/api/routes/users/@me/affinities/guilds.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/affinities/users.ts b/src/api/routes/users/@me/affinities/users.ts index dfd847740..76fb8aa64 100644 --- a/src/api/routes/users/@me/affinities/users.ts +++ b/src/api/routes/users/@me/affinities/users.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/applications/#app_id/entitlements.ts b/src/api/routes/users/@me/applications/#app_id/entitlements.ts index a260bb4ca..1d4564daf 100644 --- a/src/api/routes/users/@me/applications/#app_id/entitlements.ts +++ b/src/api/routes/users/@me/applications/#app_id/entitlements.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/billing/country-code.ts b/src/api/routes/users/@me/billing/country-code.ts index ed6c19b9e..2a43a3962 100644 --- a/src/api/routes/users/@me/billing/country-code.ts +++ b/src/api/routes/users/@me/billing/country-code.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/billing/payment-sources.ts b/src/api/routes/users/@me/billing/payment-sources.ts index 222261bfe..5e797ce87 100644 --- a/src/api/routes/users/@me/billing/payment-sources.ts +++ b/src/api/routes/users/@me/billing/payment-sources.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/billing/subscriptions.ts b/src/api/routes/users/@me/billing/subscriptions.ts index a260bb4ca..1d4564daf 100644 --- a/src/api/routes/users/@me/billing/subscriptions.ts +++ b/src/api/routes/users/@me/billing/subscriptions.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/channels.ts b/src/api/routes/users/@me/channels.ts index 3c94826f1..04db4fe9d 100644 --- a/src/api/routes/users/@me/channels.ts +++ b/src/api/routes/users/@me/channels.ts @@ -22,8 +22,8 @@ import { DmChannelDTO, Channel, DmChannelCreateSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/connections.ts b/src/api/routes/users/@me/connections.ts index a260bb4ca..1d4564daf 100644 --- a/src/api/routes/users/@me/connections.ts +++ b/src/api/routes/users/@me/connections.ts @@ -17,7 +17,7 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/delete.ts b/src/api/routes/users/@me/delete.ts index e73a7f459..dce737fc7 100644 --- a/src/api/routes/users/@me/delete.ts +++ b/src/api/routes/users/@me/delete.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { Member, User } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { Member, User } from "@spacebar/util"; +import { route } from "@spacebar/api"; import bcrypt from "bcrypt"; import { HTTPError } from "lambert-server"; diff --git a/src/api/routes/users/@me/devices.ts b/src/api/routes/users/@me/devices.ts index 52c6d903f..099da18bc 100644 --- a/src/api/routes/users/@me/devices.ts +++ b/src/api/routes/users/@me/devices.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/disable.ts b/src/api/routes/users/@me/disable.ts index 15e5d9e14..d123a6a18 100644 --- a/src/api/routes/users/@me/disable.ts +++ b/src/api/routes/users/@me/disable.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { User } from "@fosscord/util"; +import { User } from "@spacebar/util"; import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import bcrypt from "bcrypt"; const router = Router(); diff --git a/src/api/routes/users/@me/email-settings.ts b/src/api/routes/users/@me/email-settings.ts index 8d4e78739..4c9e16b14 100644 --- a/src/api/routes/users/@me/email-settings.ts +++ b/src/api/routes/users/@me/email-settings.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/entitlements.ts b/src/api/routes/users/@me/entitlements.ts index ff088314f..7f5526226 100644 --- a/src/api/routes/users/@me/entitlements.ts +++ b/src/api/routes/users/@me/entitlements.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/guilds.ts b/src/api/routes/users/@me/guilds.ts index 0de574fcb..b16b909dc 100644 --- a/src/api/routes/users/@me/guilds.ts +++ b/src/api/routes/users/@me/guilds.ts @@ -25,9 +25,9 @@ import { GuildMemberRemoveEvent, emitEvent, Config, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/guilds/#guild_id/settings.ts b/src/api/routes/users/@me/guilds/#guild_id/settings.ts index 9cdc90e69..7e9f2a08a 100644 --- a/src/api/routes/users/@me/guilds/#guild_id/settings.ts +++ b/src/api/routes/users/@me/guilds/#guild_id/settings.ts @@ -22,8 +22,8 @@ import { Member, OrmUtils, UserGuildSettingsSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/guilds/premium/subscription-slots.ts b/src/api/routes/users/@me/guilds/premium/subscription-slots.ts index 222261bfe..5e797ce87 100644 --- a/src/api/routes/users/@me/guilds/premium/subscription-slots.ts +++ b/src/api/routes/users/@me/guilds/premium/subscription-slots.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts index 79bb85f87..b3eeb964f 100644 --- a/src/api/routes/users/@me/index.ts +++ b/src/api/routes/users/@me/index.ts @@ -28,8 +28,8 @@ import { Config, UserModifySchema, generateToken, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import bcrypt from "bcrypt"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/library.ts b/src/api/routes/users/@me/library.ts index eacbd0397..54d9b04fd 100644 --- a/src/api/routes/users/@me/library.ts +++ b/src/api/routes/users/@me/library.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/mfa/codes-verification.ts b/src/api/routes/users/@me/mfa/codes-verification.ts index e202dc567..69d45e91e 100644 --- a/src/api/routes/users/@me/mfa/codes-verification.ts +++ b/src/api/routes/users/@me/mfa/codes-verification.ts @@ -17,14 +17,14 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { BackupCode, generateMfaBackupCodes, User, CodesVerificationSchema, DiscordApiErrors, -} from "@fosscord/util"; +} from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/users/@me/mfa/codes.ts b/src/api/routes/users/@me/mfa/codes.ts index c9f73ce63..4ddbf78eb 100644 --- a/src/api/routes/users/@me/mfa/codes.ts +++ b/src/api/routes/users/@me/mfa/codes.ts @@ -17,14 +17,14 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { BackupCode, FieldErrors, generateMfaBackupCodes, User, MfaCodesSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import bcrypt from "bcrypt"; const router = Router(); diff --git a/src/api/routes/users/@me/mfa/totp/disable.ts b/src/api/routes/users/@me/mfa/totp/disable.ts index f2a63aab7..9f4064238 100644 --- a/src/api/routes/users/@me/mfa/totp/disable.ts +++ b/src/api/routes/users/@me/mfa/totp/disable.ts @@ -17,7 +17,7 @@ */ import { Router, Request, Response } from "express"; -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { verifyToken } from "node-2fa"; import { HTTPError } from "lambert-server"; import { @@ -25,7 +25,7 @@ import { generateToken, BackupCode, TotpDisableSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; const router = Router(); diff --git a/src/api/routes/users/@me/mfa/totp/enable.ts b/src/api/routes/users/@me/mfa/totp/enable.ts index 9baf7657a..4d6b27634 100644 --- a/src/api/routes/users/@me/mfa/totp/enable.ts +++ b/src/api/routes/users/@me/mfa/totp/enable.ts @@ -22,8 +22,8 @@ import { generateToken, generateMfaBackupCodes, TotpEnableSchema, -} from "@fosscord/util"; -import { route } from "@fosscord/api"; +} from "@spacebar/util"; +import { route } from "@spacebar/api"; import bcrypt from "bcrypt"; import { HTTPError } from "lambert-server"; import { verifyToken } from "node-2fa"; diff --git a/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts b/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts index 54c3d9c79..04aca7e48 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/#key_id/index.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; -import { SecurityKey, User } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { SecurityKey, User } from "@spacebar/util"; import { Request, Response, Router } from "express"; const router = Router(); diff --git a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts index 8cc60d58f..29dbb7cf2 100644 --- a/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts +++ b/src/api/routes/users/@me/mfa/webauthn/credentials/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { route } from "@fosscord/api"; +import { route } from "@spacebar/api"; import { CreateWebAuthnCredentialSchema, DiscordApiErrors, @@ -28,7 +28,7 @@ import { verifyWebAuthnToken, WebAuthn, WebAuthnPostSchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import bcrypt from "bcrypt"; import { Request, Response, Router } from "express"; import { ExpectedAttestationResult } from "fido2-lib"; diff --git a/src/api/routes/users/@me/notes.ts b/src/api/routes/users/@me/notes.ts index 87d452771..d05c799cd 100644 --- a/src/api/routes/users/@me/notes.ts +++ b/src/api/routes/users/@me/notes.ts @@ -17,8 +17,8 @@ */ import { Request, Response, Router } from "express"; -import { route } from "@fosscord/api"; -import { User, Note, emitEvent, Snowflake } from "@fosscord/util"; +import { route } from "@spacebar/api"; +import { User, Note, emitEvent, Snowflake } from "@spacebar/util"; const router: Router = Router(); diff --git a/src/api/routes/users/@me/relationships.ts b/src/api/routes/users/@me/relationships.ts index 268e56601..e9ea47e63 100644 --- a/src/api/routes/users/@me/relationships.ts +++ b/src/api/routes/users/@me/relationships.ts @@ -25,11 +25,11 @@ import { emitEvent, Relationship, Config, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Router, Response, Request } from "express"; import { HTTPError } from "lambert-server"; -import { DiscordApiErrors } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { DiscordApiErrors } from "@spacebar/util"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/users/@me/settings.ts b/src/api/routes/users/@me/settings.ts index e91597e4f..62cfe904f 100644 --- a/src/api/routes/users/@me/settings.ts +++ b/src/api/routes/users/@me/settings.ts @@ -17,8 +17,8 @@ */ import { Router, Response, Request } from "express"; -import { User, UserSettingsSchema } from "@fosscord/util"; -import { route } from "@fosscord/api"; +import { User, UserSettingsSchema } from "@spacebar/util"; +import { route } from "@spacebar/api"; const router = Router(); diff --git a/src/api/routes/voice/regions.ts b/src/api/routes/voice/regions.ts index 8ff52bcad..59bac07fc 100644 --- a/src/api/routes/voice/regions.ts +++ b/src/api/routes/voice/regions.ts @@ -17,8 +17,8 @@ */ import { Router, Request, Response } from "express"; -import { getIpAdress, route } from "@fosscord/api"; -import { getVoiceRegions } from "@fosscord/api"; +import { getIpAdress, route } from "@spacebar/api"; +import { getVoiceRegions } from "@spacebar/api"; const router: Router = Router(); diff --git a/src/api/start.ts b/src/api/start.ts index 6d35c67b5..088c6f8de 100644 --- a/src/api/start.ts +++ b/src/api/start.ts @@ -23,7 +23,7 @@ process.on("unhandledRejection", console.error); import "missing-native-js-functions"; import { config } from "dotenv"; config(); -import { FosscordServer } from "./Server"; +import { SpacebarServer } from "./Server"; import cluster from "cluster"; import os from "os"; let cores = 1; @@ -48,7 +48,7 @@ if (cluster.isPrimary && process.env.NODE_ENV == "production") { } else { const port = Number(process.env.PORT) || 3001; - const server = new FosscordServer({ port }); + const server = new SpacebarServer({ port }); server.start().catch(console.error); // eslint-disable-next-line @typescript-eslint/ban-ts-comment diff --git a/src/api/util/handlers/Instance.ts b/src/api/util/handlers/Instance.ts index bd9bf3944..ccd56d928 100644 --- a/src/api/util/handlers/Instance.ts +++ b/src/api/util/handlers/Instance.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Session } from "@fosscord/util"; +import { Session } from "@spacebar/util"; export async function initInstance() { // TODO: clean up database and delete tombstone data diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts index 65dbcdfe2..6172a3d0c 100644 --- a/src/api/util/handlers/Message.ts +++ b/src/api/util/handlers/Message.ts @@ -41,10 +41,10 @@ import { Sticker, MessageCreateSchema, EmbedCache, -} from "@fosscord/util"; +} from "@spacebar/util"; import { HTTPError } from "lambert-server"; import { In } from "typeorm"; -import { EmbedHandlers } from "@fosscord/api"; +import { EmbedHandlers } from "@spacebar/api"; import * as Sentry from "@sentry/node"; const allow_empty = false; // TODO: check webhook, application, system author, stickers diff --git a/src/api/util/handlers/Voice.ts b/src/api/util/handlers/Voice.ts index 0880ab985..db06bd33c 100644 --- a/src/api/util/handlers/Voice.ts +++ b/src/api/util/handlers/Voice.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import { distanceBetweenLocations, IPAnalysis } from "../utility/ipAddress"; export async function getVoiceRegions(ipAddress: string, vip: boolean) { diff --git a/src/api/util/handlers/route.ts b/src/api/util/handlers/route.ts index b0bc3af79..604df4e99 100644 --- a/src/api/util/handlers/route.ts +++ b/src/api/util/handlers/route.ts @@ -21,7 +21,7 @@ import { DiscordApiErrors, EVENT, FieldErrors, - FosscordApiErrors, + SpacebarApiErrors, getPermission, getRights, normalizeBody, @@ -29,7 +29,7 @@ import { Permissions, RightResolvable, Rights, -} from "@fosscord/util"; +} from "@spacebar/util"; import { NextFunction, Request, Response } from "express"; import { AnyValidateFunction } from "ajv/dist/core"; @@ -91,7 +91,7 @@ export function route(opts: RouteOptions) { req.rights = await getRights(req.user_id); if (!req.rights || !req.rights.has(required)) { - throw FosscordApiErrors.MISSING_RIGHTS.withParams( + throw SpacebarApiErrors.MISSING_RIGHTS.withParams( opts.right as string, ); } diff --git a/src/api/util/utility/EmbedHandlers.ts b/src/api/util/utility/EmbedHandlers.ts index 1e84e31aa..15e3f67f3 100644 --- a/src/api/util/utility/EmbedHandlers.ts +++ b/src/api/util/utility/EmbedHandlers.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config, Embed, EmbedType } from "@fosscord/util"; +import { Config, Embed, EmbedType } from "@spacebar/util"; import fetch, { RequestInit } from "node-fetch"; import * as cheerio from "cheerio"; import probe from "probe-image-size"; @@ -28,7 +28,7 @@ export const DEFAULT_FETCH_OPTIONS: RequestInit = { follow: 1, headers: { "user-agent": - "Mozilla/5.0 (compatible; Fosscord/1.0; +https://github.com/fosscord/fosscord)", + "Mozilla/5.0 (compatible; Spacebar/1.0; +https://github.com/spacebarchat/server)", }, // size: 1024 * 1024 * 5, // grabbed from config later compress: true, @@ -67,7 +67,7 @@ export const getProxyUrl = ( console.log( "[Embeds]", yellow( - "Imagor has not been set up correctly. https://docs.fosscord.com/setup/server/configuration/imagor/", + "Imagor has not been set up correctly. https://docs.spacebar.chat/setup/server/configuration/imagor/", ), ); } diff --git a/src/api/util/utility/RandomInviteID.ts b/src/api/util/utility/RandomInviteID.ts index e3eda6063..926750d35 100644 --- a/src/api/util/utility/RandomInviteID.ts +++ b/src/api/util/utility/RandomInviteID.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Snowflake } from "@fosscord/util"; +import { Snowflake } from "@spacebar/util"; import crypto from "crypto"; // TODO: 'random'? seriously? who named this? diff --git a/src/api/util/utility/String.ts b/src/api/util/utility/String.ts index 7bc752f5d..eef69e39b 100644 --- a/src/api/util/utility/String.ts +++ b/src/api/util/utility/String.ts @@ -18,7 +18,7 @@ import { Request } from "express"; import { ntob } from "./Base64"; -import { FieldErrors } from "@fosscord/util"; +import { FieldErrors } from "@spacebar/util"; export function checkLength( str: string, diff --git a/src/api/util/utility/captcha.ts b/src/api/util/utility/captcha.ts index 28dba44b6..db1b7957a 100644 --- a/src/api/util/utility/captcha.ts +++ b/src/api/util/utility/captcha.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import fetch from "node-fetch"; export interface hcaptchaResponse { @@ -49,7 +49,7 @@ export async function verifyCaptcha(response: string, ip?: string) { if (!service || !secret || !sitekey) throw new Error( - "CAPTCHA is not configured correctly. https://docs.fosscord.com/setup/server/security/captcha/", + "CAPTCHA is not configured correctly. https://docs.spacebar.chat/setup/server/security/captcha/", ); const res = await fetch(verifyEndpoints[service], { diff --git a/src/api/util/utility/ipAddress.ts b/src/api/util/utility/ipAddress.ts index 4ae316fa0..172e9604d 100644 --- a/src/api/util/utility/ipAddress.ts +++ b/src/api/util/utility/ipAddress.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import { Request } from "express"; // use ipdata package instead of simple fetch because of integrated caching import fetch from "node-fetch"; diff --git a/src/api/util/utility/passwordStrength.ts b/src/api/util/utility/passwordStrength.ts index 4f3914c5d..fd627fbf7 100644 --- a/src/api/util/utility/passwordStrength.ts +++ b/src/api/util/utility/passwordStrength.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import "missing-native-js-functions"; const reNUMBER = /[0-9]/g; diff --git a/src/bundle/Server.ts b/src/bundle/Server.ts index 00ced932c..6ba74be62 100644 --- a/src/bundle/Server.ts +++ b/src/bundle/Server.ts @@ -20,12 +20,12 @@ process.on("unhandledRejection", console.error); process.on("uncaughtException", console.error); import http from "http"; -import * as Api from "@fosscord/api"; -import * as Gateway from "@fosscord/gateway"; -import { CDNServer } from "@fosscord/cdn"; +import * as Api from "@spacebar/api"; +import * as Gateway from "@spacebar/gateway"; +import { CDNServer } from "@spacebar/cdn"; import express from "express"; import { green, bold } from "picocolors"; -import { Config, initDatabase, Sentry } from "@fosscord/util"; +import { Config, initDatabase, Sentry } from "@spacebar/util"; const app = express(); const server = http.createServer(); @@ -33,7 +33,7 @@ const port = Number(process.env.PORT) || 3001; const production = process.env.NODE_ENV == "development" ? false : true; server.on("request", app); -const api = new Api.FosscordServer({ server, port, production, app }); +const api = new Api.SpacebarServer({ server, port, production, app }); const cdn = new CDNServer({ server, port, production, app }); const gateway = new Gateway.Server({ server, port, production }); diff --git a/src/bundle/index.ts b/src/bundle/index.ts index 899c6b1f9..c6af4f005 100644 --- a/src/bundle/index.ts +++ b/src/bundle/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -export * from "@fosscord/api"; -export * from "@fosscord/util"; -export * from "@fosscord/gateway"; -export * from "@fosscord/cdn"; +export * from "@spacebar/api"; +export * from "@spacebar/util"; +export * from "@spacebar/gateway"; +export * from "@spacebar/cdn"; diff --git a/src/bundle/start.ts b/src/bundle/start.ts index 96c5ccdfa..df50fd4ca 100644 --- a/src/bundle/start.ts +++ b/src/bundle/start.ts @@ -42,14 +42,14 @@ if (cluster.isPrimary) { console.log( bold(` -███████╗ ██████╗ ███████╗███████╗ ██████╗ ██████╗ ██████╗ ██████╗ -██╔════╝██╔═══██╗██╔════╝██╔════╝██╔════╝██╔═══██╗██╔══██╗██╔══██╗ -█████╗ ██║ ██║███████╗███████╗██║ ██║ ██║██████╔╝██║ ██║ -██╔══╝ ██║ ██║╚════██║╚════██║██║ ██║ ██║██╔══██╗██║ ██║ -██║ ╚██████╔╝███████║███████║╚██████╗╚██████╔╝██║ ██║██████╔╝ -╚═╝ ╚═════╝ ╚══════╝╚══════╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═╝╚═════╝ +███████╗██████╗ █████╗ ██████╗███████╗██████╗ █████╗ ██████╗ +██╔════╝██╔══██╗██╔══██╗██╔════╝██╔════╝██╔══██╗██╔══██╗██╔══██╗ +███████╗██████╔╝███████║██║ █████╗ ██████╔╝███████║██████╔╝ +╚════██║██╔═══╝ ██╔══██║██║ ██╔══╝ ██╔══██╗██╔══██║██╔══██╗ +███████║██║ ██║ ██║╚██████╗███████╗██████╔╝██║ ██║██║ ██║ +╚══════╝╚═╝ ╚═╝ ╚═╝ ╚═════╝╚══════╝╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝ - fosscord-server | ${yellow( + spacebar-server | ${yellow( `Pre-release (${ commit !== null ? commit.slice(0, 7) diff --git a/src/bundle/stats.ts b/src/bundle/stats.ts index 0073515eb..b690eb752 100644 --- a/src/bundle/stats.ts +++ b/src/bundle/stats.ts @@ -33,7 +33,8 @@ export function initStats() { if (process.getuid && process.getuid() === 0) { console.warn( red( - `[Process] Warning fosscord is running as root, this highly discouraged and might expose your system vulnerable to attackers. Please run fosscord as a user without root privileges.`, + `[Process] Warning Spacebar is running as root, this highly discouraged and might expose your system vulnerable to attackers.` + + `Please run Spacebar as a user without root privileges.`, ), ); } diff --git a/src/cdn/Server.ts b/src/cdn/Server.ts index 543c84aea..255452a0b 100644 --- a/src/cdn/Server.ts +++ b/src/cdn/Server.ts @@ -17,7 +17,7 @@ */ import { Server, ServerOptions } from "lambert-server"; -import { Config, initDatabase, registerRoutes, Sentry } from "@fosscord/util"; +import { Config, initDatabase, registerRoutes, Sentry } from "@spacebar/util"; import path from "path"; import avatarsRoute from "./routes/avatars"; import guildProfilesRoute from "./routes/guild-profiles"; diff --git a/src/cdn/routes/attachments.ts b/src/cdn/routes/attachments.ts index bfbe24894..19bb0b908 100644 --- a/src/cdn/routes/attachments.ts +++ b/src/cdn/routes/attachments.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { Config, Snowflake } from "@fosscord/util"; +import { Config, Snowflake } from "@spacebar/util"; import { storage } from "../util/Storage"; import FileType from "file-type"; import { HTTPError } from "lambert-server"; diff --git a/src/cdn/routes/avatars.ts b/src/cdn/routes/avatars.ts index 6d6f1d8e3..6af3243fa 100644 --- a/src/cdn/routes/avatars.ts +++ b/src/cdn/routes/avatars.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { Config, Snowflake } from "@fosscord/util"; +import { Config, Snowflake } from "@spacebar/util"; import { storage } from "../util/Storage"; import FileType from "file-type"; import { HTTPError } from "lambert-server"; diff --git a/src/cdn/routes/guild-profiles.ts b/src/cdn/routes/guild-profiles.ts index 5fc9519cf..1ee5eecae 100644 --- a/src/cdn/routes/guild-profiles.ts +++ b/src/cdn/routes/guild-profiles.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config, Snowflake } from "@fosscord/util"; +import { Config, Snowflake } from "@spacebar/util"; import crypto from "crypto"; import { Request, Response, Router } from "express"; import FileType from "file-type"; diff --git a/src/cdn/routes/role-icons.ts b/src/cdn/routes/role-icons.ts index 6cc1d8ed4..c7fb6e1a6 100644 --- a/src/cdn/routes/role-icons.ts +++ b/src/cdn/routes/role-icons.ts @@ -17,7 +17,7 @@ */ import { Router, Response, Request } from "express"; -import { Config, Snowflake } from "@fosscord/util"; +import { Config, Snowflake } from "@spacebar/util"; import { storage } from "../util/Storage"; import FileType from "file-type"; import { HTTPError } from "lambert-server"; diff --git a/src/gateway/Server.ts b/src/gateway/Server.ts index 82fbe3b42..9fba2d4c5 100644 --- a/src/gateway/Server.ts +++ b/src/gateway/Server.ts @@ -25,7 +25,7 @@ import { initDatabase, initEvent, Sentry, -} from "@fosscord/util"; +} from "@spacebar/util"; import ws from "ws"; import { Connection } from "./events/Connection"; import http from "http"; diff --git a/src/gateway/events/Close.ts b/src/gateway/events/Close.ts index fdb71f335..572037afa 100644 --- a/src/gateway/events/Close.ts +++ b/src/gateway/events/Close.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; import { emitEvent, PresenceUpdateEvent, @@ -24,7 +24,7 @@ import { Session, SessionsReplace, User, -} from "@fosscord/util"; +} from "@spacebar/util"; export async function Close(this: WebSocket, code: number, reason: Buffer) { console.log("[WebSocket] closed", code, reason.toString()); diff --git a/src/gateway/events/Connection.ts b/src/gateway/events/Connection.ts index 98ee06ff1..68273ace6 100644 --- a/src/gateway/events/Connection.ts +++ b/src/gateway/events/Connection.ts @@ -18,7 +18,7 @@ /* eslint-disable @typescript-eslint/ban-ts-comment */ import WS from "ws"; -import { genSessionId, WebSocket } from "@fosscord/gateway"; +import { genSessionId, WebSocket } from "@spacebar/gateway"; import { Send } from "../util/Send"; import { CLOSECODES, OPCODES } from "../util/Constants"; import { setHeartbeat } from "../util/Heartbeat"; @@ -27,7 +27,7 @@ import { Close } from "./Close"; import { Message } from "./Message"; import { Deflate, Inflate } from "fast-zlib"; import { URL } from "url"; -import { Config, ErlpackType } from "@fosscord/util"; +import { Config, ErlpackType } from "@spacebar/util"; let erlpack: ErlpackType | null = null; try { diff --git a/src/gateway/events/Message.ts b/src/gateway/events/Message.ts index 9dca9b33c..457901464 100644 --- a/src/gateway/events/Message.ts +++ b/src/gateway/events/Message.ts @@ -16,11 +16,11 @@ along with this program. If not, see . */ -import { WebSocket, Payload, CLOSECODES, OPCODES } from "@fosscord/gateway"; +import { WebSocket, Payload, CLOSECODES, OPCODES } from "@spacebar/gateway"; import OPCodeHandlers from "../opcodes"; import { check } from "../opcodes/instanceOf"; import WS from "ws"; -import { PayloadSchema, ErlpackType } from "@fosscord/util"; +import { PayloadSchema, ErlpackType } from "@spacebar/util"; import * as Sentry from "@sentry/node"; import BigIntJson from "json-bigint"; import path from "path"; diff --git a/src/gateway/listener/listener.ts b/src/gateway/listener/listener.ts index bd4c0e66d..b624b8e03 100644 --- a/src/gateway/listener/listener.ts +++ b/src/gateway/listener/listener.ts @@ -27,13 +27,13 @@ import { EVENTEnum, Relationship, RelationshipType, -} from "@fosscord/util"; +} from "@spacebar/util"; import { OPCODES } from "../util/Constants"; import { Send } from "../util/Send"; -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; import "missing-native-js-functions"; import { Channel as AMQChannel } from "amqplib"; -import { Recipient } from "@fosscord/util"; +import { Recipient } from "@spacebar/util"; // TODO: close connection on Invalidated Token // TODO: check intent diff --git a/src/gateway/opcodes/Heartbeat.ts b/src/gateway/opcodes/Heartbeat.ts index 14fb03a3e..7866c3e91 100644 --- a/src/gateway/opcodes/Heartbeat.ts +++ b/src/gateway/opcodes/Heartbeat.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; import { setHeartbeat } from "../util/Heartbeat"; import { Send } from "../util/Send"; diff --git a/src/gateway/opcodes/Identify.ts b/src/gateway/opcodes/Identify.ts index 16ba3f239..d3b55f0a7 100644 --- a/src/gateway/opcodes/Identify.ts +++ b/src/gateway/opcodes/Identify.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket, Payload } from "@fosscord/gateway"; +import { WebSocket, Payload } from "@spacebar/gateway"; import { checkToken, Intents, @@ -43,14 +43,14 @@ import { ReadyGuildDTO, Guild, UserTokenData, -} from "@fosscord/util"; +} from "@spacebar/util"; import { Send } from "../util/Send"; import { CLOSECODES, OPCODES } from "../util/Constants"; import { setupListener } from "../listener/listener"; // import experiments from "./experiments.json"; const experiments: unknown[] = []; import { check } from "./instanceOf"; -import { Recipient } from "@fosscord/util"; +import { Recipient } from "@spacebar/util"; // TODO: user sharding // TODO: check privileged intents, if defined in the config diff --git a/src/gateway/opcodes/LazyRequest.ts b/src/gateway/opcodes/LazyRequest.ts index 241a80f2d..3cc2b655d 100644 --- a/src/gateway/opcodes/LazyRequest.ts +++ b/src/gateway/opcodes/LazyRequest.ts @@ -26,14 +26,14 @@ import { LazyRequestSchema, User, Presence, -} from "@fosscord/util"; +} from "@spacebar/util"; import { WebSocket, Payload, handlePresenceUpdate, OPCODES, Send, -} from "@fosscord/gateway"; +} from "@spacebar/gateway"; import { check } from "./instanceOf"; // TODO: only show roles/members that have access to this channel diff --git a/src/gateway/opcodes/PresenceUpdate.ts b/src/gateway/opcodes/PresenceUpdate.ts index d570a1f73..03736263c 100644 --- a/src/gateway/opcodes/PresenceUpdate.ts +++ b/src/gateway/opcodes/PresenceUpdate.ts @@ -16,14 +16,14 @@ along with this program. If not, see . */ -import { WebSocket, Payload } from "@fosscord/gateway"; +import { WebSocket, Payload } from "@spacebar/gateway"; import { emitEvent, PresenceUpdateEvent, Session, User, ActivitySchema, -} from "@fosscord/util"; +} from "@spacebar/util"; import { check } from "./instanceOf"; export async function onPresenceUpdate(this: WebSocket, { d }: Payload) { diff --git a/src/gateway/opcodes/RequestGuildMembers.ts b/src/gateway/opcodes/RequestGuildMembers.ts index cb6bff985..304d4b390 100644 --- a/src/gateway/opcodes/RequestGuildMembers.ts +++ b/src/gateway/opcodes/RequestGuildMembers.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; export function onRequestGuildMembers(this: WebSocket) { // return this.close(CLOSECODES.Unknown_error); diff --git a/src/gateway/opcodes/Resume.ts b/src/gateway/opcodes/Resume.ts index 92e9e67c8..3e43d648a 100644 --- a/src/gateway/opcodes/Resume.ts +++ b/src/gateway/opcodes/Resume.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; import { Send } from "../util/Send"; export async function onResume(this: WebSocket) { diff --git a/src/gateway/opcodes/VoiceStateUpdate.ts b/src/gateway/opcodes/VoiceStateUpdate.ts index 490831247..ffc143eda 100644 --- a/src/gateway/opcodes/VoiceStateUpdate.ts +++ b/src/gateway/opcodes/VoiceStateUpdate.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Payload, WebSocket } from "@fosscord/gateway"; +import { Payload, WebSocket } from "@spacebar/gateway"; import { genVoiceToken } from "../util/SessionUtils"; import { check } from "./instanceOf"; import { @@ -29,7 +29,7 @@ import { VoiceStateUpdateEvent, VoiceStateUpdateSchema, Region, -} from "@fosscord/util"; +} from "@spacebar/util"; // TODO: check if a voice server is setup // Notice: Bot users respect the voice channel's user limit, if set. diff --git a/src/gateway/opcodes/index.ts b/src/gateway/opcodes/index.ts index d24877f75..cf2338e64 100644 --- a/src/gateway/opcodes/index.ts +++ b/src/gateway/opcodes/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket, Payload } from "@fosscord/gateway"; +import { WebSocket, Payload } from "@spacebar/gateway"; import { onHeartbeat } from "./Heartbeat"; import { onIdentify } from "./Identify"; import { onLazyRequest } from "./LazyRequest"; diff --git a/src/gateway/opcodes/instanceOf.ts b/src/gateway/opcodes/instanceOf.ts index 4ffcaa9ce..39bece16c 100644 --- a/src/gateway/opcodes/instanceOf.ts +++ b/src/gateway/opcodes/instanceOf.ts @@ -17,7 +17,7 @@ */ import { instanceOf } from "lambert-server"; -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; import { CLOSECODES } from "../util/Constants"; export function check(this: WebSocket, schema: unknown, data: unknown) { diff --git a/src/gateway/util/Constants.ts b/src/gateway/util/Constants.ts index 5fe2f1513..5c0f134a6 100644 --- a/src/gateway/util/Constants.ts +++ b/src/gateway/util/Constants.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -// import { VoiceOPCodes } from "@fosscord/webrtc"; +// import { VoiceOPCodes } from "@spacebar/webrtc"; export enum OPCODES { Dispatch = 0, diff --git a/src/gateway/util/Send.ts b/src/gateway/util/Send.ts index 6f1c78e1a..57f87d8b2 100644 --- a/src/gateway/util/Send.ts +++ b/src/gateway/util/Send.ts @@ -16,11 +16,11 @@ along with this program. If not, see . */ -import { Payload, WebSocket } from "@fosscord/gateway"; +import { Payload, WebSocket } from "@spacebar/gateway"; import fs from "fs/promises"; import path from "path"; -import { ErlpackType, JSONReplacer } from "@fosscord/util"; +import { ErlpackType, JSONReplacer } from "@spacebar/util"; let erlpack: ErlpackType | null = null; try { erlpack = require("erlpack") as ErlpackType; diff --git a/src/gateway/util/WebSocket.ts b/src/gateway/util/WebSocket.ts index 65c481425..972129c7c 100644 --- a/src/gateway/util/WebSocket.ts +++ b/src/gateway/util/WebSocket.ts @@ -16,10 +16,10 @@ along with this program. If not, see . */ -import { Intents, ListenEventOpts, Permissions } from "@fosscord/util"; +import { Intents, ListenEventOpts, Permissions } from "@spacebar/util"; import WS from "ws"; import { Deflate, Inflate } from "fast-zlib"; -// import { Client } from "@fosscord/webrtc"; +// import { Client } from "@spacebar/webrtc"; export interface WebSocket extends WS { version: number; diff --git a/src/util/config/types/ApiConfiguration.ts b/src/util/config/types/ApiConfiguration.ts index 03717dcff..4d61521af 100644 --- a/src/util/config/types/ApiConfiguration.ts +++ b/src/util/config/types/ApiConfiguration.ts @@ -19,6 +19,5 @@ export class ApiConfiguration { defaultVersion: string = "9"; activeVersions: string[] = ["6", "7", "8", "9"]; - useFosscordEnhancements: boolean = true; endpointPublic: string = "/api"; } diff --git a/src/util/config/types/GeneralConfiguration.ts b/src/util/config/types/GeneralConfiguration.ts index 53cfea5f8..c20fe9a7b 100644 --- a/src/util/config/types/GeneralConfiguration.ts +++ b/src/util/config/types/GeneralConfiguration.ts @@ -16,12 +16,12 @@ along with this program. If not, see . */ -import { Snowflake } from "@fosscord/util"; +import { Snowflake } from "@spacebar/util"; export class GeneralConfiguration { - instanceName: string = "Fosscord Instance"; + instanceName: string = "Spacebar Instance"; instanceDescription: string | null = - "This is a Fosscord instance made in the pre-release days"; + "This is a Spacebar instance made in the pre-release days"; frontPage: string | null = null; tosPage: string | null = null; correspondenceEmail: string | null = null; diff --git a/src/util/config/types/RegionConfiguration.ts b/src/util/config/types/RegionConfiguration.ts index 2d9ff502b..8cd11fc04 100644 --- a/src/util/config/types/RegionConfiguration.ts +++ b/src/util/config/types/RegionConfiguration.ts @@ -19,12 +19,12 @@ import { Region } from "."; export class RegionConfiguration { - default: string = "fosscord"; + default: string = "spacebar"; useDefaultAsOptimal: boolean = true; available: Region[] = [ { - id: "fosscord", - name: "Fosscord", + id: "spacebar", + name: "spacebar", endpoint: "127.0.0.1:3004", vip: false, custom: false, diff --git a/src/util/entities/AuditLog.ts b/src/util/entities/AuditLog.ts index e47f92fbe..b375f771b 100644 --- a/src/util/entities/AuditLog.ts +++ b/src/util/entities/AuditLog.ts @@ -100,7 +100,7 @@ export enum AuditLogEvents { POLICY_CREATE = 140, POLICY_UPDATE = 141, POLICY_DELETE = 142, - MESSAGE_BLOCKED_BY_POLICIES = 143, // in fosscord, blocked messages are stealth-dropped + MESSAGE_BLOCKED_BY_POLICIES = 143, // in spacebar, blocked messages are stealth-dropped // instance policies affecting the guild GUILD_AFFECTED_BY_POLICIES = 216, // message moves diff --git a/src/util/entities/Emoji.ts b/src/util/entities/Emoji.ts index f1bf2d590..0bc2f4231 100644 --- a/src/util/entities/Emoji.ts +++ b/src/util/entities/Emoji.ts @@ -59,5 +59,5 @@ export class Emoji extends BaseClass { roles: string[]; // roles this emoji is whitelisted to (new discord feature?) @Column({ type: "simple-array", nullable: true }) - groups: string[]; // user groups this emoji is whitelisted to (Fosscord extension) + groups: string[]; // user groups this emoji is whitelisted to (Spacebar extension) } diff --git a/src/util/entities/Guild.ts b/src/util/entities/Guild.ts index b1693838d..e84549865 100644 --- a/src/util/entities/Guild.ts +++ b/src/util/entities/Guild.ts @@ -319,7 +319,7 @@ export class Guild extends BaseClass { const guild = await Guild.create({ id: guild_id, - name: body.name || "Fosscord", + name: body.name || "Spacebar", icon: await handleFile(`/icons/${guild_id}`, body.icon as string), owner_id: body.owner_id, // TODO: need to figure out a way for ownerless guilds and multiply-owned guilds presence_count: 0, @@ -346,7 +346,7 @@ export class Guild extends BaseClass { color: 0, hoist: false, managed: false, - // NB: in Fosscord, every role will be non-managed, as we use user-groups instead of roles for managed groups + // NB: in Spacebar, every role will be non-managed, as we use user-groups instead of roles for managed groups mentionable: false, name: "@everyone", permissions: String("2251804225"), diff --git a/src/util/entities/Invite.ts b/src/util/entities/Invite.ts index e5f2e82ca..3019709f3 100644 --- a/src/util/entities/Invite.ts +++ b/src/util/entities/Invite.ts @@ -86,7 +86,7 @@ export class Invite extends BaseClassWithoutId { @ManyToOne(() => User, { onDelete: "CASCADE", }) - target_user?: string; // could be used for "User specific invites" https://github.com/fosscord/fosscord/issues/62 + target_user?: string; // could be used for "User specific invites" https://github.com/spacebarchat/server/issues/326 @Column({ nullable: true }) target_user_type?: number; diff --git a/src/util/interfaces/Event.ts b/src/util/interfaces/Event.ts index 6913a8152..3a0eadc5a 100644 --- a/src/util/interfaces/Event.ts +++ b/src/util/interfaces/Event.ts @@ -40,7 +40,7 @@ import { UserSettings, IReadyGuildDTO, ReadState, -} from "@fosscord/util"; +} from "@spacebar/util"; export interface Event { guild_id?: string; diff --git a/src/util/schemas/ActivitySchema.ts b/src/util/schemas/ActivitySchema.ts index f1a48f44e..f168f9671 100644 --- a/src/util/schemas/ActivitySchema.ts +++ b/src/util/schemas/ActivitySchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Activity, Status } from "@fosscord/util"; +import { Activity, Status } from "@spacebar/util"; export const ActivitySchema = { $afk: Boolean, diff --git a/src/util/schemas/ChannelModifySchema.ts b/src/util/schemas/ChannelModifySchema.ts index 2f6eb7ae7..088ac4597 100644 --- a/src/util/schemas/ChannelModifySchema.ts +++ b/src/util/schemas/ChannelModifySchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { ChannelPermissionOverwriteType, ChannelType } from "@fosscord/util"; +import { ChannelPermissionOverwriteType, ChannelType } from "@spacebar/util"; export interface ChannelModifySchema { /** diff --git a/src/util/schemas/ChannelPermissionOverwriteSchema.ts b/src/util/schemas/ChannelPermissionOverwriteSchema.ts index 18602300e..6e8b3402a 100644 --- a/src/util/schemas/ChannelPermissionOverwriteSchema.ts +++ b/src/util/schemas/ChannelPermissionOverwriteSchema.ts @@ -16,6 +16,6 @@ along with this program. If not, see . */ -import { ChannelPermissionOverwrite } from "@fosscord/util"; +import { ChannelPermissionOverwrite } from "@spacebar/util"; export type ChannelPermissionOverwriteSchema = ChannelPermissionOverwrite; diff --git a/src/util/schemas/GuildUpdateSchema.ts b/src/util/schemas/GuildUpdateSchema.ts index 8fb4127e9..19316380d 100644 --- a/src/util/schemas/GuildUpdateSchema.ts +++ b/src/util/schemas/GuildUpdateSchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { GuildCreateSchema } from "@fosscord/util"; +import { GuildCreateSchema } from "@spacebar/util"; export interface GuildUpdateSchema extends Omit { diff --git a/src/util/schemas/IdentifySchema.ts b/src/util/schemas/IdentifySchema.ts index d2b716eab..fb48c2a47 100644 --- a/src/util/schemas/IdentifySchema.ts +++ b/src/util/schemas/IdentifySchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { ActivitySchema } from "@fosscord/util"; +import { ActivitySchema } from "@spacebar/util"; // TODO: Need a way to allow camalCase and pascal_case without just duplicating the schema diff --git a/src/util/schemas/MessageCreateSchema.ts b/src/util/schemas/MessageCreateSchema.ts index 5b9254574..45cd735e3 100644 --- a/src/util/schemas/MessageCreateSchema.ts +++ b/src/util/schemas/MessageCreateSchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Embed } from "@fosscord/util"; +import { Embed } from "@spacebar/util"; type Attachment = { id: string; diff --git a/src/util/schemas/RelationshipPutSchema.ts b/src/util/schemas/RelationshipPutSchema.ts index 33f827ebf..36d9877d0 100644 --- a/src/util/schemas/RelationshipPutSchema.ts +++ b/src/util/schemas/RelationshipPutSchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { RelationshipType } from "@fosscord/util"; +import { RelationshipType } from "@spacebar/util"; export interface RelationshipPutSchema { type?: RelationshipType; diff --git a/src/util/schemas/UserGuildSettingsSchema.ts b/src/util/schemas/UserGuildSettingsSchema.ts index 967e29de5..c295f7677 100644 --- a/src/util/schemas/UserGuildSettingsSchema.ts +++ b/src/util/schemas/UserGuildSettingsSchema.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { UserGuildSettings, ChannelOverride } from "@fosscord/util"; +import { UserGuildSettings, ChannelOverride } from "@spacebar/util"; // This sucks. I would use a DeepPartial, my own or typeorms, but they both generate inncorect schema export interface UserGuildSettingsSchema diff --git a/src/util/schemas/UserSettingsSchema.ts b/src/util/schemas/UserSettingsSchema.ts index bad347009..0d23e757f 100644 --- a/src/util/schemas/UserSettingsSchema.ts +++ b/src/util/schemas/UserSettingsSchema.ts @@ -16,6 +16,6 @@ along with this program. If not, see . */ -import { UserSettings } from "@fosscord/util"; +import { UserSettings } from "@spacebar/util"; export type UserSettingsSchema = Omit, "index">; diff --git a/src/util/util/AutoUpdate.ts b/src/util/util/AutoUpdate.ts index 8365d9ae1..1f90a41e5 100644 --- a/src/util/util/AutoUpdate.ts +++ b/src/util/util/AutoUpdate.ts @@ -78,8 +78,8 @@ async function download(url: string, dir: string) { const agent = new ProxyAgent(); const response = await fetch(url, { agent }); const buffer = await response.buffer(); - const tempDir = await fs.mkdtemp("fosscord"); - await fs.writeFile(path.join(tempDir, "Fosscord.zip"), buffer); + const tempDir = await fs.mkdtemp("spacebar"); + await fs.writeFile(path.join(tempDir, "Spacebar.zip"), buffer); } catch (error) { console.error(`[Auto Update] download failed`, error); } diff --git a/src/util/util/Constants.ts b/src/util/util/Constants.ts index 0d1d721e2..d4adb54ec 100644 --- a/src/util/util/Constants.ts +++ b/src/util/util/Constants.ts @@ -1001,9 +1001,9 @@ export const DiscordApiErrors = { }; /** - * An error encountered while performing an API request (Fosscord only). Here are the potential errors: + * An error encountered while performing an API request (Spacebar only). Here are the potential errors: */ -export const FosscordApiErrors = { +export const SpacebarApiErrors = { MANUALLY_TRIGGERED_ERROR: new ApiError( "This is an artificial error", 1, @@ -1101,7 +1101,7 @@ export const FosscordApiErrors = { * The value set for a guild's default message notifications, e.g. `ALL`. Here are the available types: * * ALL * * MENTIONS - * * MUTED (Fosscord extension) + * * MUTED (Spacebar extension) * @typedef {string} DefaultMessageNotifications */ export const DefaultMessageNotifications = ["ALL", "MENTIONS", "MUTED"]; @@ -1110,7 +1110,7 @@ export const DefaultMessageNotifications = ["ALL", "MENTIONS", "MUTED"]; * The value set for a team members's membership state: * * INVITED * * ACCEPTED - * * INSERTED (Fosscord extension) + * * INSERTED (Spacebar extension) * @typedef {string} MembershipStates */ export const MembershipStates = ["INSERTED", "INVITED", "ACCEPTED"]; @@ -1119,7 +1119,7 @@ export const MembershipStates = ["INSERTED", "INVITED", "ACCEPTED"]; * The value set for a webhook's type: * * Incoming * * Channel Follower - * * Custom (Fosscord extension) + * * Custom (Spacebar extension) * @typedef {string} WebhookTypes */ export const WebhookTypes = ["Custom", "Incoming", "Channel Follower"]; diff --git a/src/util/util/Database.ts b/src/util/util/Database.ts index e23bb8954..a6b24b3e3 100644 --- a/src/util/util/Database.ts +++ b/src/util/util/Database.ts @@ -83,7 +83,7 @@ export async function initDatabase(): Promise { "[Database]" + red( ` We don't have migrations for DB type '${DatabaseType}'` + - ` To ignore, set DB_SYNC=true in your env. https://docs.fosscord.com/setup/server/configuration/env/`, + ` To ignore, set DB_SYNC=true in your env. https://docs.spacebar.chat/setup/server/configuration/env/`, ), ); process.exit(); diff --git a/src/util/util/MessageFlags.ts b/src/util/util/MessageFlags.ts index 35ba9e2ac..b2ea41d0d 100644 --- a/src/util/util/MessageFlags.ts +++ b/src/util/util/MessageFlags.ts @@ -9,9 +9,9 @@ export class MessageFlags extends BitField { CROSSPOSTED: BigInt(1) << BigInt(0), IS_CROSSPOST: BigInt(1) << BigInt(1), SUPPRESS_EMBEDS: BigInt(1) << BigInt(2), - // SOURCE_MESSAGE_DELETED: BigInt(1) << BigInt(3), // fosscord will delete them from destination too, making this redundant + // SOURCE_MESSAGE_DELETED: BigInt(1) << BigInt(3), // spacebar will delete them from destination too, making this redundant URGENT: BigInt(1) << BigInt(4), - // HAS_THREAD: BigInt(1) << BigInt(5) // does not apply to fosscord due to infrastructural differences + // HAS_THREAD: BigInt(1) << BigInt(5) // does not apply to spacebar due to infrastructural differences PRIVATE_ROUTE: BigInt(1) << BigInt(6), // it that has been routed to only some of the users that can see the channel INTERACTION_WAIT: BigInt(1) << BigInt(7), // discord.com calls this LOADING // FAILED_TO_MENTION_SOME_ROLES_IN_THREAD: BigInt(1) << BigInt(8) diff --git a/src/util/util/Token.ts b/src/util/util/Token.ts index 50e63c5fc..903101764 100644 --- a/src/util/util/Token.ts +++ b/src/util/util/Token.ts @@ -69,7 +69,7 @@ export function checkToken( token = token.replace("Bot ", ""); token = token.replace("Bearer ", ""); /** - in fosscord, even with instances that have bot distinction; we won't enforce "Bot" prefix, + in spacebar, even with instances that have bot distinction; we won't enforce "Bot" prefix, as we don't really have separate pathways for bots **/ diff --git a/src/util/util/email/transports/MailGun.ts b/src/util/util/email/transports/MailGun.ts index f65295185..badc98801 100644 --- a/src/util/util/email/transports/MailGun.ts +++ b/src/util/util/email/transports/MailGun.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import nodemailer from "nodemailer"; export default async function () { diff --git a/src/util/util/email/transports/MailJet.ts b/src/util/util/email/transports/MailJet.ts index 336fa97a6..69be7acfe 100644 --- a/src/util/util/email/transports/MailJet.ts +++ b/src/util/util/email/transports/MailJet.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import nodemailer from "nodemailer"; export default async function () { diff --git a/src/util/util/email/transports/SMTP.ts b/src/util/util/email/transports/SMTP.ts index a6e06e529..5b43a8705 100644 --- a/src/util/util/email/transports/SMTP.ts +++ b/src/util/util/email/transports/SMTP.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import nodemailer from "nodemailer"; export default async function () { diff --git a/src/util/util/email/transports/SendGrid.ts b/src/util/util/email/transports/SendGrid.ts index 1d2e366ce..a863d3ec7 100644 --- a/src/util/util/email/transports/SendGrid.ts +++ b/src/util/util/email/transports/SendGrid.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Config } from "@fosscord/util"; +import { Config } from "@spacebar/util"; import nodemailer from "nodemailer"; export default async function () { diff --git a/src/webrtc/Server.ts b/src/webrtc/Server.ts index 8b86236ef..0ba2e41b2 100644 --- a/src/webrtc/Server.ts +++ b/src/webrtc/Server.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { closeDatabase, Config, initDatabase, initEvent } from "@fosscord/util"; +import { closeDatabase, Config, initDatabase, initEvent } from "@spacebar/util"; import dotenv from "dotenv"; import http from "http"; import ws from "ws"; diff --git a/src/webrtc/events/Close.ts b/src/webrtc/events/Close.ts index ba2a31422..7b71e9ce5 100644 --- a/src/webrtc/events/Close.ts +++ b/src/webrtc/events/Close.ts @@ -16,8 +16,8 @@ along with this program. If not, see . */ -import { WebSocket } from "@fosscord/gateway"; -import { Session } from "@fosscord/util"; +import { WebSocket } from "@spacebar/gateway"; +import { Session } from "@spacebar/util"; export async function onClose(this: WebSocket, code: number, reason: string) { console.log("[WebRTC] closed", code, reason.toString()); diff --git a/src/webrtc/events/Connection.ts b/src/webrtc/events/Connection.ts index d8b4d6830..6c5bab030 100644 --- a/src/webrtc/events/Connection.ts +++ b/src/webrtc/events/Connection.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { CLOSECODES, Send, setHeartbeat, WebSocket } from "@fosscord/gateway"; +import { CLOSECODES, Send, setHeartbeat, WebSocket } from "@spacebar/gateway"; import { IncomingMessage } from "http"; import { URL } from "url"; import WS from "ws"; diff --git a/src/webrtc/events/Message.ts b/src/webrtc/events/Message.ts index dac9095e5..22189e95b 100644 --- a/src/webrtc/events/Message.ts +++ b/src/webrtc/events/Message.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { CLOSECODES, Payload, WebSocket } from "@fosscord/gateway"; +import { CLOSECODES, Payload, WebSocket } from "@spacebar/gateway"; import { Tuple } from "lambert-server"; import OPCodeHandlers from "../opcodes"; import { VoiceOPCodes } from "../util"; diff --git a/src/webrtc/opcodes/BackendVersion.ts b/src/webrtc/opcodes/BackendVersion.ts index b466c3000..60de3e58d 100644 --- a/src/webrtc/opcodes/BackendVersion.ts +++ b/src/webrtc/opcodes/BackendVersion.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Payload, Send, WebSocket } from "@fosscord/gateway"; +import { Payload, Send, WebSocket } from "@spacebar/gateway"; import { VoiceOPCodes } from "../util"; export async function onBackendVersion(this: WebSocket, data: Payload) { diff --git a/src/webrtc/opcodes/Heartbeat.ts b/src/webrtc/opcodes/Heartbeat.ts index 95e991ad2..3d8e187b4 100644 --- a/src/webrtc/opcodes/Heartbeat.ts +++ b/src/webrtc/opcodes/Heartbeat.ts @@ -22,7 +22,7 @@ import { Send, setHeartbeat, WebSocket, -} from "@fosscord/gateway"; +} from "@spacebar/gateway"; import { VoiceOPCodes } from "../util"; export async function onHeartbeat(this: WebSocket, data: Payload) { diff --git a/src/webrtc/opcodes/Identify.ts b/src/webrtc/opcodes/Identify.ts index 9a9904df4..3f65127e1 100644 --- a/src/webrtc/opcodes/Identify.ts +++ b/src/webrtc/opcodes/Identify.ts @@ -16,13 +16,13 @@ along with this program. If not, see . */ -import { CLOSECODES, Payload, Send, WebSocket } from "@fosscord/gateway"; +import { CLOSECODES, Payload, Send, WebSocket } from "@spacebar/gateway"; import { validateSchema, VoiceIdentifySchema, VoiceState, -} from "@fosscord/util"; -import { endpoint, getClients, VoiceOPCodes, PublicIP } from "@fosscord/webrtc"; +} from "@spacebar/util"; +import { endpoint, getClients, VoiceOPCodes, PublicIP } from "@spacebar/webrtc"; import SemanticSDP from "semantic-sdp"; const defaultSDP = require("./sdp.json"); diff --git a/src/webrtc/opcodes/SelectProtocol.ts b/src/webrtc/opcodes/SelectProtocol.ts index 798a1046e..6618d83b4 100644 --- a/src/webrtc/opcodes/SelectProtocol.ts +++ b/src/webrtc/opcodes/SelectProtocol.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Payload, Send, WebSocket } from "@fosscord/gateway"; -import { SelectProtocolSchema, validateSchema } from "@fosscord/util"; -import { endpoint, PublicIP, VoiceOPCodes } from "@fosscord/webrtc"; +import { Payload, Send, WebSocket } from "@spacebar/gateway"; +import { SelectProtocolSchema, validateSchema } from "@spacebar/util"; +import { endpoint, PublicIP, VoiceOPCodes } from "@spacebar/webrtc"; import SemanticSDP, { MediaInfo, SDPInfo } from "semantic-sdp"; export async function onSelectProtocol(this: WebSocket, payload: Payload) { diff --git a/src/webrtc/opcodes/Speaking.ts b/src/webrtc/opcodes/Speaking.ts index dbdbcdaaa..97055e0a2 100644 --- a/src/webrtc/opcodes/Speaking.ts +++ b/src/webrtc/opcodes/Speaking.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Payload, Send, WebSocket } from "@fosscord/gateway"; +import { Payload, Send, WebSocket } from "@spacebar/gateway"; import { getClients, VoiceOPCodes } from "../util"; // {"speaking":1,"delay":5,"ssrc":2805246727} diff --git a/src/webrtc/opcodes/Video.ts b/src/webrtc/opcodes/Video.ts index 8fd6a9e33..3228d4eed 100644 --- a/src/webrtc/opcodes/Video.ts +++ b/src/webrtc/opcodes/Video.ts @@ -16,9 +16,9 @@ along with this program. If not, see . */ -import { Payload, Send, WebSocket } from "@fosscord/gateway"; -import { validateSchema, VoiceVideoSchema } from "@fosscord/util"; -import { channels, getClients, VoiceOPCodes } from "@fosscord/webrtc"; +import { Payload, Send, WebSocket } from "@spacebar/gateway"; +import { validateSchema, VoiceVideoSchema } from "@spacebar/util"; +import { channels, getClients, VoiceOPCodes } from "@spacebar/webrtc"; import { IncomingStreamTrack, SSRCs } from "medooze-media-server"; import SemanticSDP from "semantic-sdp"; diff --git a/src/webrtc/opcodes/index.ts b/src/webrtc/opcodes/index.ts index f0ee23c46..346810556 100644 --- a/src/webrtc/opcodes/index.ts +++ b/src/webrtc/opcodes/index.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { Payload, WebSocket } from "@fosscord/gateway"; +import { Payload, WebSocket } from "@spacebar/gateway"; import { VoiceOPCodes } from "../util"; import { onBackendVersion } from "./BackendVersion"; import { onHeartbeat } from "./Heartbeat"; diff --git a/src/webrtc/util/MediaServer.ts b/src/webrtc/util/MediaServer.ts index fcc1375d0..0c12876c6 100644 --- a/src/webrtc/util/MediaServer.ts +++ b/src/webrtc/util/MediaServer.ts @@ -16,7 +16,7 @@ along with this program. If not, see . */ -import { WebSocket } from "@fosscord/gateway"; +import { WebSocket } from "@spacebar/gateway"; import MediaServer, { IncomingStream, OutgoingStream, diff --git a/tsconfig.json b/tsconfig.json index cecccc55f..63b5e96cb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -34,10 +34,10 @@ "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */, "baseUrl": "./src/", "paths": { - "@fosscord/api*": ["./api"], - "@fosscord/gateway*": ["./gateway"], - "@fosscord/cdn*": ["./cdn"], - "@fosscord/util*": ["./util"] + "@spacebar/api*": ["./api"], + "@spacebar/gateway*": ["./gateway"], + "@spacebar/cdn*": ["./cdn"], + "@spacebar/util*": ["./util"] } /* Specify a set of entries that re-map imports to additional lookup locations. */, // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */