Merge branch 'master' into feat/block-chat-phrases

.env.dev

@@ -1,6 +1,8 @@
 NODE_ENV=development
+VITE_APP_SITE="http://localhost:4200"
 VITE_APP_API="http://localhost:3100/v3"
 VITE_APP_API_GQL="http://localhost:3000/v3/gql"
 VITE_APP_API_REST_OLD="http://localhost:3100/v2"
 VITE_APP_API_EVENTS="ws://localhost:3700/v3"
+VITE_APP_API_EGVAULT="http://localhost:3444/v1"
 VITE_APP_HOST="http://localhost:8080"

.env.production

@@ -1,6 +1,9 @@
 NODE_ENV=production
+VITE_APP_SITE="https://7tv.app"
 VITE_APP_API="https://7tv.io/v3"
 VITE_APP_API_GQL="https://7tv.io/v3/gql"
 VITE_APP_API_REST_OLD="https://7tv.io/v2"
 VITE_APP_API_EVENTS="wss://events.7tv.io/v3"
+VITE_APP_API_EGVAULT="https://egvault.7tv.io/v1"
 VITE_APP_HOST="https://extension.7tv.gg"
+

.eslintrc.cjs

@@ -29,6 +29,7 @@ module.exports = {
 		"vue/valid-template-root": "off",
 		"vue/multi-word-component-names": "off",
 		"vue/require-default-prop": "off",
+		"vue/no-dupe-keys": "off",
 		"@typescript-eslint/no-non-null-assertion": "off",
 	},
 	globals: {

.github/workflows/ci.yaml

@@ -32,8 +32,7 @@ on:
                 description: "Deploy Hosted Build"
 
 concurrency:
-    group: ${{ github.workflow }}-${{ github.ref }}
-    cancel-in-progress: true
+    group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.branch }}
 
 env:
     ARTIFACT_NAME: 7tv-webextension

.github/workflows/crowdin.yaml

@@ -24,7 +24,7 @@ jobs:
 
             - name: crowdin action
               if: steps.changes.outputs.crowdin == 'true'
-              uses: crowdin/github-action@v1.8.1
+              uses: crowdin/github-action@v1.11.0
               with:
                   upload_sources: true
                   upload_translations: false
@@ -69,7 +69,7 @@ jobs:
                   git checkout ${{ env.BASE_BRANCH }}
 
             - name: Download Crowdin Translations
-              uses: crowdin/github-action@v1.8.1
+              uses: crowdin/github-action@v1.11.0
               with:
                   upload_sources: false
                   upload_translations: false

CHANGELOG-nightly.md

@@ -2,12 +2,86 @@
 
 **The changes listed here are not assigned to an official release**.
 
