add logic for sending and receiving items

This commit is contained in:
marlon-erler
2024-07-11 00:47:58 +02:00
parent 7f2955d8e4
commit b7dbe6b13d
6 changed files with 180 additions and 49 deletions
+61 -22
View File
@@ -21,6 +21,18 @@ export interface ChatMessage {
sender: string;
body: string;
isoDate: string;
itemData?: Item;
}
// item
export interface Item {
id: string;
title: string;
}
export interface NoteItem extends Item {
body: string;
}
// chat
@@ -34,6 +46,7 @@ export class Chat {
encryptionKey: React.State<string>;
messages: React.ListState<ChatMessage>;
items: React.MapState<Item>;
outbox: React.ListState<ChatMessage>;
isOutBoxEmpty: React.State<boolean>;
@@ -68,6 +81,7 @@ export class Chat {
);
this.encryptionKey = React.restoreState(storageKeys.encyptionKey(id), "");
this.messages = React.restoreListState(storageKeys.messages(id));
this.items = React.restoreMapState(storageKeys.items(id));
this.outbox = React.restoreListState(storageKeys.outbox(id));
this.isOutBoxEmpty = React.createProxyState(
[this.outbox],
@@ -133,7 +147,14 @@ export class Chat {
if (data.subscribed != undefined) this.handleSubscription(data.subscribed);
if (!data.messageBody) return;
const { sender, body, channel, isoDate } = JSON.parse(data.messageBody);
const { sender, body, channel, isoDate, itemData } = JSON.parse(
data.messageBody
);
if (itemData != undefined) {
return this.handleItem(itemData);
}
this.handleMessage({
sender,
body: await decryptString(body, this.encryptionKey.value),
@@ -155,25 +176,15 @@ export class Chat {
if (selectedChat.value != this) this.hasUnreadMessages.value = true;
};
handleItem = (itemData: Item): void => {
console.log(itemData);
};
// messages
sendNewMessage = async (): Promise<void> => {
if (this.cannotSendMessage.value == true) return;
await this.sendMessageText(this.composingMessage.value);
this.composingMessage.value = "";
};
sendMessageText = async (text: string): Promise<void> => {
const message = await this.createMessage(text);
this.sendExistingMessage(message);
};
resendMessage = (message: ChatMessage) => {
if (this.cannotResendMessage.value == true) return;
this.sendMessageText(message.body);
};
createMessage = async (messageText: string): Promise<ChatMessage> => {
createMessage = async (
messageText: string,
itemData?: Item
): Promise<ChatMessage> => {
// get channels
const secondaryChannelNames: string[] = [
...this.secondaryChannels.value.values(),
@@ -185,15 +196,35 @@ export class Chat {
// create object
const joinedChannelName = allChannelNames.join("/");
return {
const messageObject: ChatMessage = {
channel: joinedChannelName,
sender: senderName.value,
body: messageText,
isoDate: new Date().toISOString(),
};
if (itemData) messageObject.itemData = itemData;
return messageObject;
};
sendExistingMessage = async (chatMessage: ChatMessage): Promise<void> => {
sendMessageFromComposer = async (): Promise<void> => {
if (this.cannotSendMessage.value == true) return;
await this.sendMessageFromText(this.composingMessage.value);
this.composingMessage.value = "";
};
sendMessageFromText = async (text: string): Promise<void> => {
const message = await this.createMessage(text);
this.sendMessage(message);
};
resendMessage = (message: ChatMessage) => {
if (this.cannotResendMessage.value == true) return;
this.sendMessageFromText(message.body);
};
sendMessage = async (chatMessage: ChatMessage): Promise<void> => {
if (isConnected.value == true && this.isSubscribed.value == true) {
const encrypted =
this.encryptionKey.value == ""
@@ -211,7 +242,7 @@ export class Chat {
sendMessagesInOutbox = () => {
this.outbox.value.forEach((message) => {
this.sendExistingMessage(message);
this.sendMessage(message);
this.outbox.remove(message);
});
};
@@ -233,6 +264,14 @@ export class Chat {
this.messages.callSubscriptions();
};
// items
async createItem(item: Item): Promise<void> {
this.items.set(item.id, item);
const message = await this.createMessage("", item);
this.sendMessage(message);
}
// channel
setChannel = (): void => {
if (this.cannotSetChannel.value == true) return;
+10 -1
View File
@@ -4,9 +4,18 @@ import { Chat } from "../Model/chatModel";
import { translation } from "../translations";
export function ChatToolView(chat: Chat) {
function createItem() {
chat.createItem({
id: React.UUID(),
title: "new item",
});
}
return (
<div class="chat-tool-view">
<span>Tools</span>
<button on:click={createItem}>+</button>
<hr></hr>
</div>
);
}
+2 -2
View File
@@ -12,11 +12,11 @@ export function MessageComposer(chat: Chat) {
style="max-width: unset"
placeholder={translation.composerPlaceholder}
bind:value={chat.composingMessage}
on:enter={chat.sendNewMessage}
on:enter={chat.sendMessageFromComposer}
></input>
<button
class="primary"
on:click={chat.sendNewMessage}
on:click={chat.sendMessageFromComposer}
toggle:disabled={chat.cannotSendMessage}
>
<span class="icon">send</span>
+4
View File
@@ -19,6 +19,10 @@ export const storageKeys = {
return id + "messages";
},
items(id: string): string {
return id + "items";
},
outbox(id: string): string {
return id + "outbox";
},