diff --git a/module.nix b/module.nix index a01d508..0c19981 100644 --- a/module.nix +++ b/module.nix @@ -9,7 +9,7 @@ enable = lib.mkEnableOption "jank client"; package = lib.mkOption { description = "jank client package"; - default = pkgs.callPackage ./package.nix {}; + default = pkg; type = lib.types.package; }; port = lib.mkOption { @@ -21,7 +21,8 @@ }; config = lib.mkIf config.services.jank-client.enable { environment.systemPackages = [ - config.services.jank-client.package + (lib.getExe + config.services.jank-client.package) ]; virtualisation.docker = { enable = true; @@ -79,7 +80,7 @@ TimeoutSec = 300; }; script = '' - cd ${config.services.jank-client.package}/src + cd ${pkgs.callPackage config.services.jank-client.package {}}/src docker build -t compose2nix/jank-client-jank . ''; }; diff --git a/package.nix b/package.nix index 168cba8..d0de379 100644 --- a/package.nix +++ b/package.nix @@ -1,26 +1,18 @@ { stdenv, compose2nix, - git, ... }: stdenv.mkDerivation { name = "jank-client"; src = ./.; nativeBuildInputs = [ - git compose2nix ]; buildPhase = '' echo "#!/usr/bin/env bash" > start-server echo "systemctl start docker-build-jank-client-jank.service" >> start-server echo "systemctl restart docker-jank-client-jank.service" >> start-server - chmod a+x start-server - git init - git add -A - git config user.name "name" - git config user.email "name@url" - git commit -m "init" ''; installPhase = '' mkdir $out/bin -p @@ -28,9 +20,4 @@ stdenv.mkDerivation { cp start-server $out/bin/jank-client cp . $out/src -r ''; - meta = { - mainProgram = "jank-client"; - description = "jank-client"; - homepage = "https://git.mtgmonkey.net/jank-client-fork.git"; - }; } diff --git a/src/webpage/app.html b/src/webpage/app.html index 94081ef..6321f79 100644 --- a/src/webpage/app.html +++ b/src/webpage/app.html @@ -6,9 +6,9 @@ name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" /> - Jankfork - - + Jank Client + + @@ -32,7 +32,7 @@
-

Andromeda's Jank Client Fork is loading

+

Jank Client is loading

This shouldn't take long

Switch Accounts

diff --git a/src/webpage/home.html b/src/webpage/home.html index 11f04ec..c681998 100644 --- a/src/webpage/home.html +++ b/src/webpage/home.html @@ -3,10 +3,10 @@ - Jankfork - - - + Jank Client + + + @@ -25,21 +25,16 @@
- - + Github Open Client - Fork@Git - Original@Github
-

Welcome to Andromeda's Jank Client!

-
-

Instances:

+

Spacebar-Compatible Instances:

-
diff --git a/src/webpage/home.ts b/src/webpage/home.ts index ed362e9..e3c481d 100644 --- a/src/webpage/home.ts +++ b/src/webpage/home.ts @@ -8,48 +8,48 @@ const serverbox = document.getElementById("instancebox") as HTMLDivElement; await I18n.done; const openClient = document.getElementById("openClient"); const welcomeJank = document.getElementById("welcomeJank"); -// const box1title = document.getElementById("box1title"); -// const box1Items = document.getElementById("box1Items"); + const box1title = document.getElementById("box1title"); + const box1Items = document.getElementById("box1Items"); const compatableInstances = document.getElementById("compatableInstances"); -// const box3title = document.getElementById("box3title"); -// const box3description = document.getElementById("box3description"); + const box3title = document.getElementById("box3title"); + const box3description = document.getElementById("box3description"); -// const box4title = document.getElementById("box4title"); -// const box4description = document.getElementById("box4description"); -// const translate = document.getElementById("translate"); + const box4title = document.getElementById("box4title"); + const box4description = document.getElementById("box4description"); + const translate = document.getElementById("translate"); if ( openClient && welcomeJank && - compatableInstances -// box3title && -// box3description && -// box1title && -// box1Items && -// box4title && -// box4description && -// translate + compatableInstances && + box3title && + box3description && + box1title && + box1Items && + box4title && + box4description && + translate ) { openClient.textContent = I18n.getTranslation("htmlPages.openClient"); welcomeJank.textContent = I18n.getTranslation("htmlPages.welcomeJank"); -// box1title.textContent = I18n.getTranslation("htmlPages.box1title"); + box1title.textContent = I18n.getTranslation("htmlPages.box1title"); compatableInstances.textContent = I18n.getTranslation("htmlPages.compatableInstances"); -// box3title.textContent = I18n.getTranslation("htmlPages.box3title"); -// box3description.textContent = I18n.getTranslation("htmlPages.box3description"); + box3title.textContent = I18n.getTranslation("htmlPages.box3title"); + box3description.textContent = I18n.getTranslation("htmlPages.box3description"); -// box4title.textContent = I18n.htmlPages.transTitle(); -// box4title.textContent = I18n.htmlPages.transDesc(); -// box4title.textContent = I18n.htmlPages.trans(); + box4title.textContent = I18n.htmlPages.transTitle(); + box4title.textContent = I18n.htmlPages.transDesc(); + box4title.textContent = I18n.htmlPages.trans(); -/* const items = I18n.getTranslation("htmlPages.box1Items").split("|"); + const items = I18n.getTranslation("htmlPages.box1Items").split("|"); let i = 0; //@ts-ignore ts is being dumb here for (const item of box1Items.children) { (item as HTMLElement).textContent = items[i]; i++; - } */ + } } else { -/* console.error( + console.error( openClient, welcomeJank, compatableInstances, @@ -57,7 +57,7 @@ const serverbox = document.getElementById("instancebox") as HTMLDivElement; box3description, box1title, box1Items, - ); */ + ); } })(); diff --git a/src/webpage/instances.json b/src/webpage/instances.json index 4503e38..455f768 100644 --- a/src/webpage/instances.json +++ b/src/webpage/instances.json @@ -1,14 +1,34 @@ [ - { - "name": "Andromeda's Instance", - "description": "The bestest Spacebar instance.", + { + "name": "Spacebar", + "description": "The official Spacebar instance.", "image": "https://raw.githubusercontent.com/spacebarchat/spacebarchat/master/branding/png/Spacebar__Icon-Discord.png", - "urls": { - "wellknown": "https://spacebar-api.mtgmonkey.net", - "api": "https://spacebar-api.mtgmonkey.net/api/v9", - "cdn": "https://spacebar-api.mtgmonkey.net", - "gateway": "wss://spacebar-api.mtgmonkey.net" - }, - "url": "https://spacebar-api.mtgmonkey.net" - } -] + "urls": { + "wellknown": "https://spacebar.chat/", + "api": "https://old.server.spacebar.chat/api", + "cdn": "https://cdn.old.server.spacebar.chat", + "gateway": "wss://gateway.old.server.spacebar.chat" + }, + "url": "https://spacebar.chat" + }, + { + "name": "Fastbar", + "description": "The best Spacebar instance with 95% uptime, running under on a NVME drive running with bleeding edge stuff <3", + "image": "https://spacebar.greysilly7.xyz/logo.png", + "url": "https://greysilly7.xyz", + "language": "en", + "country": "US", + "display": true, + "urls": { + "wellknown": "https://greysilly7.xyz", + "api": "https://api-spacebar.greysilly7.xyz/api", + "cdn": "https://cdn-spacebar.greysilly7.xyz", + "gateway": "wss://gateway-spacebar.greysilly7.xyz" + }, + "contactInfo": { + "dicord": "greysilly7", + "github": "https://github.com/greysilly7", + "email": "greysilly7@gmail.com" + } + } +] \ No newline at end of file diff --git a/src/webpage/invite.html b/src/webpage/invite.html index b10ae8d..3199aaf 100644 --- a/src/webpage/invite.html +++ b/src/webpage/invite.html @@ -3,7 +3,7 @@ - Jankfork + Jank Client @@ -27,8 +27,8 @@

Server Name

-

Invite loading... Refresh in a few seconds if it doesn't load

- +

Someone invited you to Server Name

+
diff --git a/src/webpage/invite.ts b/src/webpage/invite.ts index 08931fe..55d6dce 100644 --- a/src/webpage/invite.ts +++ b/src/webpage/invite.ts @@ -60,7 +60,6 @@ import {getBulkUsers, Specialuser} from "./utils/utils.js"; json.inviter.username, guildjson.name, ); - document.getElementById("AcceptInvite")!.textContent = "Accept Invite" if (guildjson.icon) { const img = document.createElement("img"); img.src = `${urls!.cdn}/icons/${guildjson.id}/${guildjson.icon}.png`; diff --git a/src/webpage/login.html b/src/webpage/login.html index f8339c3..528d193 100644 --- a/src/webpage/login.html +++ b/src/webpage/login.html @@ -3,9 +3,9 @@ - Jankfork - - + Jank Client + + diff --git a/src/webpage/register.html b/src/webpage/register.html index 763809a..f0eb204 100644 --- a/src/webpage/register.html +++ b/src/webpage/register.html @@ -3,9 +3,9 @@ - Jankfork - - + Jank Client + + diff --git a/src/webpage/register.ts b/src/webpage/register.ts index da67a1a..b2b0516 100644 --- a/src/webpage/register.ts +++ b/src/webpage/register.ts @@ -11,7 +11,7 @@ export async function makeRegister(trasparentBg = false, instance = "") { (info) => { const api = info.login + (info.login.startsWith("/") ? "/" : ""); form.fetchURL = api + "/auth/register"; -// tosLogic(md); + tosLogic(md); }, {instance}, ); @@ -52,25 +52,24 @@ export async function makeRegister(trasparentBg = false, instance = "") { const user = form.addTextInput(I18n.htmlPages.userField(), "username"); const p1 = form.addTextInput(I18n.htmlPages.pwField(), "password", {password: true}); const p2 = form.addTextInput(I18n.htmlPages.pw2Field(), "password2", {password: true}); - form.addDateInput(I18n.htmlPages.dobField(), "date_of_birth"); + form.addDateInput(I18n.htmlPages.dobField(), "date_of_birth"); form.addPreprocessor((e) => { if (p1.value !== p2.value) { throw new FormError(p2, I18n.localuser.PasswordsNoMatch()); } //@ts-expect-error it's there delete e.password2; -// if (!check.checked) throw new FormError(checkbox, I18n.register.tos()); + if (!check.checked) throw new FormError(checkbox, I18n.register.tos()); //@ts-expect-error it's there -// e.consent = check.checked; - e.consent = true; + e.consent = check.checked; }); -/* const toshtml = document.createElement("div"); + const toshtml = document.createElement("div"); const md = document.createElement("span"); const check = document.createElement("input"); check.type = "checkbox"; toshtml.append(md, check); - const checkbox = form.addHTMLArea(toshtml); */ + const checkbox = form.addHTMLArea(toshtml); form.addCaptcha(); const a = document.createElement("a"); a.onclick = () => { @@ -88,7 +87,7 @@ async function tosLogic(box: HTMLElement) { const data = await response.json(); const tosPage = data.instance.tosPage; if (!box) return; - if (tosPage) { + if (tosPage) { box.innerHTML = ""; box.append(new MarkDown(I18n.getTranslation("register.agreeTOS", tosPage)).makeHTML()); } else { diff --git a/src/webpage/reset.html b/src/webpage/reset.html index 132d767..8da1f5b 100644 --- a/src/webpage/reset.html +++ b/src/webpage/reset.html @@ -3,9 +3,9 @@ - Jankfork - - + Jank Client + + diff --git a/src/webpage/settings.ts b/src/webpage/settings.ts index 5c65abc..0ebaa3c 100644 --- a/src/webpage/settings.ts +++ b/src/webpage/settings.ts @@ -1562,7 +1562,7 @@ class Form implements OptionsElement { this.names.set(formName, emoji); return emoji; } - addDateInput(label: string, formName: string, {initText = "1900-01-01", required = false} = {}) { + addDateInput(label: string, formName: string, {initText = "", required = false} = {}) { const dateInput = this.options.addDateInput(label, (_) => {}, { initText, }); @@ -1620,7 +1620,7 @@ class Form implements OptionsElement { addOptions(name: string, {ltr = false, noSubmit = false} = {}) { return this.options.addOptions(name, {ltr, noSubmit}); } - addCheckboxInput(label: string, formName: string, {initState = true, required = false} = {}) { + addCheckboxInput(label: string, formName: string, {initState = false, required = false} = {}) { const box = this.options.addCheckboxInput(label, (_) => {}, {initState}); this.names.set(formName, box); if (required) { diff --git a/src/webpage/template.html b/src/webpage/template.html index 7b14bf9..3a88eb1 100644 --- a/src/webpage/template.html +++ b/src/webpage/template.html @@ -3,7 +3,7 @@ - Jankfork + Jank Client diff --git a/translations/en.json b/translations/en.json index 2f5a6e9..6b659d9 100644 --- a/translations/en.json +++ b/translations/en.json @@ -1,7 +1,7 @@ { "@metadata": { - "authors": ["MathMan05", "Andromeda"], - "last-updated": "2025/10/06", + "authors": ["MathMan05"], + "last-updated": "2024/15/24", "locale": "en", "comment": "Don't know how often I'll update this top part lol" }, @@ -218,7 +218,7 @@ "htmlPages": { "idpermissions": "This will allow the bot to:", "addBot": "Add to server", - "loadingText": "Jankfork is loading", + "loadingText": "Jank Client is loading", "loaddesc": "This shouldn't take long", "switchaccounts": "Switch Accounts", "instanceField": "Instance:", @@ -232,10 +232,10 @@ "createAccount": "Create account", "alreadyHave": "Already have an account?", "openClient": "Open Client", - "welcomeJank": "Welcome to Andromeda's Jank Client Fork", + "welcomeJank": "Welcome to Jank Client", "box1title": "Jank Client is a Spacebar-compatible client seeking to be as good as it can be with many features including:", "box1Items": "Direct Messaging|Reactions support|Invites|Account switching|User settings|Developer portal|Bot invites|Translation support", - "compatableInstances": "Instances:", + "compatableInstances": "Spacebar-Compatible Instances:", "box3title": "Contribute to Jank Client", "box3description": "We always appreciate some help, whether that be in the form of bug reports, or code, or even just pointing out some typos.", "trans": "Translate", @@ -329,7 +329,7 @@ "INVITES_DISABLED": "Invite only", "DISCOVERABLE": "Discovery" }, - "welcomeMessages": "Welcome $1! Nice to see ya!\nHello, nice to meet you $1!\nWelcome, hope you brought pizza $1!", + "welcomeMessages": "Welcome $1! Nice to see ya!\nHello, nice to meat you $1!\nWelcome, hope you brought pizza $1!", "role": { "displaySettings": "Display settings", "name": "Role name:", @@ -341,7 +341,7 @@ "confirmDelete": "Are you sure you want to delete $1?" }, "settings": { - "unsaved": "Unsaved changes will be deleted.", + "unsaved": "Careful, you have unsaved changes", "save": "Save changes" }, "localuser": { @@ -417,7 +417,7 @@ "connections": "Connections", "deleteAccount": "Account Deletion", "areYouSureDelete": "Are you sure you want to delete your account? If so enter the phrase $1", - "sillyDeleteConfirmPhrase": "Andromeda ist eine schoene schmetterling", + "sillyDeleteConfirmPhrase": "Shrek is love, Shrek is life", "deleteAccountButton": "Delete account", "mustTypePhrase": "To delete your account you must type the phrase", "manageInstance": "Manage Instance" @@ -429,7 +429,7 @@ "new": "New", "old": "Old", "search": "Search", - "nofind": "No matching messages, try broadening your search." + "nofind": "There seems to be no messages that match your search, maybe trying broadening your search to try and find what you want" }, "manageInstance": { "stop": "Stop instance", @@ -510,8 +510,8 @@ "removeFriend": "Remove Friend", "addfriendpromt": "Add friends by username:", "notfound": "User not found", - "discnotfound": "Add discriminator (numbers after #)", - "pending": "Requests", + "discnotfound": "Discriminator not found", + "pending": "Pending", "pending:": "Pending friend requests:", "all": "All", "all:": "All friends:", @@ -537,7 +537,7 @@ "message": "Message user", "block": "Block user", "unblock": "Unblock user", - "friendReq": "Request friendship", + "friendReq": "Friend request", "kick": "Kick member", "ban": "Ban member", "addRole": "Add roles", @@ -550,7 +550,7 @@ "login": { "checking": "Checking Instance", "allGood": "All good", - "invalid": "Invalid Instance, try again (try with https://?)", + "invalid": "Invalid Instance, try again", "waiting": "Waiting to check Instance", "recover": "Forgot password?", "pasteInfo": "Paste the recovery URL here:", @@ -615,7 +615,7 @@ }, "widget": "Guild Widget", "widgetEnabled": "Widget enabled", - "incorrectURLS": "## This instance has likely sent the incorrect URLs.\n### If you're the instance owner please see [here](https://docs.spacebar.chat/setup/server/) under *Connecting from remote machines* to correct the issue.\nPlease contact the server owner about this issue.\n Would you like Jank Client to automatically try to fix this error to let you connect to the instance?", + "incorrectURLS": "## This instance has likely sent the incorrect URLs.\n### If you're the instance owner please see [here](https://docs.spacebar.chat/setup/server/) under *Connecting from remote machines* to correct the issue.\n Would you like Jank Client to automatically try to fix this error to let you connect to the instance?", "jankInfo": "Client Information", "instInfo": "Instance Information", "clientDesc": "Client version: $1\n\n[Join the official Jank Client guild]($2/invite/USgYJo?instance=https%3A%2F%2Fspacebar.chat)\n\n[Help translate Jank Client](https://translatewiki.net/wiki/Translating:JankClient#sortable:3=desc) \n\n[Help create Jank client](https://github.com/MathMan05/JankClient)\n\n[Help maintain the server jank client relies on](https://github.com/spacebarchat/server)\n\nCalculated rights: $3",