+-   Fixed an issue where mentioning yourself would highlight the message
+-   Fixed an issue where replying to a thread starting from your own message would highlight the message
+-   Added an option to select default Emote Menu tab
+-   Added artist attribution to emote card
+
+### 3.0.14.1000
+
+-   Added a shortcut (Ctrl+E) to open the Emote Menu
+-   Added shortcuts (Up/Down Arrows) to switch between providers in the Emote Menu
+-   Search in the Emote Menu will now automatically open the nearest tab where matches are found
+-   The input box in the Emote Menu is now focused automatically upon opening
+-   Added an option to show stream stats such as latency, resolution, bitrate, etc.
+-   Added an option to set click actions on the video player (pause/unpause and mute/unmute)
+-   Added an option to hide player extensions
+-   Added iterable tab-completion on Kick
+-   Fixed a user card crash
+-   Fixed an issue with the EventAPI connection closing on the first initialization
+-   Fixed an issue that prevented new chatters from appearing in autocompletion
+-   Fixed an issue which squished tooltips when hovering an emote on the far right side of chat
+-   Fixed an issue which hid historical messages on Kick
+-   Increased the default value for Message Batching from 150 to 250
+
+### Version 3.0.13.1000
+
+-   Added an option to hide the new mature content dialogs on Twitch
+-   Added formatting support for Hype Chat
+-   Added options to hide Hype Chats and the Hype Chat button
+-   Fixed an issue which prevented moderator data from loading in User Cards
+-   Fixed an issue where nametags with blending paints did not correctly use the base color and appeared invisible instead
+-   Kick:
+    -   Added a settings menu
+    -   Added an option to set a delay betweet rendering new messages (Message Batching)
+    -   Added an option to set alternating backgrounds between chat messages
+    -   The chat input box on Kick no longers loses focus during slow mode
+    -   Zero-Width Emotes should now appear properly in Kick chat
+
+### Version 3.0.12.1000
+
+-   Added colon-completion (partial emote matches with ":") on Kick
+-   Added history navigation (up/down arrow) on Kick
+-   Updated the auth mechanism on Kick to avoid using third-party cookies
+
+### Version 3.0.11.1000
+
+-   Fixed an issue that caused long messages to pause the chat on Kick
+
+### Version 3.0.10.1000
+
+-   Tweaked some styling issues in the Emote Menu
+-   Kick:
+    -   Fixed an issue where historical messages did not consistently render
+    -   Fixed an issue which caused text to become misplaced when mixed with Kick native emotes
+    -   Fixed an issue with the Emote Menu & Tooltips not appearing while in theater mode
+    -   Fixed some issues where the connection flow failed
+    -   Long text sequences should no longer overflow outside of the chat box
+    -   Adjusted emoji scale to be in line with other platforms
+    -   Clicking an emoji in the Emote Menu should now correctly input the unicode instead of the name
+
+### Version 3.0.9.1000
+
+-   Added new feature: Paint Tool ([subscribers only](https://7tv.app/store))
+-   Added support for more features on [kick.com](https://kick.com/)
+    -   Authentication / Channel Linking
+    -   Channel Emotes
+    -   Emote Menu
+    -   7TV Paints & Badges
+-   Fixed an issue which caused mod icons to be invisible
+-   Fixed an issue where the emote menu button was broken due to a recent Twitch change
+-   Fixed an issue which sometimes caused channel emote sets to disappear
+-   Fixed an issue which caused stylesheets to be duplicated when running in hosted mode
+
+### Version 3.0.8.1000
+
 -   Enabled AVIF images on Firefox >= 113 by default
 -   Added sub duration & account creation date in the User Card
 -   Added a button to open an emote's full page from the emote card
 -   Fixed an issue where clicking the upper drag region in the User Card opened the user's channel
 -   Fixed user card content overflowing due to long messages
 -   Fixed chat scroller being visible in the viewer list
+-   Tentatively fixed an issue which caused the sidebar to crash occasionally
 
 ### Version 3.0.7.1000
 

CHANGELOG.md

@@ -1,3 +1,74 @@
+### 3.0.14.1000
+
+-   Added a shortcut (Ctrl+E) to open the Emote Menu
+-   Added shortcuts (Up/Down Arrows) to switch between providers in the Emote Menu
+-   Search in the Emote Menu will now automatically open the nearest tab where matches are found
+-   The input box in the Emote Menu is now focused automatically upon opening
+-   Added an option to show stream stats such as latency, resolution, bitrate, etc.
+-   Added an option to set click actions on the video player (pause/unpause and mute/unmute)
+-   Added an option to hide player extensions
+-   Added iterable tab-completion on Kick
+-   Fixed a user card crash
+-   Fixed an issue with the EventAPI connection closing on the first initialization
+-   Fixed an issue that prevented new chatters from appearing in autocompletion
+-   Fixed an issue which squished tooltips when hovering an emote on the far right side of chat
+-   Fixed an issue which hid historical messages on Kick
+-   Increased the default value for Message Batching from 150 to 250
+
+### Version 3.0.13
+
+-   Added an option to hide the new mature content dialogs on Twitch
+-   Added formatting support for Hype Chat
+-   Added options to hide Hype Chats and the Hype Chat button
+-   Fixed an issue which prevented moderator data from loading in User Cards
+-   Fixed an issue where nametags with blending paints did not correctly use the base color and appeared invisible instead
+-   Kick:
+    -   Added a settings menu
+    -   Added an option to set a delay betweet rendering new messages (Message Batching)
+    -   Added an option to set alternating backgrounds between chat messages
+    -   The chat input box on Kick no longers loses focus during slow mode
+    -   Zero-Width Emotes should now appear properly in Kick chat
+
+### Version 3.0.12
+
+-   Added colon-completion (partial emote matches with ":") on Kick
+-   Added history navigation (up/down arrow) on Kick
+-   Updated the auth mechanism on Kick to avoid using third-party cookies
+
+### Version 3.0.11
+
+-   Fixed an issue which caused chat to randomly pause on Kick
+
+### Version 3.0.10
+
+-   Tweaked some styling issues in the Emote Menu
+-   Kick:
+    -   Fixed an issue where historical messages did not consistently render
+    -   Fixed an issue which caused text to become misplaced when mixed with Kick native emotes
+    -   Fixed an issue with the Emote Menu & Tooltips not appearing while in theater mode
+    -   Fixed some issues where the connection flow failed
+    -   Long text sequences should no longer overflow outside of the chat box
+    -   Adjusted emoji scale to be in line with other platforms
+    -   Clicking an emoji in the Emote Menu should now correctly input the unicode instead of the name
+
+### Version 3.0.9
+
+-   Added support for [Kick](https://kick.com)
+-   Added new feature: Paint Tool ([subscribers only](https://7tv.app/store))
+-   Fixed an issue where the emote menu button was broken due to a recent Twitch change
+-   Fixed an issue which sometimes caused channel emote sets to disappear
+-   Fixed an issue which caused stylesheets to be duplicated when running in hosted mode
+
+### Version 3.0.8
+
+-   Enabled AVIF images on Firefox >= 113 by default
+-   Added sub duration & account creation date in the User Card
+-   Added a button to open an emote's full page from the emote card
+-   Fixed an issue where clicking the upper drag region in the User Card opened the user's channel
+-   Fixed user card content overflowing due to long messages
+-   Fixed chat scroller being visible in the viewer list
+-   Tentatively fixed an issue which caused the sidebar to crash occasionally
+
 ### Version 3.0.7
 
 -   Added a new User Card

index.html

@@ -24,6 +24,6 @@
 			>
 		</noscript>
 		<div id="app"></div>
-		<script type="module" src="src/options/options.ts"></script>
+		<script type="module" src="src/app/options/options.ts"></script>
 	</body>
 </html>

locale/en_US.yaml

@@ -36,7 +36,11 @@ emote_menu:
     native: Open Native Menu
     favorite_set: Favorite Emotes
     most_used_set: Most Used Emotes
+    personal_emotes_promo_1: You don't have Personal Emotes yet
+    personal_emotes_promo_2: Use custom emotes anywhere on {PLATFORM} with a 7TV Subscription
     sets:
+        Channel Emotes: Channel Emotes
+        Personal Emotes: Personal Emotes
         Global Emotes: Global Emotes
         Smileys & Emotion: Smileys & Emotion
         People & Body: People & Body
@@ -141,3 +145,17 @@ onboarding:
     button_done: Done
     button_join: Join
     button_review: Review
+
+site:
+    kick:
+        connect_button_channel: Connect {CHANNEL}
+        connect_button_site: Connect 7TV...
+        connect_button_site_tooltip: Use this button to get signed into 7tv.app with your Kick account ({ACTOR})
+        connect_popup_idle: Are you sure you'd like to link your current kick.com account ({ACTOR}) with 7TV?
+        connect_popup_connecting: Please wait...
+        connect_popup_done: Your channel has been successfully connected to 7TV! Use the 7tv.app website to start adding emotes
+
+settings:
+    chat_alternating_background:
+        label: Alternating Background
+        hint: Display chat lines with alternating background colors

package.json

@@ -3,8 +3,8 @@
 	"displayName": "7TV",
 	"description": "Improve your viewing experience on Twitch & YouTube with new features, emotes, vanity and performance.",
 	"private": true,
-	"version": "3.0.7",
-	"dev_version": "3.0",
+	"version": "3.0.14",
+	"dev_version": "1.0",
 	"scripts": {
 		"start": "NODE_ENV=dev yarn build:dev && NODE_ENV=dev vite --mode dev",
 		"build:section:app": "vite build --config vite.config.ts",
@@ -29,63 +29,63 @@
 		"script:compile-emoji": "tsc -p script/script.tsconfig.json --outDir dist/ && node dist/compile-emojis.js"
 	},
 	"dependencies": {
-		"vue": "^3.3.2"
+		"vue": "^3.3.4"
 	},
 	"devDependencies": {
-		"@apollo/client": "^3.7.14",
-		"@floating-ui/dom": "^1.2.8",
-		"@intlify/unplugin-vue-i18n": "^0.10.0",
+		"@apollo/client": "^3.7.15",
+		"@floating-ui/dom": "^1.4.1",
+		"@intlify/unplugin-vue-i18n": "^0.11.0",
 		"@trivago/prettier-plugin-sort-imports": "^4.1.1",
-		"@types/chrome": "^0.0.235",
+		"@types/chrome": "^0.0.237",
 		"@types/dompurify": "^3.0.2",
 		"@types/fs-extra": "^11.0.1",
-		"@types/marked": "^4.3.0",
-		"@types/node": "^20.1.4",
+		"@types/marked": "^5.0.0",
+		"@types/node": "^20.3.1",
 		"@types/sharedworker": "^0.0.96",
 		"@types/ua-parser-js": "^0.7.36",
-		"@types/uuid": "^9.0.1",
-		"@typescript-eslint/eslint-plugin": "^5.59.5",
-		"@typescript-eslint/parser": "^5.59.5",
+		"@types/uuid": "^9.0.2",
+		"@typescript-eslint/eslint-plugin": "^5.60.1",
+		"@typescript-eslint/parser": "^5.60.1",
 		"@vitejs/plugin-vue": "^4.2.3",
-		"@vue/apollo-composable": "^4.0.0-beta.4",
-		"@vue/compiler-sfc": "^3.3.2",
+		"@vue/apollo-composable": "^4.0.0-beta.7",
+		"@vue/compiler-sfc": "^3.3.4",
 		"@vue/eslint-config-prettier": "^7.1.0",
 		"@vue/eslint-config-typescript": "^11.0.3",
-		"@vueuse/core": "^10.1.2",
+		"@vueuse/core": "^10.2.0",
 		"@vueuse/head": "^1.1.26",
 		"chokidar": "^3.5.3",
 		"color2k": "^2.0.2",
 		"date-fns": "^2.30.0",
-		"dexie": "^3.2.3",
+		"dexie": "^3.2.4",
 		"dompurify": "^3.0.3",
-		"eslint": "^8.40.0",
+		"eslint": "^8.43.0",
 		"eslint-plugin-prettier": "^4.2.1",
-		"eslint-plugin-vue": "^9.13.0",
-		"graphql": "^16.6.0",
-		"marked": "^5.0.2",
+		"eslint-plugin-vue": "^9.15.0",
+		"graphql": "^16.7.1",
+		"marked": "^5.1.0",
 		"nanoid": "^4.0.2",
 		"npm-run-all": "^4.1.5",
-		"pinia": "^2.0.36",
+		"pinia": "^2.1.4",
 		"postcss-html": "^1.5.0",
 		"postcss-scss": "^4.0.6",
 		"prettier": "^2.8.8",
-		"sass": "^1.62.1",
-		"stylelint": "^15.6.1",
+		"sass": "^1.63.4",
+		"stylelint": "^15.9.0",
 		"stylelint-config-html": "^1.1.0",
 		"stylelint-config-standard": "^33.0.0",
 		"stylelint-config-standard-scss": "^9.0.0",
 		"stylelint-config-standard-vue": "^1.0.0",
-		"stylelint-scss": "^5.0.0",
-		"terser": "^5.17.3",
-		"tldts": "^6.0.5",
-		"typescript": "^5.0.4",
+		"stylelint-scss": "^5.0.1",
+		"terser": "^5.18.1",
+		"tldts": "^6.0.8",
+		"typescript": "^5.1.3",
 		"ua-parser-js": "^1.0.35",
 		"uuid": "^9.0.0",
-		"vite": "^4.3.6",
+		"vite": "^4.3.9",
 		"vite-plugin-chrome-extension": "^0.0.7",
 		"vue-i18n": "9.2.2",
-		"vue-router": "4.2.0",
-		"vue-tsc": "^1.6.5",
+		"vue-router": "4.2.2",
+		"vue-tsc": "^1.8.0",
 		"webextension-polyfill-ts": "^0.26.0"
 	}
 }

src/site/twitch.tv/modules/chat/components/user/Badge.vue → src/app/chat/Badge.vue

@@ -49,8 +49,6 @@ if (isApp(props.badge)) {
 <style scoped lang="scss">
 .seventv-chat-badge {
 	display: inline-block;
-	height: 1.8rem;
-	width: 1.8rem;
 	vertical-align: baseline;
 }
 </style>

src/app/chat/Chat.vue

@@ -0,0 +1,7 @@
+<template>
+	<div />
+</template>
+
+<script setup lang="ts">
+void 0;
+</script>