From e1798d0eb0180bea9237e3cff399a4883173f195 Mon Sep 17 00:00:00 2001 From: Sorin Davidoi Date: Thu, 27 Jul 2017 15:46:33 +0200 Subject: fix(push_subscription): Use star icon for favourite action (#4396) --- app/models/web/push_subscription.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models') diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb index 86df9b591..02002db5a 100644 --- a/app/models/web/push_subscription.rb +++ b/app/models/web/push_subscription.rb @@ -117,7 +117,7 @@ class Web::PushSubscription < ApplicationRecord when :mention then [ { title: translate('push_notifications.mention.action_favourite'), - icon: full_asset_url('emoji/2764.png', skip_pipeline: true), + icon: full_asset_url('emoji/2b50.png', skip_pipeline: true), todo: 'request', method: 'POST', action: "/api/v1/statuses/#{notification.target_status.id}/favourite", -- cgit From e67fc997dcb1c0e9e7e84d5f2d9247042024bfcb Mon Sep 17 00:00:00 2001 From: Sorin Davidoi Date: Fri, 28 Jul 2017 05:06:22 +0200 Subject: feat(web_push_notifications): Group notifications (#4388) --- .../service_worker/web_push_notifications.js | 44 +++++++++++++++++++++- app/models/web/push_subscription.rb | 1 + config/locales/en.yml | 2 + 3 files changed, 46 insertions(+), 1 deletion(-) (limited to 'app/models') diff --git a/app/javascript/mastodon/service_worker/web_push_notifications.js b/app/javascript/mastodon/service_worker/web_push_notifications.js index 8996d3e83..64c457889 100644 --- a/app/javascript/mastodon/service_worker/web_push_notifications.js +++ b/app/javascript/mastodon/service_worker/web_push_notifications.js @@ -1,3 +1,45 @@ +const MAX_NOTIFICATIONS = 5; +const GROUP_TAG = 'tag'; + +// Avoid loading intl-messageformat and dealing with locales in the ServiceWorker +const formatGroupTitle = (message, count) => message.replace('%{count}', count); + +const notify = options => + self.registration.getNotifications().then(notifications => { + if (notifications.length === MAX_NOTIFICATIONS) { + // Reached the maximum number of notifications, proceed with grouping + const group = { + title: formatGroupTitle(notifications[0].data.message, notifications.length + 1), + body: notifications + .sort((n1, n2) => n1.timestamp < n2.timestamp) + .map(notification => notification.title).join('\n'), + badge: '/badge.png', + icon: '/android-chrome-192x192.png', + tag: GROUP_TAG, + data: { + url: (new URL('/web/notifications', self.location)).href, + count: notifications.length + 1, + message: notifications[0].data.message, + }, + }; + + notifications.forEach(notification => notification.close()); + + return self.registration.showNotification(group.title, group); + } else if (notifications.length === 1 && notifications[0].tag === GROUP_TAG) { + // Already grouped, proceed with appending the notification to the group + const group = cloneNotification(notifications[0]); + + group.title = formatGroupTitle(group.data.message, group.data.count + 1); + group.body = `${options.title}\n${group.body}`; + group.data = { ...group.data, count: group.data.count + 1 }; + + return self.registration.showNotification(group.title, group); + } + + return self.registration.showNotification(options.title, options); + }); + const handlePush = (event) => { const options = event.data.json(); @@ -17,7 +59,7 @@ const handlePush = (event) => { options.actions = options.data.actions; } - event.waitUntil(self.registration.showNotification(options.title, options)); + event.waitUntil(notify(options)); }; const cloneNotification = (notification) => { diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb index 02002db5a..7356ed882 100644 --- a/app/models/web/push_subscription.rb +++ b/app/models/web/push_subscription.rb @@ -53,6 +53,7 @@ class Web::PushSubscription < ApplicationRecord url: url, actions: actions, access_token: access_token, + message: translate('push_notifications.group.title'), # Do not pass count, will be formatted in the ServiceWorker } ), endpoint: endpoint, diff --git a/config/locales/en.yml b/config/locales/en.yml index cb4c51a11..ace83a0f8 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -348,6 +348,8 @@ en: title: "%{name} favourited your status" follow: title: "%{name} is now following you" + group: + title: "%{count} notifications" mention: action_boost: Boost action_expand: Show more -- cgit From 13bb1ddc7f5f5e3a7fc57396427c750f40d80603 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 28 Jul 2017 18:13:42 +0200 Subject: Use consistent icons for web push notifications, same as web UI (#4426) --- app/models/web/push_subscription.rb | 6 +++--- public/web-push-icon_expand.png | Bin 0 -> 1380 bytes public/web-push-icon_favourite.png | Bin 0 -> 1046 bytes public/web-push-icon_reblog.png | Bin 0 -> 851 bytes 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 public/web-push-icon_expand.png create mode 100644 public/web-push-icon_favourite.png create mode 100644 public/web-push-icon_reblog.png (limited to 'app/models') diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb index 7356ed882..b343cf044 100644 --- a/app/models/web/push_subscription.rb +++ b/app/models/web/push_subscription.rb @@ -118,7 +118,7 @@ class Web::PushSubscription < ApplicationRecord when :mention then [ { title: translate('push_notifications.mention.action_favourite'), - icon: full_asset_url('emoji/2b50.png', skip_pipeline: true), + icon: full_asset_url('web-push-icon_favourite.png', skip_pipeline: true), todo: 'request', method: 'POST', action: "/api/v1/statuses/#{notification.target_status.id}/favourite", @@ -131,11 +131,11 @@ class Web::PushSubscription < ApplicationRecord can_boost = notification.type.equal?(:mention) && !notification.target_status.nil? && !notification.target_status.hidden? if should_hide - actions.insert(0, title: translate('push_notifications.mention.action_expand'), icon: full_asset_url('emoji/1f441.png'), todo: 'expand', action: 'expand') + actions.insert(0, title: translate('push_notifications.mention.action_expand'), icon: full_asset_url('web-push-icon_expand.png', skip_pipeline: true), todo: 'expand', action: 'expand') end if can_boost - actions << { title: translate('push_notifications.mention.action_boost'), icon: full_asset_url('emoji/1f504.png'), todo: 'request', method: 'POST', action: "/api/v1/statuses/#{notification.target_status.id}/reblog" } + actions << { title: translate('push_notifications.mention.action_boost'), icon: full_asset_url('web-push-icon_boost.png', skip_pipeline: true), todo: 'request', method: 'POST', action: "/api/v1/statuses/#{notification.target_status.id}/reblog" } end actions diff --git a/public/web-push-icon_expand.png b/public/web-push-icon_expand.png new file mode 100644 index 000000000..972c28886 Binary files /dev/null and b/public/web-push-icon_expand.png differ diff --git a/public/web-push-icon_favourite.png b/public/web-push-icon_favourite.png new file mode 100644 index 000000000..ef36b8898 Binary files /dev/null and b/public/web-push-icon_favourite.png differ diff --git a/public/web-push-icon_reblog.png b/public/web-push-icon_reblog.png new file mode 100644 index 000000000..0f555ed09 Binary files /dev/null and b/public/web-push-icon_reblog.png differ -- cgit From f0bb2c6d1eeea63cd92be3da57288fd4743a8db9 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 28 Jul 2017 20:26:54 +0200 Subject: Fix web push notifications "boost" icon not being loaded (regression from #4426) (#4431) --- app/models/web/push_subscription.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models') diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb index b343cf044..45ce3298a 100644 --- a/app/models/web/push_subscription.rb +++ b/app/models/web/push_subscription.rb @@ -135,7 +135,7 @@ class Web::PushSubscription < ApplicationRecord end if can_boost - actions << { title: translate('push_notifications.mention.action_boost'), icon: full_asset_url('web-push-icon_boost.png', skip_pipeline: true), todo: 'request', method: 'POST', action: "/api/v1/statuses/#{notification.target_status.id}/reblog" } + actions << { title: translate('push_notifications.mention.action_boost'), icon: full_asset_url('web-push-icon_reblog.png', skip_pipeline: true), todo: 'request', method: 'POST', action: "/api/v1/statuses/#{notification.target_status.id}/reblog" } end actions -- cgit From 53b2b1b2389c0ea941c50d4a9c726539d808c384 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 29 Jul 2017 00:06:29 +0200 Subject: Count all URLs in text as 23 characters flat, do not count domain part of usernames (#4427) * Count all URLs in text as 23 characters flat, do not count domain part of usernames * Add new status text counting logic to web UI --- .../compose/components/character_counter.js | 2 +- .../features/compose/components/compose_form.js | 7 ++-- .../mastodon/features/compose/util/counter.js | 7 ++++ app/models/account.rb | 2 +- app/validators/status_length_validator.rb | 23 ++++++++++- spec/models/status_spec.rb | 2 +- spec/validators/status_length_validator_spec.rb | 44 ++++++++++++++++++++++ 7 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 app/javascript/mastodon/features/compose/util/counter.js create mode 100644 spec/validators/status_length_validator_spec.rb (limited to 'app/models') diff --git a/app/javascript/mastodon/features/compose/components/character_counter.js b/app/javascript/mastodon/features/compose/components/character_counter.js index 6c488b661..0ecfc9141 100644 --- a/app/javascript/mastodon/features/compose/components/character_counter.js +++ b/app/javascript/mastodon/features/compose/components/character_counter.js @@ -13,12 +13,12 @@ export default class CharacterCounter extends React.PureComponent { if (diff < 0) { return {diff}; } + return {diff}; } render () { const diff = this.props.max - length(this.props.text); - return this.checkRemainingText(diff); } diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index 170fb0f28..f3320a42b 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -18,6 +18,7 @@ import WarningContainer from '../containers/warning_container'; import { isMobile } from '../../../is_mobile'; import ImmutablePureComponent from 'react-immutable-pure-component'; import { length } from 'stringz'; +import { countableText } from '../util/counter'; const messages = defineMessages({ placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' }, @@ -145,9 +146,9 @@ export default class ComposeForm extends ImmutablePureComponent { render () { const { intl, onPaste, showSearch } = this.props; const disabled = this.props.is_submitting; - const text = [this.props.spoiler_text, this.props.text].join(''); + const text = [this.props.spoiler_text, countableText(this.props.text)].join(''); - let publishText = ''; + let publishText = ''; if (this.props.privacy === 'private' || this.props.privacy === 'direct') { publishText = {intl.formatMessage(messages.publish)}; @@ -203,7 +204,7 @@ export default class ComposeForm extends ImmutablePureComponent {
-
+
diff --git a/app/javascript/mastodon/features/compose/util/counter.js b/app/javascript/mastodon/features/compose/util/counter.js new file mode 100644 index 000000000..589e85460 --- /dev/null +++ b/app/javascript/mastodon/features/compose/util/counter.js @@ -0,0 +1,7 @@ +const urlPlaceholder = 'xxxxxxxxxxxxxxxxxxxxxxx'; + +export function countableText(inputText) { + return inputText + .replace(/https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/g, urlPlaceholder) + .replace(/(?:^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9\.\-]+)/ig, '@$2'); +}; diff --git a/app/models/account.rb b/app/models/account.rb index 82c9b58d5..163bd1c0e 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -44,7 +44,7 @@ # class Account < ApplicationRecord - MENTION_RE = /(?:^|[^\/[:word:]])@([a-z0-9_]+(?:@[a-z0-9\.\-]+[a-z0-9]+)?)/i + MENTION_RE = /(?:^|[^\/[:word:]])@(([a-z0-9_]+)(?:@[a-z0-9\.\-]+[a-z0-9]+)?)/i include AccountAvatar include AccountFinderConcern diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb index 3f3e422d9..abf250d65 100644 --- a/app/validators/status_length_validator.rb +++ b/app/validators/status_length_validator.rb @@ -5,6 +5,27 @@ class StatusLengthValidator < ActiveModel::Validator def validate(status) return unless status.local? && !status.reblog? - status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if [status.text, status.spoiler_text].join.mb_chars.grapheme_length > MAX_CHARS + status.errors.add(:text, I18n.t('statuses.over_character_limit', max: MAX_CHARS)) if too_long?(status) + end + + private + + def too_long?(status) + countable_length(status) > MAX_CHARS + end + + def countable_length(status) + total_text(status).mb_chars.grapheme_length + end + + def total_text(status) + [status.spoiler_text, countable_text(status)].join + end + + def countable_text(status) + status.text.dup.tap do |new_text| + URI.extract(new_text).each { |url| new_text.gsub!(url, 'x' * 23) } + new_text.gsub!(Account::MENTION_RE, '@\2') + end end end diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb index 0b90205ee..626fc3f98 100644 --- a/spec/models/status_spec.rb +++ b/spec/models/status_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe Status, type: :model do let(:alice) { Fabricate(:account, username: 'alice') } let(:bob) { Fabricate(:account, username: 'bob') } - let(:other) { Fabricate(:status, account: bob, text: 'Skulls for the skull god! The enemy\'s gates are sideways!')} + let(:other) { Fabricate(:status, account: bob, text: 'Skulls for the skull god! The enemy\'s gates are sideways!') } subject { Fabricate(:status, account: alice) } diff --git a/spec/validators/status_length_validator_spec.rb b/spec/validators/status_length_validator_spec.rb new file mode 100644 index 000000000..e2d1a15ec --- /dev/null +++ b/spec/validators/status_length_validator_spec.rb @@ -0,0 +1,44 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe StatusLengthValidator do + describe '#validate' do + it 'does not add errors onto remote statuses' + it 'does not add errors onto local reblogs' + + it 'adds an error when content warning is over 500 characters' do + status = double(spoiler_text: 'a' * 520, text: '', errors: double(add: nil), local?: true, reblog?: false) + subject.validate(status) + expect(status.errors).to have_received(:add) + end + + it 'adds an error when text is over 500 characters' do + status = double(spoiler_text: '', text: 'a' * 520, errors: double(add: nil), local?: true, reblog?: false) + subject.validate(status) + expect(status.errors).to have_received(:add) + end + + it 'adds an error when text and content warning are over 500 characters total' do + status = double(spoiler_text: 'a' * 250, text: 'b' * 251, errors: double(add: nil), local?: true, reblog?: false) + subject.validate(status) + expect(status.errors).to have_received(:add) + end + + it 'counts URLs as 23 characters flat' do + text = ('a' * 476) + " http://#{'b' * 30}.com/example" + status = double(spoiler_text: '', text: text, errors: double(add: nil), local?: true, reblog?: false) + + subject.validate(status) + expect(status.errors).to_not have_received(:add) + end + + it 'counts only the front part of remote usernames' do + text = ('a' * 475) + " @alice@#{'b' * 30}.com" + status = double(spoiler_text: '', text: text, errors: double(add: nil), local?: true, reblog?: false) + + subject.validate(status) + expect(status.errors).to_not have_received(:add) + end + end +end -- cgit From d4c4820c03a081ef182407c2db16f27d0420335e Mon Sep 17 00:00:00 2001 From: Sorin Davidoi Date: Tue, 1 Aug 2017 06:00:13 +0200 Subject: fix(web_push_notifications): Send message with welcome notifications (#4471) * fix(web_push_notifications): Send grouping title in welcome notification * fix(web_push_notifications): Read message from last notification --- app/javascript/mastodon/service_worker/web_push_notifications.js | 4 ++-- app/models/web/push_subscription.rb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app/models') diff --git a/app/javascript/mastodon/service_worker/web_push_notifications.js b/app/javascript/mastodon/service_worker/web_push_notifications.js index 64c457889..acb85f626 100644 --- a/app/javascript/mastodon/service_worker/web_push_notifications.js +++ b/app/javascript/mastodon/service_worker/web_push_notifications.js @@ -9,7 +9,7 @@ const notify = options => if (notifications.length === MAX_NOTIFICATIONS) { // Reached the maximum number of notifications, proceed with grouping const group = { - title: formatGroupTitle(notifications[0].data.message, notifications.length + 1), + title: formatGroupTitle(options.data.message, notifications.length + 1), body: notifications .sort((n1, n2) => n1.timestamp < n2.timestamp) .map(notification => notification.title).join('\n'), @@ -19,7 +19,7 @@ const notify = options => data: { url: (new URL('/web/notifications', self.location)).href, count: notifications.length + 1, - message: notifications[0].data.message, + message: options.data.message, }, }; diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb index 45ce3298a..e76f61278 100644 --- a/app/models/web/push_subscription.rb +++ b/app/models/web/push_subscription.rb @@ -161,6 +161,7 @@ class Web::PushSubscription < ApplicationRecord content: translate('push_notifications.subscribed.body'), actions: [], url: web_url('notifications'), + message: translate('push_notifications.group.title'), # Do not pass count, will be formatted in the ServiceWorker } ), endpoint: endpoint, -- cgit