diff --git a/.envrc b/.envrc deleted file mode 100644 index 3550a30..0000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake diff --git a/.gitignore b/.gitignore index c0e6a9b..87d0fc3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ node_modules releases -.fallow -.direnv +.fallow/ diff --git a/apps/web/src/components/modals/basic.tsx b/apps/web/src/components/modals/basic.tsx index eb9a27b..2d5a3d8 100644 --- a/apps/web/src/components/modals/basic.tsx +++ b/apps/web/src/components/modals/basic.tsx @@ -34,7 +34,7 @@ export function Basic({
@@ -42,7 +42,8 @@ export function Basic({ } /> - {user.OnlineStatus.split("_") + {user.online_status + .split("_") .map((word) => word.charAt(0).toUpperCase() + word.slice(1)) .join(" ")} diff --git a/apps/web/src/components/modals/profile.tsx b/apps/web/src/components/modals/profile.tsx index e34a9ac..c46e4ef 100644 --- a/apps/web/src/components/modals/profile.tsx +++ b/apps/web/src/components/modals/profile.tsx @@ -34,8 +34,8 @@ export default function Profile({ user }: { user: User }) { const ownData = await get(ownId); const secret = await getSharedSecret( privateKey, - ownData.PublicKey, - user.PublicKey, + ownData.public_key, + user.public_key, ); if (active) { @@ -51,7 +51,7 @@ export default function Profile({ user }: { user: User }) { return () => { active = false; }; - }, [get, getSharedSecret, load, user.PublicKey]); + }, [get, getSharedSecret, load, user.public_key]); const sharedSecretCode = sharedSecret ? toLossySixDigitCode(sharedSecret) @@ -98,13 +98,13 @@ export default function Profile({ user }: { user: User }) {

- Iota ID: {user.IotaId} + Iota ID: {user.iota_id}

- User ID: {user.UserId} + User ID: {user.user_id}

- Public Key: {user.PublicKey} + Public Key: {user.public_key}

)} diff --git a/apps/web/src/components/navbar.tsx b/apps/web/src/components/navbar.tsx index 0d396c6..7550b28 100644 --- a/apps/web/src/components/navbar.tsx +++ b/apps/web/src/components/navbar.tsx @@ -28,7 +28,7 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) { const { id } = useSearch({ strict: false }); const currentCalls = calls.filter((call) => - call.CallMembers.some((member) => member === id), + call.call_members.some((member) => member === id), ); const isMobile = useIsMobile(); @@ -121,8 +121,8 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) { onClick={() => { void joinCall( id, - currentCalls[0].CallSecret, - currentCalls[0].CallId, + currentCalls[0].call_secret, + currentCalls[0].call_id, ); }} className="w-9 h-9 aspect-square rounded-lg" @@ -147,13 +147,13 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) { {currentCalls.map((call) => ( { - void joinCall(id, call.CallSecret, call.CallId); + void joinCall(id, call.call_secret, call.call_id); }} > - {displayCallId(call.CallId)} + {displayCallId(call.call_id)} ))} diff --git a/apps/web/src/components/sidebar.tsx b/apps/web/src/components/sidebar.tsx index 95fcd51..4dc94d4 100644 --- a/apps/web/src/components/sidebar.tsx +++ b/apps/web/src/components/sidebar.tsx @@ -41,7 +41,7 @@ import { mtp } from "@tensamin/shared/data"; import { useMTP } from "@tensamin/mtp"; type OnlineStatus = z.infer< - typeof mtp.get_user_data.response.shape.OnlineStatus + typeof mtp.get_user_data.response.shape.online_status >; const onlineStatusLabels: Record = { @@ -89,7 +89,7 @@ function StatusDialog({ onOpenChange={(nextOpen) => { if (!nextOpen) { setDraftStatus(user.status ?? ""); - setDraftOnlineStatus(user.OnlineStatus); + setDraftOnlineStatus(user.online_status); setErrorMessage(""); setSaveSucceeded(false); } @@ -144,7 +144,7 @@ function StatusDialog({ onClick={async () => { const payload = { ...(draftStatus && { status: draftStatus }), - OnlineStatus: draftOnlineStatus, + online_status: draftOnlineStatus, }; const validation = @@ -230,7 +230,7 @@ export default function Sidebar() { { setDraftStatus(user.status ?? ""); - setDraftOnlineStatus(user.OnlineStatus); + setDraftOnlineStatus(user.online_status); setStatusErrorMessage(""); setStatusSaveSucceeded(false); setDialogOpen(true); @@ -249,7 +249,7 @@ export default function Sidebar() { onOpenChange={(nextOpen) => { if (!nextOpen) { setDraftStatus(user.status ?? ""); - setDraftOnlineStatus(user.OnlineStatus); + setDraftOnlineStatus(user.online_status); setStatusErrorMessage(""); setStatusSaveSucceeded(false); } diff --git a/apps/web/src/features/conversation/list/body.tsx b/apps/web/src/features/conversation/list/body.tsx index 36399e9..d240655 100644 --- a/apps/web/src/features/conversation/list/body.tsx +++ b/apps/web/src/features/conversation/list/body.tsx @@ -65,7 +65,7 @@ export default function List() { {category === "conversations" ? ( contacts?.[virtualItem.index] ? ( ) : null ) : communities?.[virtualItem.index] ? ( diff --git a/apps/web/src/routes/app/home.tsx b/apps/web/src/routes/app/home.tsx index 832d498..0add511 100644 --- a/apps/web/src/routes/app/home.tsx +++ b/apps/web/src/routes/app/home.tsx @@ -59,7 +59,7 @@ function AddConversationButton() { username: result.data, }) .then((data) => { - if (data.data.UserId === 0) { + if (data.data.user_id === 0) { throw new Error(); } @@ -72,7 +72,7 @@ function AddConversationButton() { if (!user) return; // alrady added check - if (contacts.some((contact) => contact.UserId === user.data.UserId)) { + if (contacts.some((contact) => contact.user_id === user.data.user_id)) { setError("Conversation already exists"); return; } @@ -81,10 +81,10 @@ function AddConversationButton() { const timeout = setTimeout(() => setLoading(true), 500); send("add_conversation", { - ChatPartnerName: result.data, + chat_partner_name: result.data, }) .then(() => { - insertContact(user.data.UserId); + insertContact(user.data.user_id); setOpen(false); }) .catch((error) => { diff --git a/bun.lock b/bun.lock index 376d438..0af5854 100644 --- a/bun.lock +++ b/bun.lock @@ -347,7 +347,7 @@ }, "overrides": { "@tensamin/ui": "https://git.methanium.net/tensamin/ui/releases/download/latest/tensamin-ui.tgz", - "mtp": "https://git.methanium.net/methanium/mtp/releases/download/0.1.0-dev-c3fbeb2/mtp-0.1.0.tgz", + "mtp": "https://git.methanium.net/methanium/mtp/releases/download/0.1.0-dev-8ae8377/mtp-0.1.0.tgz", }, "packages": { "@babel/code-frame": ["@babel/code-frame@7.29.7", "", { "dependencies": { "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" } }, "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw=="], @@ -1540,7 +1540,7 @@ "ms": ["ms@2.1.3", "", {}, "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="], - "mtp": ["mtp@https://git.methanium.net/methanium/mtp/releases/download/0.1.0-dev-c3fbeb2/mtp-0.1.0.tgz", {}, "sha512-j/RGQY9/3NXzZptXbY44Kv7YnGr38CQQOehRAzPPFvnEVj+kxCwzVLgSImT765+vfgl2L+bkAE9aI2PWwOBTow=="], + "mtp": ["mtp@https://git.methanium.net/methanium/mtp/releases/download/0.1.0-dev-8ae8377/mtp-0.1.0.tgz", {}, "sha512-W0l7Jc+1XI8BdrmRP9rlY/di6kZ5a/srv4mQvzwyJd+Tfg7BWZ9IUYUXIPze6ayx9dLY1f9Y71OgbhjstMzYjA=="], "nanoid": ["nanoid@3.3.15", "", { "bin": { "nanoid": "bin/nanoid.cjs" } }, "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA=="], diff --git a/flake.nix b/flake.nix index 55990bb..8cd7777 100644 --- a/flake.nix +++ b/flake.nix @@ -206,7 +206,7 @@ ]; }; - commonDeps = [rustToolchain pkgs.wasm-pack pkgs.lld]; + commonDeps = [pkgs.wasm-pack pkgs.lld]; in rec { default = electron; @@ -256,6 +256,7 @@ buildInputs = with pkgs; [ jdk17 + rustToolchain gradle bun nodejs diff --git a/package.json b/package.json index 4b90957..c673b1a 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ }, "overrides": { "@tensamin/ui": "https://git.methanium.net/tensamin/ui/releases/download/latest/tensamin-ui.tgz", - "mtp": "https://git.methanium.net/methanium/mtp/releases/download/0.1.0-dev-c3fbeb2/mtp-0.1.0.tgz" + "mtp": "https://git.methanium.net/methanium/mtp/releases/download/0.1.0-dev-8ae8377/mtp-0.1.0.tgz" }, "dependencies": { "@tensamin/ui": "*", diff --git a/packages/call/src/components/buttons/invite.tsx b/packages/call/src/components/buttons/invite.tsx index d7ccf82..d3a6d8e 100644 --- a/packages/call/src/components/buttons/invite.tsx +++ b/packages/call/src/components/buttons/invite.tsx @@ -61,15 +61,15 @@ export default function InviteButton({ > {contacts.map((contact) => ( Loading...
} component={(user) => (