FromChat/web
1
0
Fork 0
mirror of https://github.com/fromchat-messenger/web.git synced 2026-09-22 19:15:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix null issues

Browse Source
This commit is contained in:
denis0001-dev
2025-09-13 20:31:39 +03:00
Unverified
parent 934b84f027
commit 002a59d3c8
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/ui/panels/DMPanel.ts
+4 -4
View File
@@ -1,10 +1,10 @@
import { MessagePanel, type MessagePanelCallbacks } from "./MessagePanel"; import { MessagePanel, type MessagePanelCallbacks, type MessagePanelState } from "./MessagePanel";
import { import {
fetchDMHistory, fetchDMHistory,
decryptDm, decryptDm,
sendDMViaWebSocket sendDMViaWebSocket
} from "../../api/dmApi"; } from "../../api/dmApi";
import type { Message } from "../../core/types"; import type { Message, WebSocketMessage } from "../../core/types";
import type { UserState } from "../state"; import type { UserState } from "../state";
export interface DMPanelData { export interface DMPanelData {
@@ -22,7 +22,7 @@ export class DMPanel extends MessagePanel {
constructor( constructor(
user: UserState, user: UserState,
callbacks: MessagePanelCallbacks, callbacks: MessagePanelCallbacks,
onStateChange: (state: any) => void onStateChange: (state: MessagePanelState) => void
) { ) {
super("dm", user, callbacks, onStateChange); super("dm", user, callbacks, onStateChange);
} }
@@ -116,7 +116,7 @@ export class DMPanel extends MessagePanel {
} }
// Handle incoming WebSocket DM messages // Handle incoming WebSocket DM messages
handleWebSocketMessage = async (response: any): Promise<void> => { handleWebSocketMessage = async (response: WebSocketMessage): Promise<void> => {
if (response.type === "dmNew" && this.dmData) { if (response.type === "dmNew" && this.dmData) {
const { senderId, recipientId, ...envelope } = response.data; const { senderId, recipientId, ...envelope } = response.data;
frontend/src/ui/panels/MessagePanel.ts
+3 -1
View File
@@ -22,7 +22,7 @@ export interface MessagePanelCallbacks {
export abstract class MessagePanel { export abstract class MessagePanel {
protected state: MessagePanelState; protected state: MessagePanelState;
protected callbacks: MessagePanelCallbacks; protected callbacks: MessagePanelCallbacks;
public onStateChange: (state: MessagePanelState) => void; public onStateChange: ((state: MessagePanelState) => void) | null;
protected currentUser: UserState; protected currentUser: UserState;
constructor( constructor(
@@ -57,8 +57,10 @@ export abstract class MessagePanel {
// Common methods // Common methods
protected updateState(updates: Partial<MessagePanelState>): void { protected updateState(updates: Partial<MessagePanelState>): void {
this.state = { ...this.state, ...updates }; this.state = { ...this.state, ...updates };
if (this.onStateChange) {
this.onStateChange(this.state); this.onStateChange(this.state);
} }
}
protected addMessage(message: Message): void { protected addMessage(message: Message): void {
const messageExists = this.state.messages.some(msg => msg.id === message.id); const messageExists = this.state.messages.some(msg => msg.id === message.id);
frontend/src/ui/panels/PublicChatPanel.ts
+2 -2
View File
@@ -1,4 +1,4 @@
import { MessagePanel, type MessagePanelCallbacks } from "./MessagePanel"; import { MessagePanel, type MessagePanelCallbacks, type MessagePanelState } from "./MessagePanel";
import { API_BASE_URL } from "../../core/config"; import { API_BASE_URL } from "../../core/config";
import { getAuthHeaders } from "../../auth/api"; import { getAuthHeaders } from "../../auth/api";
import { request } from "../../core/websocket"; import { request } from "../../core/websocket";
@@ -12,7 +12,7 @@ export class PublicChatPanel extends MessagePanel {
chatName: string, chatName: string,
currentUser: UserState, currentUser: UserState,
callbacks: MessagePanelCallbacks, callbacks: MessagePanelCallbacks,
onStateChange: (state: any) => void onStateChange: (state: MessagePanelState) => void
) { ) {
super(`public-${chatName}`, currentUser, callbacks, onStateChange); super(`public-${chatName}`, currentUser, callbacks, onStateChange);
this.updateState({ this.updateState({