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.

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

Feat: Highlighting by username and badges #1054

Merged
merged 14 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG-nightly.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
- Added option to settings to hide Stories from the sidebar
- Fixed settings to hide recommended channels and viewers also watch channels
- Fixed an issue where history navigation is accidentally triggered during IME composition
- Added option to highlight messages of specific usernames
- Added option to highlight messages based on badges
- Added button to user card to toggle highlighting for a users messages

### 3.1.1.3000

Expand Down
2 changes: 2 additions & 0 deletions locale/en_US.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ user_card:
previously_subscription_length: Previously subscribed for {length} months
hidden_subscription_status: Status hidden
native: Open Native User Card
highlight: Highlight messages of this user
stop_highlight: Stop highlighting of this user
no_messages: "{user} has not chatted here"
no_timeouts: "{user} hasn't been timed out before"
no_bans: "{user} hasn't been banned before"
Expand Down
36 changes: 36 additions & 0 deletions src/app/chat/UserCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
<!--Identity (avatar, nametag, badges) -->
<div ref="dragHandle" class="seventv-user-card-identity">
<div class="seventv-user-card-menuactions">
<BellSlashIcon
v-if="data.targetUser.username in chatHighlights.getAllUsernameHighlights()"
v-tooltip="t('user_card.stop_highlight')"
@click="highlightUserMessages"
/>
<BellIcon v-else v-tooltip="t('user_card.highlight')" @click="highlightUserMessages" />
<LogoTwitch v-tooltip="t('user_card.native')" @click="openNativeCard" />
<CloseIcon class="close-button" @click="emit('close')" />
</div>
Expand Down Expand Up @@ -125,6 +131,7 @@ import { convertTwitchMessage } from "@/common/Transform";
import { convertTwitchBadge } from "@/common/Transform";
import { ChatMessage, ChatUser } from "@/common/chat/ChatMessage";
import { useChannelContext } from "@/composable/channel/useChannelContext";
import { useChatHighlights } from "@/composable/chat/useChatHighlights";
import { useChatMessages } from "@/composable/chat/useChatMessages";
import { useChatTools } from "@/composable/chat/useChatTools";
import { useApollo } from "@/composable/useApollo";
Expand All @@ -135,6 +142,8 @@ import {
twitchUserCardModLogsQuery,
twitchUserCardQuery,
} from "@/assets/gql/tw.user-card.gql";
import BellIcon from "@/assets/svg/icons/BellIcon.vue";
import BellSlashIcon from "@/assets/svg/icons/BellSlashIcon.vue";
import CakeIcon from "@/assets/svg/icons/CakeIcon.vue";
import CloseIcon from "@/assets/svg/icons/CloseIcon.vue";
import HeartIcon from "@/assets/svg/icons/HeartIcon.vue";
Expand Down Expand Up @@ -165,6 +174,7 @@ const messages = useChatMessages(ctx);
const { identity } = storeToRefs(useStore());
const cosmetics = useCosmetics(props.target.id);
const tools = useChatTools(ctx);
const chatHighlights = useChatHighlights(ctx);

const apollo = useApollo();
const { t } = useI18n();
Expand Down Expand Up @@ -388,6 +398,31 @@ function openNativeCard(ev: MouseEvent): void {
emit("close");
}

function highlightUserMessages(): void {
if (!data.targetUser.username) return;
let ok = false;
if (data.targetUser.username in chatHighlights.getAllUsernameHighlights()) {
chatHighlights.remove(data.targetUser.username);
ok = true;
} else {
chatHighlights.define(
data.targetUser.username,
{
pattern: data.targetUser.username,
label: "Messages by " + data.targetUser.username,
color: "#8803fc",
flashTitle: false,
username: true,
},
true,
);
ok = true;
}

if (!ok) return;
chatHighlights.save();
}

function getProfileURL(): string {
return window.location.origin + "/" + props.target.username;
}
Expand Down Expand Up @@ -587,6 +622,7 @@ main.seventv-user-card-container {
right: 0.5rem;
top: 0.5rem;
height: 2rem;
width: 8rem;
display: flex;
column-gap: 0.25rem;

Expand Down
Loading
Loading