frontend: save selected channel
This commit is contained in:
parent
0198955f7d
commit
0a17ea2ac6
3 changed files with 22 additions and 5 deletions
|
@ -1,10 +1,9 @@
|
||||||
import Main from './components/Main.svelte';
|
import Main from './components/Main.svelte';
|
||||||
import { getItem, init } from './storage';
|
import { getItem } from './storage';
|
||||||
import { authWithToken, useAuthHandlers } from './auth';
|
import { authWithToken, useAuthHandlers } from './auth';
|
||||||
import { initResponsiveHandlers } from './responsive';
|
import { initResponsiveHandlers } from './responsive';
|
||||||
import { useDebuggingApi } from './debuggingapi';
|
import { useDebuggingApi } from './debuggingapi';
|
||||||
|
|
||||||
init();
|
|
||||||
useDebuggingApi();
|
useDebuggingApi();
|
||||||
initResponsiveHandlers();
|
initResponsiveHandlers();
|
||||||
useAuthHandlers();
|
useAuthHandlers();
|
||||||
|
|
|
@ -3,11 +3,13 @@ const defaults = {
|
||||||
"server:gatewayBase": `${location.protocol === "https:" ? "wss" : "ws"}://${location.host}/gateway`,
|
"server:gatewayBase": `${location.protocol === "https:" ? "wss" : "ws"}://${location.host}/gateway`,
|
||||||
"auth:token": "",
|
"auth:token": "",
|
||||||
"app:behavior:doAnimations": true,
|
"app:behavior:doAnimations": true,
|
||||||
|
"app:cache:openChannelId": -1,
|
||||||
"loggingSink:Gateway": false,
|
"loggingSink:Gateway": false,
|
||||||
"loggingSink:Store": false
|
"loggingSink:Store": false
|
||||||
};
|
};
|
||||||
const store = new Map(Object.entries(defaults));
|
const store = new Map(Object.entries(defaults));
|
||||||
const persistentProvider = localStorage;
|
const persistentProvider = localStorage;
|
||||||
|
let didCacheProvider = false;
|
||||||
|
|
||||||
export function setItem(key, value) {
|
export function setItem(key, value) {
|
||||||
store.set(key, value);
|
store.set(key, value);
|
||||||
|
@ -17,6 +19,9 @@ export function setItem(key, value) {
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getItem(key) {
|
export function getItem(key) {
|
||||||
|
if (!didCacheProvider) {
|
||||||
|
init();
|
||||||
|
}
|
||||||
return store.get(key);
|
return store.get(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,6 +47,8 @@ export function init() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
didCacheProvider = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function apiRoute(fragment) {
|
export function apiRoute(fragment) {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import gateway, { GatewayEventType } from "./gateway";
|
import gateway, { GatewayEventType } from "./gateway";
|
||||||
import logger from "./logging";
|
import logger from "./logging";
|
||||||
import request from "./request";
|
import request from "./request";
|
||||||
import { apiRoute } from "./storage";
|
import { apiRoute, getItem, setItem } from "./storage";
|
||||||
|
|
||||||
const storeLog = logger("Store");
|
const storeLog = logger("Store");
|
||||||
|
|
||||||
|
@ -42,7 +42,14 @@ class ChannelsStore extends Store {
|
||||||
gateway.subscribe(GatewayEventType.Ready, ({ channels }) => {
|
gateway.subscribe(GatewayEventType.Ready, ({ channels }) => {
|
||||||
this.value = channels;
|
this.value = channels;
|
||||||
if (channels.length >= 1) {
|
if (channels.length >= 1) {
|
||||||
|
if (!selectedChannel.value || selectedChannel.value.id === -1) {
|
||||||
selectedChannel.set(channels[0]);
|
selectedChannel.set(channels[0]);
|
||||||
|
} else {
|
||||||
|
// if a channel id is already selected, we'll populate it with the data we just got from the gateway
|
||||||
|
const index = this.value.findIndex(e => e.id === selectedChannel.value.id);
|
||||||
|
if (index !== -1)
|
||||||
|
selectedChannel.set(this.value[index]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
this.updated();
|
this.updated();
|
||||||
});
|
});
|
||||||
|
@ -286,7 +293,7 @@ class OverlayStore extends Store {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const selectedChannel = new Store({ id: -1, name: "none", creator_id: -1 }, "selectedChannel");
|
export const selectedChannel = new Store({ id: getItem("app:cache:openChannelId"), name: "none", creator_id: -1 }, "selectedChannel");
|
||||||
export const showSidebar = new Store(false, "showSidebar");
|
export const showSidebar = new Store(false, "showSidebar");
|
||||||
export const showChannelView = new Store(true, "showChannelView");
|
export const showChannelView = new Store(true, "showChannelView");
|
||||||
export const smallViewport = new Store(false, "smallViewport");
|
export const smallViewport = new Store(false, "smallViewport");
|
||||||
|
@ -306,3 +313,7 @@ export const allStores = {
|
||||||
userInfoStore,
|
userInfoStore,
|
||||||
overlayStore,
|
overlayStore,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
selectedChannel.subscribe((newSelectedChannel) => {
|
||||||
|
setItem("app:cache:openChannelId", newSelectedChannel.id);
|
||||||
|
});
|
||||||
|
|
Loading…
Reference in a new issue