diff options
| author | Erkin Alp Güney <erkinalp9035@gmail.com> | 2022-04-18 21:22:51 +0300 |
|---|---|---|
| committer | Erkin Alp Güney <erkinalp9035@gmail.com> | 2022-04-18 21:22:51 +0300 |
| commit | e7461aba3ca7249d3e38ba0df952c9ff620d445d (patch) | |
| tree | f8f86764c5083ad0c39bf686158063661b7c3c45 | |
| parent | get single message && message rights enforcement (diff) | |
| parent | Unified ghost instead of separate ghosts (diff) | |
| download | server-e7461aba3ca7249d3e38ba0df952c9ff620d445d.tar.xz | |
Merge branch 'master' of https://github.com/fosscord/fosscord-server
| -rw-r--r-- | api/src/routes/channels/#channel_id/messages/index.ts | 2 | ||||
| -rw-r--r-- | util/src/util/Email.ts | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/api/src/routes/channels/#channel_id/messages/index.ts b/api/src/routes/channels/#channel_id/messages/index.ts index 4cfaf247..af0ae32d 100644 --- a/api/src/routes/channels/#channel_id/messages/index.ts +++ b/api/src/routes/channels/#channel_id/messages/index.ts @@ -120,7 +120,7 @@ router.get("/", async (req: Request, res: Response) => { delete x.user_ids; }); // @ts-ignore - if (!x.author) x.author = { discriminator: "0000", username: "Deleted User", public_flags: "0", avatar: null }; + if (!x.author) x.author = { id: "4", discriminator: "0000", username: "Fosscord Ghost", public_flags: "0", avatar: null }; x.attachments?.forEach((y: any) => { // dynamically set attachment proxy_url in case the endpoint changed const uri = y.proxy_url.startsWith("http") ? y.proxy_url : `https://example.org${y.proxy_url}`; diff --git a/util/src/util/Email.ts b/util/src/util/Email.ts index b1a7599b..6885da33 100644 --- a/util/src/util/Email.ts +++ b/util/src/util/Email.ts @@ -13,7 +13,12 @@ export function adjustEmail(email?: string): string | undefined { // TODO: check accounts with uncommon email domains if (domain === "gmail.com" || domain === "googlemail.com") { // replace .dots and +alternatives -> Gmail Dot Trick https://support.google.com/mail/answer/7436150 and https://generator.email/blog/gmail-generator - return user.replace(/[.]|(\+.*)/g, "") + "@gmail.com"; + let v = user.replace(/[.]|(\+.*)/g, "") + "@gmail.com"; + } + + if (domain === "google.com") { + // replace .dots and +alternatives -> Google Staff GMail Dot Trick + let v = user.replace(/[.]|(\+.*)/g, "") + "@google.com"; } return email; |