forked from spacebarchat/server
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge master into feat/webhooks-updated
- Loading branch information
1 parent
6be3714
commit 1fea5c4
Showing
140 changed files
with
119,905 additions
and
11,850 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # Nix stuff is owned by Rory& - we& want to be notified if these are changed. | ||
| /flake.nix [email protected] | ||
| /nix-update.sh [email protected] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| name: Nix build | ||
|
|
||
| on: | ||
| push: | ||
| pull_request: | ||
|
|
||
| jobs: | ||
| build-nix: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: cachix/install-nix-action@v25 | ||
| with: | ||
| nix_path: nixpkgs=channel:nixos-unstable | ||
| - uses: DeterminateSystems/magic-nix-cache-action@v2 | ||
| - run: nix build -L | ||
| - run: nix develop --command echo OK |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,4 +18,5 @@ build | |
| *.log.ansi | ||
| *.tmp | ||
| tmp/ | ||
| dump/ | ||
| dump/ | ||
| result | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,28 @@ | ||
| #!/usr/bin/env sh | ||
| . "$(dirname -- "$0")/_/husky.sh" | ||
| #!nix-shell -i "bash" -p bash prefetch-npm-deps jq nodejs nix-output-monitor | ||
| #. "$(dirname -- "$0")/_/husky.sh" | ||
|
|
||
| npx -y lint-staged | ||
| # Check if nix is available | ||
| if [ -x "$(/usr/bin/env which nix-shell 2>/dev/null)" ]; then | ||
| # Check if we haven't re-executed ourselves yet | ||
| if [ ! "$HOOK_NIX_SHELL" ]; then | ||
| echo "Nix is available, updating nix flake..." | ||
| export HOOK_NIX_SHELL=1 | ||
| nix-shell $0 | ||
| exit $? | ||
| else | ||
| nix flake update | ||
| # run ./nix-update.sh if package lock has changed and has no unstaged changes | ||
| if [ -n "$(git status --porcelain=v1 2>/dev/null | grep -E '^(MM| M) package-lock.json')" ]; then | ||
| echo "package-lock.json has unstaged changes. Skipping update of nix dependencies." | ||
| elif [ ! -n "$(git status --porcelain=v1 2>/dev/null | grep -E '^M package-lock.json')" ]; then | ||
| echo "package-lock.json has no changes. Skipping update of nix dependencies." | ||
| else | ||
| ./nix-update.sh || exit $? | ||
| fi | ||
| fi | ||
| else | ||
| echo "You do not appear to have nix installed. Skipping update of nix dependencies." | ||
| fi | ||
|
|
||
| #npx -y lint-staged |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,102 +1,120 @@ | ||
| <!DOCTYPE html> | ||
| <!doctype html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <meta http-equiv="Content-Type" content="text/html charset=UTF-8" /> | ||
| <title>Verify {instanceName} Login from New Location</title> | ||
|
|
||
| <head> | ||
| <meta charset="UTF-8" /> | ||
| <meta http-equiv="X-UA-Compatible" content="IE=edge" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
| <meta http-equiv="Content-Type" content="text/html charset=UTF-8" /> | ||
| <title>Verify {instanceName} Login from New Location</title> | ||
| <style> | ||
| * { | ||
| font-size: 16px; | ||
| line-height: 24px; | ||
| font-family: Arial, Helvetica, sans-serif; | ||
| } | ||
|
|
||
| <style> | ||
| * { | ||
| font-size: 16px; | ||
| line-height: 24px; | ||
| font-family: Arial, Helvetica, sans-serif; | ||
| } | ||
| p { | ||
| color: white; | ||
| } | ||
|
|
||
| p { | ||
| color: white; | ||
| } | ||
| .ExternalClass { | ||
| width: 100%; | ||
| } | ||
| </style> | ||
| </head> | ||
|
|
||
| .ExternalClass { | ||
| width: 100%; | ||
| } | ||
| </style> | ||
| </head> | ||
|
|
||
| <body> | ||
| <div style="background-color: #202225;"> | ||
| <img src="https://raw.githubusercontent.com/spacebarchat/spacebarchat/master/branding/svg/Spacebar__Logo-Blue.svg" | ||
| alt="Branding" style=" | ||
| <body> | ||
| <div style="background-color: #202225"> | ||
| <img | ||
| src="https://raw.githubusercontent.com/spacebarchat/spacebarchat/master/branding/svg/Spacebar__Logo-Blue.svg" | ||
| alt="Branding" | ||
| style=" | ||
| width: 100%; | ||
| max-width: 200px; | ||
| margin: 0 auto; | ||
| display: block; | ||
| padding: 20px; | ||
| " /> | ||
| <div style=" | ||
| " | ||
| /> | ||
| <div | ||
| style=" | ||
| width: 100%; | ||
| max-width: 500px; | ||
| margin: 0 auto; | ||
| padding: 40px 50px; | ||
| background-color: #32353b; | ||
| border-radius: 5px; | ||
| "> | ||
| <p style=" | ||
| " | ||
| > | ||
| <p | ||
| style=" | ||
| font-weight: 600; | ||
| font-size: 20px; | ||
| letter-spacing: 0.27px; | ||
| line-height: 24px; | ||
| "> | ||
| Hey {userUsername}, | ||
| </p> | ||
| <p> | ||
| It looks like someone tried to log into your {instanceName} | ||
| account from a new location. If this is you, follow the link | ||
| below to authorize logging in from this location on your | ||
| account. If this isn't you, we suggest changing your | ||
| password as soon as possible. | ||
| </p> | ||
| <p> | ||
| <strong>IP Address:</strong> {ipAddress} | ||
| <br /> | ||
| <strong>Location:</strong> {locationCity}, {locationRegion}, | ||
| {locationCountryName} | ||
| </p> | ||
| <div> | ||
| <div style=" | ||
| " | ||
| > | ||
| Hey {userUsername}, | ||
| </p> | ||
| <p> | ||
| It looks like someone tried to log into your {instanceName} | ||
| account from a new location. If this is you, follow the link | ||
| below to authorize logging in from this location on your | ||
| account. If this isn't you, we suggest changing your | ||
| password as soon as possible. | ||
| </p> | ||
| <p> | ||
| <strong>IP Address:</strong> {ipAddress} | ||
| <br /> | ||
| <strong>Location:</strong> {locationCity}, {locationRegion}, | ||
| {locationCountryName} | ||
| </p> | ||
| <div> | ||
| <div | ||
| style=" | ||
| text-align: center; | ||
| justify-content: center; | ||
| padding-bottom: 10px; | ||
| "> | ||
| <a href="{actionUrl}" target="_blank" style=" | ||
| " | ||
| > | ||
| <a | ||
| href="{actionUrl}" | ||
| target="_blank" | ||
| style=" | ||
| font-size: 15px; | ||
| border: none; | ||
| border-radius: 3px; | ||
| text-decoration: none; | ||
| color: white; | ||
| cursor: pointer; | ||
| padding: 15px 19px; | ||
| background-color: #0185ff; | ||
| border-radius: 5px; | ||
| ">Verify Login</a> | ||
| </div> | ||
| <hr /> | ||
| <div style=" | ||
| " | ||
| >Verify Login</a | ||
| > | ||
| </div> | ||
| <hr /> | ||
| <div | ||
| style=" | ||
| text-align: center; | ||
| justify-content: center; | ||
| padding-bottom: 10px; | ||
| "> | ||
| <p> | ||
| Alternatively, you can directly paste this link into | ||
| your browser: | ||
| </p> | ||
| <a href="{actionUrl}" target="_blank" style="word-wrap: break-word;">{actionUrl}</a> | ||
| " | ||
| > | ||
| <p> | ||
| Alternatively, you can directly paste this link into | ||
| your browser: | ||
| </p> | ||
| <a | ||
| href="{actionUrl}" | ||
| target="_blank" | ||
| style="word-wrap: break-word" | ||
| >{actionUrl}</a | ||
| > | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </body> | ||
|
|
||
| </html> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.