blisstown/campfire
blisstown/campfire
2
0
Fork 1
Code Issues 19 Pull requests Projects 1 Releases Activity

fixed login flow inconsistency

Browse source
This commit is contained in:
ari melody 2024-07-02 20:21:34 +01:00
parent 998e8f2517
commit abab0df83f
Signed by: ari
GPG key ID: CF99829C92678188
10 changed files with 65 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/lib/client/api.js
View file

@ -1,8 +1,9 @@
import { client } from '../client/client.js';
import { client } from '$lib/client/client.js';
import { user } from '$lib/stores/user.js';
import { capabilities } from '../client/instance.js';
import Post from '../post.js';
import User from '../user/user.js';
import Emoji from '../emoji.js';
import Post from '$lib/post.js';
import User from '$lib/user/user.js';
import Emoji from '$lib/emoji.js';
import { get } from 'svelte/store';
export async function createApp(host) {
@ -92,7 +93,7 @@ export async function verifyCredentials() {
}
export async function getNotifications(since_id, limit, types) {
if (!get(client).user) return false;
if (!get(user)) return false;
let url = `https://${get(client).instance.host}/api/v1/notifications`;
@ -112,6 +113,7 @@ export async function getNotifications(since_id, limit, types) {
}
export async function getTimeline(last_post_id) {
if (!get(user)) return false;
let url = `https://${get(client).instance.host}/api/v1/timelines/home`;
if (last_post_id) url += "?max_id=" + last_post_id;
const data = await fetch(url, {

3
src/lib/client/client.js
View file

@ -2,7 +2,7 @@ import { Instance, server_types } from './instance.js';
import * as api from './api.js';
import { get, writable } from 'svelte/store';
import { last_read_notif_id } from '$lib/notifications.js';
import { user } from '$lib/stores/user.js';
import { user, logged_in } from '$lib/stores/user.js';
export const client = writable(false);
@ -206,6 +206,7 @@ export class Client {
console.warn("Failed to log out correctly; ditching the old tokens anyways.");
}
localStorage.removeItem(save_name);
logged_in.set(false);
client.set(new Client());
console.log("Logged out successfully.");
}