diff --git a/.gitignore b/.gitignore index a0be5c16..5ad1b015 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,6 @@ selenium-debug.log config/local.json config/local.*.json docs/site/ -.vscode/ \ No newline at end of file +.vscode/ +tools/.venv/ +static/ruffle/ diff --git a/README.md b/README.md index a44def70..4a5b7be9 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,8 @@ - script to get new emojis is included for future unicode versions - add toggle for showing post edit notifications - add support for accepted follow request notifications +- add a script to download ruffle for flash support (requires python3 and requests library) + - download by entering `tools/` and running `python3 download_ruffle.py` --- diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index 68b90c72..a03c2351 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -82,6 +82,9 @@ const conversation = { streamingEnabled () { return this.mergedConfig.useStreamingApi && this.mastoUserSocketStatus === WSConnectionStatus.JOINED }, + timelineStyle () { + return this.$store.getters.mergedConfig.timelineStyle + }, displayStyle () { return this.$store.getters.mergedConfig.conversationDisplay }, @@ -267,11 +270,11 @@ const conversation = { }, replies () { let i = 1 - + return reduce(this.conversation, (result, { id, in_reply_to_status_id }) => { - + const irid = in_reply_to_status_id - + if (irid) { result[irid] = result[irid] || [] result[irid].push({ diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue index 61f1358a..e6cd3235 100644 --- a/src/components/conversation/conversation.vue +++ b/src/components/conversation/conversation.vue @@ -69,6 +69,7 @@ :in-profile="inProfile" :profile-user-id="profileUserId" class="conversation-status status-fadein panel-body" + :class="timelineStyle" :simple-tree="treeViewIsSimple" :toggle-thread-display="toggleThreadDisplay" @@ -173,6 +174,7 @@ :in-profile="inProfile" :profile-user-id="profileUserId" class="conversation-status status-fadein panel-body" + :class="timelineStyle" :toggle-thread-display="toggleThreadDisplay" :thread-display-status="threadDisplayStatus" @@ -243,7 +245,7 @@ padding: var(--status-margin, $status-margin); } - .conversation-status { + .conversation-status.classic { border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: var(--border, $fallback--border); diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js index 94aa3734..0fee5e74 100644 --- a/src/components/emoji_reactions/emoji_reactions.js +++ b/src/components/emoji_reactions/emoji_reactions.js @@ -39,6 +39,9 @@ const EmojiReactions = { return acc }, {}) }, + timelineStyle () { + return this.$store.getters.mergedConfig.timelineStyle + }, loggedIn () { return !!this.$store.state.users.currentUser }, @@ -52,7 +55,7 @@ const EmojiReactions = { var toPush = [] finalReacts.forEach((react) => { var rawReact = toRaw(react)["name"] - + if ( // match regex // >1 check is to prevent = just disabling all emoji reacts @@ -63,7 +66,7 @@ const EmojiReactions = { || (rawReact.match(/.*@.*/) ? rawReact.split("@")[0] : rawReact) == item ) { toPush.push(react) - } + } }) toPush.forEach((nice) => { diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue index c083625f..b54bbd32 100644 --- a/src/components/emoji_reactions/emoji_reactions.vue +++ b/src/components/emoji_reactions/emoji_reactions.vue @@ -1,5 +1,5 @@