Поиск каналов
-
Введите логин или формат login/channel
-
+
Введите логин (или начало логина), затем выберите пользователя и канал.
+
+
@@ -496,9 +497,16 @@ function openChannelFinderModal({ navigate }) {
channelName: item.channelName,
}));
renderChannelRows(channels);
+ if (!channels.length) {
+ errorEl.textContent = filterChannel
+ ? 'Каналы с таким фильтром не найдены.'
+ : `У пользователя "${ownerLogin}" пока нет доступных каналов.`;
+ } else {
+ errorEl.textContent = '';
+ }
};
- const refresh = createDebounced(async () => {
+ const runSearch = async () => {
const raw = String(inputEl?.value || '').trim();
errorEl.textContent = '';
if (!raw) {
@@ -506,6 +514,7 @@ function openChannelFinderModal({ navigate }) {
suggestEl.innerHTML = '';
channelsEl.style.display = 'none';
channelsEl.innerHTML = '';
+ errorEl.textContent = 'Введите логин или начало логина.';
return;
}
@@ -521,7 +530,7 @@ function openChannelFinderModal({ navigate }) {
return;
}
- if (loginPrefix.length < 2) {
+ if (loginPrefix.length < 1) {
suggestEl.style.display = 'none';
suggestEl.innerHTML = '';
channelsEl.style.display = 'none';
@@ -530,10 +539,20 @@ function openChannelFinderModal({ navigate }) {
}
const logins = await authService.searchUsers(loginPrefix);
+ const rows = Array.isArray(logins) ? logins : [];
+ if (!rows.length) {
+ suggestEl.style.display = 'none';
+ suggestEl.innerHTML = '';
+ channelsEl.style.display = 'none';
+ channelsEl.innerHTML = '';
+ errorEl.textContent = `Логины, начинающиеся на "${loginPrefix}", не найдены.`;
+ return;
+ }
const items = (Array.isArray(logins) ? logins : []).slice(0, 15).map((login) => ({
label: login,
login,
}));
+ errorEl.textContent = '';
renderButtons(suggestEl, items, async (item) => {
inputEl.value = `${item.login}/`;
suggestEl.style.display = 'none';
@@ -543,9 +562,19 @@ function openChannelFinderModal({ navigate }) {
} catch (error) {
errorEl.textContent = toUserMessage(error, 'Не удалось выполнить поиск.');
}
- }, 220);
+ };
+
+ const refresh = createDebounced(runSearch, 220);
root.querySelector('#channels-find-close')?.addEventListener('click', close);
+ root.querySelector('#channels-find-run')?.addEventListener('click', () => {
+ void runSearch();
+ });
+ inputEl?.addEventListener('keydown', (event) => {
+ if (event.key !== 'Enter') return;
+ event.preventDefault();
+ void runSearch();
+ });
inputEl?.addEventListener('input', refresh);
if (inputEl) inputEl.focus();
}
diff --git a/shine-UI/js/router.js b/shine-UI/js/router.js
index 9378a0b..0024ee4 100644
--- a/shine-UI/js/router.js
+++ b/shine-UI/js/router.js
@@ -142,6 +142,7 @@ export function resolveToolbarActive(pageId) {
if (ROOT_PAGES.includes(pageId)) return pageId;
if (
pageId === 'profile-edit-view' ||
+ pageId === 'account-switcher-view' ||
pageId === 'wallet-view' ||
pageId === 'settings-view' ||
pageId === 'developer-settings-view' ||
diff --git a/shine-UI/js/services/auth-service.js b/shine-UI/js/services/auth-service.js
index ab92cbe..9d0103c 100644
--- a/shine-UI/js/services/auth-service.js
+++ b/shine-UI/js/services/auth-service.js
@@ -409,6 +409,19 @@ function normalizeChannelDescription(value) {
return text;
}
+function validatePersonalChannelName(value) {
+ const normalized = normalizeChannelDisplayName(value);
+ if (!normalized) return { ok: false, error: 'Введите логин пользователя.' };
+ const length = Array.from(normalized).length;
+ if (length < 1 || length > 20) {
+ return { ok: false, error: 'Логин: 1-20 символов.' };
+ }
+ if (!/^[A-Za-z0-9_]+$/.test(normalized)) {
+ return { ok: false, error: 'Логин: разрешены только латиница, цифры и _.' };
+ }
+ return { ok: true, normalized };
+}
+
function makeCreateChannelBodyBytes({
lineCode,
prevLineNumber,
@@ -419,9 +432,14 @@ function makeCreateChannelBodyBytes({
channelType = CHANNEL_TYPE_PUBLIC,
channelTypeVersion = CHANNEL_TYPE_VERSION_DEFAULT,
}) {
- const check = validateChannelDisplayName(channelName);
- if (!check.ok) throw new Error(channelNameErrorText(check.code));
- const cleanName = check.normalized;
+ const typeCode = Number(channelType);
+ const nameCheck = typeCode === CHANNEL_TYPE_PERSONAL
+ ? validatePersonalChannelName(channelName)
+ : validateChannelDisplayName(channelName);
+ if (!nameCheck.ok) {
+ throw new Error(typeCode === CHANNEL_TYPE_PERSONAL ? nameCheck.error : channelNameErrorText(nameCheck.code));
+ }
+ const cleanName = nameCheck.normalized;
const cleanDescription = normalizeChannelDescription(channelDescription);
const nameBytes = utf8Bytes(cleanName);
@@ -433,7 +451,6 @@ function makeCreateChannelBodyBytes({
if (descriptionBytes.length > 200) {
throw new Error('Описание канала слишком длинное: максимум 200 символов.');
}
- const typeCode = Number(channelType);
const typeVer = Number(channelTypeVersion);
if (!Number.isFinite(typeCode) || typeCode < 0 || typeCode > 65535) {
throw new Error('Некорректный тип канала.');
@@ -463,8 +480,8 @@ function makeCreateChannelBodyBytesLegacy({
thisLineNumber,
channelName,
}) {
- const check = validateChannelDisplayName(channelName);
- if (!check.ok) throw new Error(channelNameErrorText(check.code));
+ const check = validatePersonalChannelName(channelName);
+ if (!check.ok) throw new Error(check.error);
const cleanName = check.normalized;
const nameBytes = utf8Bytes(cleanName);
if (nameBytes.length < 1 || nameBytes.length > 255) {
@@ -1063,13 +1080,16 @@ export class AuthService {
const cleanLogin = (login || '').trim();
if (!cleanLogin) throw new Error('Missing login');
- const check = validateChannelDisplayName(channelName);
- if (!check.ok) throw new Error(channelNameErrorText(check.code));
- const cleanChannelName = normalizeChannelDisplayName(check.normalized);
+ const typeCode = Number(channelType);
+ const nameCheck = typeCode === CHANNEL_TYPE_PERSONAL
+ ? validatePersonalChannelName(channelName)
+ : validateChannelDisplayName(channelName);
+ if (!nameCheck.ok) {
+ throw new Error(typeCode === CHANNEL_TYPE_PERSONAL ? nameCheck.error : channelNameErrorText(nameCheck.code));
+ }
+ const cleanChannelName = normalizeChannelDisplayName(nameCheck.normalized);
const cleanChannelDescription = normalizeChannelDescription(channelDescription);
const channelSlug = toCanonicalChannelSlug(cleanChannelName);
-
- const typeCode = Number(channelType);
const typeVersion = Number(channelTypeVersion);
const key = `create-channel:${cleanLogin}:${typeCode}:${channelSlug || cleanChannelName.toLowerCase()}`;
return this.runWriteLocked(key, async () => {
diff --git a/shine-UI/js/state.js b/shine-UI/js/state.js
index c792907..386567b 100644
--- a/shine-UI/js/state.js
+++ b/shine-UI/js/state.js
@@ -1,9 +1,9 @@
import { AuthService } from './services/auth-service.js';
-import { clearClientAuthData } from './services/key-vault.js';
-import { clearStoredMessages, listStoredMessages, putStoredMessage } from './services/message-store.js';
+import { listStoredMessages, putStoredMessage } from './services/message-store.js';
const clone = (value) => JSON.parse(JSON.stringify(value));
const SESSION_STORAGE_KEY = 'shine-ui-current-session-v1';
+const ACCOUNTS_STORAGE_KEY = 'shine-ui-accounts-v1';
const REACTIONS_STORAGE_KEY = 'shine-ui-message-reactions-v2';
const WEB_PUSH_SUBSCRIPTION_KEY = 'shine-ui-webpush-subscription-v1';
const ENTRY_SETTINGS_STORAGE_KEY = 'shine-ui-entry-settings-v1';
@@ -117,6 +117,33 @@ function loadStoredSession() {
}
}
+function loadStoredAccounts() {
+ try {
+ const raw = localStorage.getItem(ACCOUNTS_STORAGE_KEY);
+ if (!raw) return [];
+ const parsed = JSON.parse(raw);
+ if (!Array.isArray(parsed)) return [];
+ return parsed
+ .map((item) => ({
+ login: String(item?.login || '').trim(),
+ sessionId: String(item?.sessionId || '').trim(),
+ updatedAtMs: Number(item?.updatedAtMs || Date.now()),
+ }))
+ .filter((item) => item.login && item.sessionId);
+ } catch {
+ return [];
+ }
+}
+
+function persistStoredAccounts(accounts) {
+ try {
+ const payload = Array.isArray(accounts) ? accounts : [];
+ localStorage.setItem(ACCOUNTS_STORAGE_KEY, JSON.stringify(payload));
+ } catch {
+ // ignore storage errors
+ }
+}
+
function loadStoredReactions() {
try {
const raw = localStorage.getItem(REACTIONS_STORAGE_KEY);
@@ -189,6 +216,7 @@ function persistEntrySettings(settings) {
function clearBrowserClientData() {
const localKeys = [
SESSION_STORAGE_KEY,
+ ACCOUNTS_STORAGE_KEY,
REACTIONS_STORAGE_KEY,
WEB_PUSH_SUBSCRIPTION_KEY,
CHANNEL_NOTIFY_KEY,
@@ -211,6 +239,7 @@ function clearBrowserClientData() {
function createInitialState({ withStoredSession = true } = {}) {
const storedSession = withStoredSession ? loadStoredSession() : null;
+ const storedAccounts = loadStoredAccounts();
const storedReactions = loadStoredReactions();
const storedEntrySettings = loadStoredEntrySettings();
const initialShineServer = LOCAL_WS_OVERRIDE_URL || DEFAULT_SHINE_SERVER;
@@ -230,6 +259,9 @@ function createInitialState({ withStoredSession = true } = {}) {
sessionId: storedSession?.sessionId || '',
storagePwdInMemory: '',
},
+ accounts: storedAccounts,
+ activeAccountLogin: String(storedSession?.login || ''),
+ accountAddingMode: false,
startHint: '',
entrySettings: {
language: String(storedEntrySettings?.language || 'ru'),
@@ -699,6 +731,19 @@ export function authorizeSession({
login,
sessionId,
});
+ const loginKey = String(login || '').trim().toLowerCase();
+ const nextAccounts = [
+ {
+ login: String(login || '').trim(),
+ sessionId: String(sessionId || '').trim(),
+ updatedAtMs: Date.now(),
+ },
+ ...state.accounts.filter((item) => String(item?.login || '').trim().toLowerCase() !== loginKey),
+ ];
+ state.accounts = nextAccounts;
+ state.activeAccountLogin = String(login || '').trim();
+ state.accountAddingMode = false;
+ persistStoredAccounts(nextAccounts);
state.startHint = '';
if (onSessionAuthorized) {
onSessionAuthorized();
@@ -722,6 +767,20 @@ export async function refreshSessions() {
return state.sessions;
}
+export async function switchToAccount(login) {
+ const targetLogin = String(login || '').trim();
+ if (!targetLogin) throw new Error('Не передан логин аккаунта.');
+ const account = (state.accounts || []).find((item) => String(item?.login || '').trim().toLowerCase() === targetLogin.toLowerCase());
+ if (!account?.sessionId) throw new Error('Сессия аккаунта не найдена.');
+ const resumed = await authService.resumeSession(account.login, account.sessionId);
+ authorizeSession({
+ login: resumed.login || account.login,
+ sessionId: resumed.sessionId || account.sessionId,
+ storagePwd: resumed.storagePwd || state.session.storagePwdInMemory,
+ });
+ return resumed;
+}
+
function resetStateForSignedOut() {
const next = createInitialState({ withStoredSession: false });
state.chats = next.chats;
@@ -733,6 +792,9 @@ function resetStateForSignedOut() {
state.notificationsTab = next.notificationsTab;
state.pageLabelCollapsed = next.pageLabelCollapsed;
state.session = next.session;
+ state.accounts = next.accounts;
+ state.activeAccountLogin = next.activeAccountLogin;
+ state.accountAddingMode = next.accountAddingMode;
state.startHint = next.startHint;
state.entrySettings = next.entrySettings;
state.registrationDraft = next.registrationDraft;
@@ -749,18 +811,13 @@ function resetStateForSignedOut() {
}
export async function terminateCurrentSession({ infoMessage = '' } = {}) {
+ const currentLogin = String(state.session.login || '').trim().toLowerCase();
+ const nextAccounts = (state.accounts || []).filter((item) => String(item?.login || '').trim().toLowerCase() !== currentLogin);
+ state.accounts = nextAccounts;
+ persistStoredAccounts(nextAccounts);
clearStoredSession();
- clearBrowserClientData();
resetStateForSignedOut();
authService.close();
- try {
- await Promise.all([
- clearClientAuthData(),
- clearStoredMessages(),
- ]);
- } catch {
- // ignore cleanup errors in prototype mode
- }
if (infoMessage) {
state.startHint = infoMessage;
}
@@ -792,6 +849,14 @@ export async function closeCurrentSessionAndSignOut({ infoMessage = '' } = {}) {
await terminateCurrentSession({ infoMessage });
}
+export function beginAddAccountFlow() {
+ state.accountAddingMode = true;
+}
+
+export function cancelAddAccountFlow() {
+ state.accountAddingMode = false;
+}
+
export function refreshRegistrationBalance() {
const next = (0.005 + Math.random() * 0.03).toFixed(4);
state.registrationPayment.balanceSOL = next;