diff options
Diffstat (limited to 'ui/lib')
| -rw-r--r-- | ui/lib/apiServer.js | 4 | ||||
| -rw-r--r-- | ui/lib/session.svelte.js | 10 | ||||
| -rw-r--r-- | ui/lib/state/remote/state.svelte.js | 24 | ||||
| -rw-r--r-- | ui/lib/state/remote/users.svelte.js (renamed from ui/lib/state/remote/logins.svelte.js) | 8 |
4 files changed, 23 insertions, 23 deletions
diff --git a/ui/lib/apiServer.js b/ui/lib/apiServer.js index c65b743..0b51883 100644 --- a/ui/lib/apiServer.js +++ b/ui/lib/apiServer.js @@ -45,9 +45,9 @@ export async function getInvite(inviteId) { return apiServer.get(`/invite/${inviteId}`); } -export async function acceptInvite(inviteId, username, password) { +export async function acceptInvite(inviteId, name, password) { const data = { - name: username, + name, password }; return apiServer.post(`/invite/${inviteId}`, data); diff --git a/ui/lib/session.svelte.js b/ui/lib/session.svelte.js index 16c2a98..67155ab 100644 --- a/ui/lib/session.svelte.js +++ b/ui/lib/session.svelte.js @@ -8,18 +8,18 @@ class Session { remote = $state(); local = $state(); currentUser = $derived(this.remote.currentUser); - logins = $derived(this.remote.logins.all); + users = $derived(this.remote.users.all); channels = $derived(this.remote.channels.all); messages = $derived( this.remote.messages.all.map((message) => - message.resolve({ sender: (id) => this.logins.get(id) }) + message.resolve({ sender: (id) => this.users.get(id) }) ) ); - static boot({ login, logins, channels, messages, resume_point }) { + static boot({ user, users, channels, messages, resume_point }) { const remote = r.State.boot({ - currentUser: login, - logins, + currentUser: user, + users, channels, messages, resumePoint: resume_point diff --git a/ui/lib/state/remote/state.svelte.js b/ui/lib/state/remote/state.svelte.js index c4daf17..6cbe124 100644 --- a/ui/lib/state/remote/state.svelte.js +++ b/ui/lib/state/remote/state.svelte.js @@ -1,26 +1,26 @@ -import { Logins } from './logins.svelte.js'; +import { Users } from './users.svelte.js'; import { Channels } from './channels.svelte.js'; import { Messages } from './messages.svelte.js'; export class State { currentUser = $state(); - logins = $state(); + users = $state(); channels = $state(); messages = $state(); - static boot({ currentUser, logins, channels, messages, resumePoint }) { + static boot({ currentUser, users, channels, messages, resumePoint }) { return new State({ currentUser, - logins: Logins.boot(logins), + users: Users.boot(users), channels: Channels.boot(channels), messages: Messages.boot(messages), resumePoint }); } - constructor({ currentUser, logins, channels, messages, resumePoint }) { + constructor({ currentUser, users, channels, messages, resumePoint }) { this.currentUser = currentUser; - this.logins = logins; + this.users = users; this.channels = channels; this.messages = messages; this.resumePoint = resumePoint; @@ -30,8 +30,8 @@ export class State { switch (event.type) { case 'channel': return this.onChannelEvent(event); - case 'login': - return this.onLoginEvent(event); + case 'user': + return this.onUserEvent(event); case 'message': return this.onMessageEvent(event); } @@ -56,16 +56,16 @@ export class State { this.channels.remove(id); } - onLoginEvent(event) { + onUserEvent(event) { switch (event.event) { case 'created': - return this.onLoginCreated(event); + return this.onUserCreated(event); } } - onLoginCreated(event) { + onUserCreated(event) { const { id, name } = event; - this.logins.add({ id, name }); + this.users.add({ id, name }); } onMessageEvent(event) { diff --git a/ui/lib/state/remote/logins.svelte.js b/ui/lib/state/remote/users.svelte.js index d19068d..617084f 100644 --- a/ui/lib/state/remote/logins.svelte.js +++ b/ui/lib/state/remote/users.svelte.js @@ -1,11 +1,11 @@ import { SvelteMap } from 'svelte/reactivity'; -export class Logins { +export class Users { all = $state(); - static boot(logins) { - const all = new SvelteMap(logins.map((login) => [login.id, login])); - return new Logins({ all }); + static boot(users) { + const all = new SvelteMap(users.map((user) => [user.id, user])); + return new Users({ all }); } constructor({ all }) { |
