From 5384d3b7a2d006d5d760680170b9998bf115862a Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 15 Aug 2024 20:43:11 +0300 Subject: [PATCH 1/3] fix solid color highlight --- src/services/user_highlighter/user_highlighter.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/services/user_highlighter/user_highlighter.js b/src/services/user_highlighter/user_highlighter.js index b5f580405..145b3e5e7 100644 --- a/src/services/user_highlighter/user_highlighter.js +++ b/src/services/user_highlighter/user_highlighter.js @@ -27,7 +27,11 @@ const highlightStyle = (prefs) => { } } else if (type === 'solid') { return { - backgroundColor: tintColor2, + backgroundImage: [ + 'repeating-linear-gradient(90deg,', + `${tintColor} ,`, + `${tintColor} 20px` + ].join(' '), ...customProps } } else if (type === 'side') { From a9c2d373157708c9d08289edb55069a9a054a7e6 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 15 Aug 2024 21:49:45 +0300 Subject: [PATCH 2/3] ok i'm dumb, no manual caching needed tehepero --- src/modules/instance.js | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/modules/instance.js b/src/modules/instance.js index 2281141f4..7ec7a5dfb 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -250,21 +250,15 @@ const instance = { }, {}) }, standardEmojiList (state) { - if (!state.standardEmojiList) { - state.standardEmojiList = SORTED_EMOJI_GROUP_IDS - .map(groupId => (state.emoji[groupId] || []).map(k => injectAnnotations(k, state.unicodeEmojiAnnotations))) - .reduce((a, b) => a.concat(b), []) - } - return state.standardEmojiList + return SORTED_EMOJI_GROUP_IDS + .map(groupId => (state.emoji[groupId] || []).map(k => injectAnnotations(k, state.unicodeEmojiAnnotations))) + .reduce((a, b) => a.concat(b), []) }, standardEmojiGroupList (state) { - if (!state.standardEmojiGroupList) { - state.standardEmojiGroupList = SORTED_EMOJI_GROUP_IDS.map(groupId => ({ - id: groupId, - emojis: (state.emoji[groupId] || []).map(k => injectAnnotations(k, state.unicodeEmojiAnnotations)) - })) - } - return state.standardEmojiGroupList + return SORTED_EMOJI_GROUP_IDS.map(groupId => ({ + id: groupId, + emojis: (state.emoji[groupId] || []).map(k => injectAnnotations(k, state.unicodeEmojiAnnotations)) + })) }, instanceDomain (state) { return new URL(state.server).hostname From ab90dc9fb1785d237be5fa3ff207056d7935ddaf Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 15 Aug 2024 21:53:12 +0300 Subject: [PATCH 3/3] Revert all the user highlight stuff for now --- src/components/status/status.vue | 5 +++-- src/services/user_highlighter/user_highlighter.js | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/components/status/status.vue b/src/components/status/status.vue index a8cef3c1c..61a58cda0 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -3,8 +3,7 @@ v-if="!hideStatus" ref="root" class="Status" - :class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }, userClass, { highlighted: userStyle, '-repeat': retweet && !inConversation }]" - :style="[ userStyle ]" + :class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }]" >
diff --git a/src/services/user_highlighter/user_highlighter.js b/src/services/user_highlighter/user_highlighter.js index 145b3e5e7..b5f580405 100644 --- a/src/services/user_highlighter/user_highlighter.js +++ b/src/services/user_highlighter/user_highlighter.js @@ -27,11 +27,7 @@ const highlightStyle = (prefs) => { } } else if (type === 'solid') { return { - backgroundImage: [ - 'repeating-linear-gradient(90deg,', - `${tintColor} ,`, - `${tintColor} 20px` - ].join(' '), + backgroundColor: tintColor2, ...customProps } } else if (type === 'side') {