From 939a47393cf7b65bca9fa7817fcc2dbae770cb9c Mon Sep 17 00:00:00 2001 From: Takeshi Umeda Date: Thu, 23 Jul 2020 22:41:49 +0900 Subject: Fix duplicate notification and delivery of mentions (#14378) --- app/services/process_mentions_service.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb index 3822b7dc5..79af3fc54 100644 --- a/app/services/process_mentions_service.rb +++ b/app/services/process_mentions_service.rb @@ -36,7 +36,8 @@ class ProcessMentionsService < BaseService next match if mention_undeliverable?(mentioned_account) || mentioned_account&.suspended? - mentions << mentioned_account.mentions.where(status: status).first_or_create(status: status) + mention = mentioned_account.mentions.new(status: status) + mentions << mention if mention.save "@#{mentioned_account.acct}" end -- cgit From 956473142cf3e7e280d7d81990a4ade75095eb03 Mon Sep 17 00:00:00 2001 From: ThibG Date: Thu, 23 Jul 2020 23:54:19 +0200 Subject: Add custom icon for private boosts (#14380) --- app/javascript/styles/mastodon/boost.scss | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app') diff --git a/app/javascript/styles/mastodon/boost.scss b/app/javascript/styles/mastodon/boost.scss index a18e69a6a..b4c6d274d 100644 --- a/app/javascript/styles/mastodon/boost.scss +++ b/app/javascript/styles/mastodon/boost.scss @@ -6,6 +6,14 @@ button.icon-button i.fa-retweet { } } +.status-private button.icon-button i.fa-retweet { + background-image: url("data:image/svg+xml;utf8,"); + + &:hover { + background-image: url("data:image/svg+xml;utf8,"); + } +} + button.icon-button.disabled i.fa-retweet { background-image: url("data:image/svg+xml;utf8,"); } -- cgit From b136e621ea7aceb9c1224101e50991e9b82cfea6 Mon Sep 17 00:00:00 2001 From: ThibG Date: Thu, 23 Jul 2020 23:54:19 +0200 Subject: [Glitch] Add custom icon for private boosts Port 956473142cf3e7e280d7d81990a4ade75095eb03 to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/styles/components/boost.scss | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app') diff --git a/app/javascript/flavours/glitch/styles/components/boost.scss b/app/javascript/flavours/glitch/styles/components/boost.scss index 2d307765c..079e413bf 100644 --- a/app/javascript/flavours/glitch/styles/components/boost.scss +++ b/app/javascript/flavours/glitch/styles/components/boost.scss @@ -6,6 +6,14 @@ button.icon-button i.fa-retweet { } } +.status-private button.icon-button i.fa-retweet { + background-image: url("data:image/svg+xml;utf8,"); + + &:hover { + background-image: url("data:image/svg+xml;utf8,"); + } +} + // Disabled variant button.icon-button.disabled i.fa-retweet { &, &:hover { -- cgit From 5e93c7359d4f75dd4e4b80def2b80ee28938d9d4 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Fri, 24 Jul 2020 11:58:09 +0200 Subject: Fix custom boost icon colors being swapped --- app/javascript/flavours/glitch/styles/components/boost.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/javascript/flavours/glitch/styles/components/boost.scss b/app/javascript/flavours/glitch/styles/components/boost.scss index 079e413bf..014f07c72 100644 --- a/app/javascript/flavours/glitch/styles/components/boost.scss +++ b/app/javascript/flavours/glitch/styles/components/boost.scss @@ -7,10 +7,10 @@ button.icon-button i.fa-retweet { } .status-private button.icon-button i.fa-retweet { - background-image: url("data:image/svg+xml;utf8,"); + background-image: url("data:image/svg+xml;utf8,"); &:hover { - background-image: url("data:image/svg+xml;utf8,"); + background-image: url("data:image/svg+xml;utf8,"); } } -- cgit