Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

playing with layout a bit - this is a discord-y option #7115

Merged
merged 1 commit into from
Dec 23, 2024
Merged

playing with layout a bit - this is a discord-y option #7115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions frontend/app/src/components/bots/BotMessageContext.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,35 @@
<script lang="ts">
import type { BotMessageContext } from "openchat-client";
import { AvatarSize, OpenChat, userStore, type BotMessageContext } from "openchat-client";
import Markdown from "../home/Markdown.svelte";
import Avatar from "../Avatar.svelte";
import { getContext } from "svelte";

const client = getContext<OpenChat>("client");

interface Props {
botContext: BotMessageContext;
botName: string;
}

let { botContext }: Props = $props();

let text = $derived(
`@UserId(${botContext.initiator}) executed command ${botContext.commandText}`,
);
let text = $derived(`@UserId(${botContext.initiator}) used **${botContext.commandText}**`);
let user = $derived($userStore.get(botContext.initiator));
</script>

<div class="bot-context">
{#if user}
<Avatar url={client.userAvatarUrl(user)} userId={user.userId} size={AvatarSize.Tiny} />
{/if}
<Markdown {text} />
</div>

<style lang="scss">
.bot-context {
@include font(light, normal, fs-80);
margin-bottom: $sp4;
color: var(--txt-light);
display: flex;
gap: $sp2;
align-items: center;
}
</style>
75 changes: 45 additions & 30 deletions frontend/app/src/components/home/ChatMessage.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,12 @@
</div>
{/if}

{#if botContext !== undefined}
<div class="bot-context">
<BotMessageContext botName={senderDisplayName} {botContext} />
</div>
{/if}

<!-- svelte-ignore a11y-no-static-element-interactions -->
<div
bind:this={msgBubbleElement}
Expand All @@ -476,42 +482,36 @@
class:readByMe
class:crypto
class:failed
class:bot={botContext !== undefined}
class:p2pSwap={isP2PSwap}
class:proposal={isProposal && !inert}
class:thread={inThread}
class:rtl={$rtlStore}>
{#if first && !isProposal && !isPrize}
<div class="sender" class:fill class:rtl={$rtlStore}>
{#if botContext !== undefined}
<BotMessageContext {botContext} />
{:else}
<Link underline={"never"} on:click={openUserProfile}>
<h4 class="username" class:fill class:crypto>
{senderDisplayName}
</h4>
<Badges
uniquePerson={sender?.isUniquePerson}
diamondStatus={sender?.diamondStatus}
streak={client.getStreak(sender?.userId)} />
{#if sender !== undefined && multiUserChat}
<WithRole
userId={sender.userId}
chatMembers={$chatMembersMap}
communityMembers={$communityMembers}
let:chatRole
let:communityRole>
<RoleIcon
level="community"
popup
role={communityRole} />
<RoleIcon
level={chatType === "channel" ? "channel" : "group"}
popup
role={chatRole} />
</WithRole>
{/if}
</Link>
{/if}
<Link underline={"never"} on:click={openUserProfile}>
<h4 class="username" class:fill class:crypto>
{senderDisplayName}
</h4>
<Badges
uniquePerson={sender?.isUniquePerson}
diamondStatus={sender?.diamondStatus}
streak={client.getStreak(sender?.userId)} />
{#if sender !== undefined && multiUserChat}
<WithRole
userId={sender.userId}
chatMembers={$chatMembersMap}
communityMembers={$communityMembers}
let:chatRole
let:communityRole>
<RoleIcon level="community" popup role={communityRole} />
<RoleIcon
level={chatType === "channel" ? "channel" : "group"}
popup
role={chatRole} />
</WithRole>
{/if}
</Link>
{#if senderTyping}
<span class="typing">
<Typing />
Expand Down Expand Up @@ -804,10 +804,21 @@
}
}

.bot-context {
position: absolute;
top: -7px;
left: $avatar-width;

@include mobile() {
left: $avatar-width-mob;
}
}

.message {
display: flex;
justify-content: flex-start;
margin-bottom: $sp2;
position: relative;

.avatar-col {
flex: 0 0 $avatar-width;
Expand Down Expand Up @@ -862,6 +873,10 @@
border: var(--currentChat-msg-bd);
box-shadow: var(--currentChat-msg-sh);

&.bot {
margin-top: $sp4;
}

&.proposal {
max-width: 800px;
width: 100%;
Expand Down
10 changes: 5 additions & 5 deletions frontend/openchat-agent/src/services/externalBot/externalBot.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ const ApiBotResponse = Type.Union([
Success: Type.Object({
message: Type.Optional(
Type.Object({
message_id: Type.String(),
message_content: MessageContent,
id: Type.BigInt(),
content: MessageContent,
}),
),
}),
Expand Down Expand Up @@ -92,10 +92,10 @@ function externalBotResponse(value: ApiBotResponse): BotCommandResponse {
if ("Success" in value) {
return {
kind: "success",
placeholder: mapOptional(value.Success.message, ({ message_id, message_content }) => {
placeholder: mapOptional(value.Success.message, ({ id, content }) => {
return {
messageId: BigInt(message_id),
messageContent: messageContent(message_content, ""),
messageId: BigInt(id),
messageContent: messageContent(content, ""),
};
}),
};
Expand Down
Loading