-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(badges): AP-44, remove Satellite Circle Badge from main user dire…
…ct chat and show badge in archived messages. (#278) * fix(badges): remove Sattelite Circle Badge from main user direct chat and show badge in archived messages. * fix(badges): fix less staging issue
- Loading branch information
Showing
2 changed files
with
16 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,31 @@ | ||
<div class="is-message" @contextmenu="contextMenu"> | ||
<div @mouseenter="mouseOver" @mouseleave="mouseOver" | ||
:class="`message-container ${messageHover ? 'message-hover' : '' } ${message.pinned ? 'pinned-message' : ''}`"> | ||
|
||
<div v-if="message.pinned" class="pinned-badge"> | ||
<archive-icon size="0.85x" /> | ||
Archived | ||
</div> | ||
</div> | ||
<div v-if="hideActions" class="inline-meta"> | ||
<UiUsername :username="from" | ||
:badge="$mock.users.filter(u => u.name === from)[0].badge" /> | ||
<div class="sat-icon-container satellite-icon-helper"> | ||
<UiSatelliteCircle type="random" :size="10" :name="from" style="background-color: darkorange;" /> | ||
</div> | ||
<UiUsername :username="from" :badge="$mock.users.filter(u => u.name === from)[0].badge" /> | ||
<TypographyText :text="$dayjs(message.at).from()" /> | ||
</div> | ||
<TailoredMessagingMessageActions | ||
v-if="messageHover && !hideActions" | ||
:setReplyChatbarContent="setReplyChatbarContent" | ||
:emojiReaction="emojiReaction" | ||
:editMessage="editMessage" /> | ||
<TailoredMessagingMessageActions v-if="messageHover && !hideActions" | ||
:setReplyChatbarContent="setReplyChatbarContent" :emojiReaction="emojiReaction" :editMessage="editMessage" /> | ||
<VueMarkdown v-if="!messageEdit && message.type === 'text'" :source="message.payload" class="markdown" /> | ||
<UiImage v-else-if="message.type === 'image'" :source="message.payload.url" alt="" /> | ||
<!-- Only for video types we can't embed directly without doing something sketchy, like sending it to a server somewhere to extract the HTML5 video--> | ||
<UiEmbedsEmbeddedLinkContent v-if="message.type === 'text'" :data="message.payload" /> | ||
<UiEmbedsVideoPlayer v-else-if="message.type === 'video'" :data="message.payload" /> | ||
<UiEmbedsAudioPlayer v-else-if="message.type === 'audio'" :data="message.payload" /> | ||
<UiEmbedsFile v-else-if="message.type === 'file'" :data="message.payload" /> | ||
<TailoredMessagingMessageReactions | ||
v-if="!hideActions && hasReactions" | ||
:message="this.$props.message" | ||
<TailoredMessagingMessageReactions v-if="!hideActions && hasReactions" :message="this.$props.message" | ||
:group="this.$props.group" | ||
:key="`${this.$props.message.id}-${hasReactions ? this.$props.message.reactions.length : 0}`" /> | ||
</div> | ||
<TailoredMessagingMessageReply :message="message" :group="group" v-if="!hideActions" :from="from"/> | ||
<TailoredMessagingMessageReply :message="message" :group="group" v-if="!hideActions" :from="from" /> | ||
<TailoredMessagingMessageEdit v-if="messageEdit" :message="message.payload" @commitMessage="saveMessage" /> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters