- {announcements.map(announcement => (
+ {announcements.map((announcement, idx) => (
))}
diff --git a/app/javascript/mastodon/features/getting_started/containers/announcements_container.js b/app/javascript/mastodon/features/getting_started/containers/announcements_container.js
index 8c3fc2e6b50..9d03ad6f784 100644
--- a/app/javascript/mastodon/features/getting_started/containers/announcements_container.js
+++ b/app/javascript/mastodon/features/getting_started/containers/announcements_container.js
@@ -1,5 +1,5 @@
import { connect } from 'react-redux';
-import { addReaction, removeReaction } from 'mastodon/actions/announcements';
+import { addReaction, removeReaction, dismissAnnouncement } from 'mastodon/actions/announcements';
import Announcements from '../components/announcements';
import { createSelector } from 'reselect';
import { Map as ImmutableMap } from 'immutable';
@@ -12,6 +12,7 @@ const mapStateToProps = state => ({
});
const mapDispatchToProps = dispatch => ({
+ dismissAnnouncement: id => dispatch(dismissAnnouncement(id)),
addReaction: (id, name) => dispatch(addReaction(id, name)),
removeReaction: (id, name) => dispatch(removeReaction(id, name)),
});
diff --git a/app/javascript/mastodon/features/home_timeline/index.js b/app/javascript/mastodon/features/home_timeline/index.js
index 2bad22bc1de..577ff33bb03 100644
--- a/app/javascript/mastodon/features/home_timeline/index.js
+++ b/app/javascript/mastodon/features/home_timeline/index.js
@@ -24,7 +24,7 @@ const mapStateToProps = state => ({
hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0,
isPartial: state.getIn(['timelines', 'home', 'isPartial']),
hasAnnouncements: !state.getIn(['announcements', 'items']).isEmpty(),
- unreadAnnouncements: state.getIn(['announcements', 'unread']).size,
+ unreadAnnouncements: state.getIn(['announcements', 'items']).count(item => !item.get('read')),
showAnnouncements: state.getIn(['announcements', 'show']),
});
diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json
index d6f490fcfca..18692bc447c 100644
--- a/app/javascript/mastodon/locales/defaultMessages.json
+++ b/app/javascript/mastodon/locales/defaultMessages.json
@@ -293,6 +293,10 @@
},
{
"descriptors": [
+ {
+ "defaultMessage": "today",
+ "id": "relative_time.today"
+ },
{
"defaultMessage": "now",
"id": "relative_time.just_now"
@@ -1742,6 +1746,14 @@
"defaultMessage": "Home",
"id": "column.home"
},
+ {
+ "defaultMessage": "Show announcements",
+ "id": "home.show_announcements"
+ },
+ {
+ "defaultMessage": "Hide announcements",
+ "id": "home.hide_announcements"
+ },
{
"defaultMessage": "Your home timeline is empty! Visit {public} or use search to get started and meet other users.",
"id": "empty_column.home"
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 5871819a92d..e251999056b 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -188,6 +188,8 @@
"home.column_settings.basic": "Basic",
"home.column_settings.show_reblogs": "Show boosts",
"home.column_settings.show_replies": "Show replies",
+ "home.hide_announcements": "Hide announcements",
+ "home.show_announcements": "Show announcements",
"intervals.full.days": "{number, plural, one {# day} other {# days}}",
"intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
"intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -338,6 +340,7 @@
"relative_time.just_now": "now",
"relative_time.minutes": "{number}m",
"relative_time.seconds": "{number}s",
+ "relative_time.today": "today",
"reply_indicator.cancel": "Cancel",
"report.forward": "Forward to {target}",
"report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",
diff --git a/app/javascript/mastodon/reducers/announcements.js b/app/javascript/mastodon/reducers/announcements.js
index 1653318ce29..34e08eac88f 100644
--- a/app/javascript/mastodon/reducers/announcements.js
+++ b/app/javascript/mastodon/reducers/announcements.js
@@ -10,14 +10,14 @@ import {
ANNOUNCEMENTS_REACTION_REMOVE_FAIL,
ANNOUNCEMENTS_TOGGLE_SHOW,
ANNOUNCEMENTS_DELETE,
+ ANNOUNCEMENTS_DISMISS_SUCCESS,
} from '../actions/announcements';
-import { Map as ImmutableMap, List as ImmutableList, Set as ImmutableSet, fromJS } from 'immutable';
+import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
const initialState = ImmutableMap({
items: ImmutableList(),
isLoading: false,
show: false,
- unread: ImmutableSet(),
});
const updateReaction = (state, id, name, updater) => state.update('items', list => list.map(announcement => {
@@ -42,24 +42,11 @@ const addReaction = (state, id, name) => updateReaction(state, id, name, x => x.
const removeReaction = (state, id, name) => updateReaction(state, id, name, x => x.set('me', false).update('count', y => y - 1));
-const addUnread = (state, items) => {
- if (state.get('show')) {
- return state;
- }
-
- const newIds = ImmutableSet(items.map(x => x.get('id')));
- const oldIds = ImmutableSet(state.get('items').map(x => x.get('id')));
-
- return state.update('unread', unread => unread.union(newIds.subtract(oldIds)));
-};
-
const sortAnnouncements = list => list.sortBy(x => x.get('starts_at') || x.get('published_at'));
const updateAnnouncement = (state, announcement) => {
const idx = state.get('items').findIndex(x => x.get('id') === announcement.get('id'));
- state = addUnread(state, [announcement]);
-
if (idx > -1) {
// Deep merge is used because announcements from the streaming API do not contain
// personalized data about which reactions have been selected by the given user,
@@ -74,7 +61,6 @@ export default function announcementsReducer(state = initialState, action) {
switch(action.type) {
case ANNOUNCEMENTS_TOGGLE_SHOW:
return state.withMutations(map => {
- if (!map.get('show')) map.set('unread', ImmutableSet());
map.set('show', !map.get('show'));
});
case ANNOUNCEMENTS_FETCH_REQUEST:
@@ -83,10 +69,6 @@ export default function announcementsReducer(state = initialState, action) {
return state.withMutations(map => {
const items = fromJS(action.announcements);
- map.set('unread', ImmutableSet());
-
- addUnread(map, items);
-
map.set('items', items);
map.set('isLoading', false);
});
@@ -102,8 +84,10 @@ export default function announcementsReducer(state = initialState, action) {
case ANNOUNCEMENTS_REACTION_REMOVE_REQUEST:
case ANNOUNCEMENTS_REACTION_ADD_FAIL:
return removeReaction(state, action.id, action.name);
+ case ANNOUNCEMENTS_DISMISS_SUCCESS:
+ return updateAnnouncement(state, fromJS({ 'id': action.id, 'read': true }));
case ANNOUNCEMENTS_DELETE:
- return state.update('unread', set => set.delete(action.id)).update('items', list => {
+ return state.update('items', list => {
const idx = list.findIndex(x => x.get('id') === action.id);
if (idx > -1) {
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 398a48cff8f..2554c008d10 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -42,8 +42,7 @@ export default function statuses(state = initialState, action) {
case FAVOURITE_REQUEST:
return state.setIn([action.status.get('id'), 'favourited'], true);
case UNFAVOURITE_SUCCESS:
- const favouritesCount = action.status.get('favourites_count');
- return state.setIn([action.status.get('id'), 'favourites_count'], favouritesCount - 1);
+ return state.updateIn([action.status.get('id'), 'favourites_count'], x => Math.max(0, x - 1));
case FAVOURITE_FAIL:
return state.get(action.status.get('id')) === undefined ? state : state.setIn([action.status.get('id'), 'favourited'], false);
case BOOKMARK_REQUEST:
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 85b3b0cec19..54372022a7e 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -923,6 +923,7 @@
background: transparent;
padding: 0;
padding-top: 8px;
+ text-decoration: none;
&:hover,
&:active {
@@ -2522,7 +2523,7 @@ a.account__display-name {
display: block;
object-fit: contain;
object-position: bottom left;
- width: 100%;
+ width: 85%;
height: 100%;
pointer-events: none;
user-drag: none;
@@ -6693,6 +6694,18 @@ noscript {
font-weight: 500;
margin-bottom: 10px;
}
+
+ &__unread {
+ position: absolute;
+ top: 15px;
+ right: 15px;
+ display: inline-block;
+ background: $highlight-text-color;
+ border-radius: 50%;
+ width: 0.625rem;
+ height: 0.625rem;
+ margin: 0 .15em;
+ }
}
&__pagination {
diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index c30bec80b90..88a11f7617f 100644
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -6,6 +6,7 @@ class UserMailer < Devise::Mailer
helper :accounts
helper :application
helper :instance
+ helper :statuses
add_template_helper RoutingHelper
diff --git a/app/models/account.rb b/app/models/account.rb
index b856d1c766c..e468884156d 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -74,14 +74,13 @@ class Account < ApplicationRecord
enum protocol: [:ostatus, :activitypub]
validates :username, presence: true
+ validates_with UniqueUsernameValidator, if: -> { will_save_change_to_username? }
# Remote user validations
- validates :username, uniqueness: { scope: :domain, case_sensitive: true }, if: -> { !local? && will_save_change_to_username? }
validates :username, format: { with: /\A#{USERNAME_RE}\z/i }, if: -> { !local? && will_save_change_to_username? }
# Local user validations
validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: 30 }, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' }
- validates_with UniqueUsernameValidator, if: -> { local? && will_save_change_to_username? }
validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? }
validates :display_name, length: { maximum: MAX_DISPLAY_NAME_LENGTH }, if: -> { local? && will_save_change_to_display_name? }
validates :note, note_length: { maximum: MAX_NOTE_LENGTH }, if: -> { local? && will_save_change_to_note? }
diff --git a/app/models/concerns/account_finder_concern.rb b/app/models/concerns/account_finder_concern.rb
index a54c2174d49..04b2c981b17 100644
--- a/app/models/concerns/account_finder_concern.rb
+++ b/app/models/concerns/account_finder_concern.rb
@@ -48,7 +48,7 @@ module AccountFinderConcern
end
def with_usernames
- Account.where.not(username: '')
+ Account.where.not(Account.arel_table[:username].lower.eq '')
end
def matching_username
@@ -56,11 +56,7 @@ module AccountFinderConcern
end
def matching_domain
- if domain.nil?
- Account.where(domain: nil)
- else
- Account.where(Account.arel_table[:domain].lower.eq domain.to_s.downcase)
- end
+ Account.where(Account.arel_table[:domain].lower.eq(domain.nil? ? nil : domain.to_s.downcase))
end
end
end
diff --git a/app/serializers/rest/announcement_serializer.rb b/app/serializers/rest/announcement_serializer.rb
index ae962aa1de7..ae72f9acebe 100644
--- a/app/serializers/rest/announcement_serializer.rb
+++ b/app/serializers/rest/announcement_serializer.rb
@@ -4,15 +4,25 @@ class REST::AnnouncementSerializer < ActiveModel::Serializer
attributes :id, :content, :starts_at, :ends_at, :all_day,
:published_at, :updated_at
+ attribute :read, if: :current_user?
+
has_many :mentions
has_many :tags, serializer: REST::StatusSerializer::TagSerializer
has_many :emojis, serializer: REST::CustomEmojiSerializer
has_many :reactions, serializer: REST::ReactionSerializer
+ def current_user?
+ !current_user.nil?
+ end
+
def id
object.id.to_s
end
+ def read
+ object.announcement_mutes.where(account: current_user.account).exists?
+ end
+
def content
Formatter.instance.linkify(object.text)
end
diff --git a/app/validators/unique_username_validator.rb b/app/validators/unique_username_validator.rb
index 4e24e3f5fe9..f87eb06baf2 100644
--- a/app/validators/unique_username_validator.rb
+++ b/app/validators/unique_username_validator.rb
@@ -7,8 +7,9 @@ class UniqueUsernameValidator < ActiveModel::Validator
return if account.username.nil?
normalized_username = account.username.downcase
+ normalized_domain = account.domain&.downcase
- scope = Account.where(domain: nil).where('lower(username) = ?', normalized_username)
+ scope = Account.where(Account.arel_table[:username].lower.eq normalized_username).where(Account.arel_table[:domain].lower.eq normalized_domain)
scope = scope.where.not(id: account.id) if account.persisted?
account.errors.add(:username, :taken) if scope.exists?
diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml
index 4e17b6347d6..8a418a1d5cb 100644
--- a/app/views/statuses/_simple_status.html.haml
+++ b/app/views/statuses/_simple_status.html.haml
@@ -45,6 +45,10 @@
- elsif status.preview_card
= react_component :card, 'maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_card, serializer: REST::PreviewCardSerializer).as_json
+ - if !status.in_reply_to_id.nil? && status.in_reply_to_account_id == status.account.id
+ = link_to ActivityPub::TagManager.instance.url_for(status), class: 'status__content__read-more-button', target: stream_link_target, rel: 'noopener noreferrer' do
+ = t 'statuses.show_thread'
+
.status__action-bar
.status__action-bar__counter
= link_to remote_interaction_path(status, type: :reply), class: 'status__action-bar-button icon-button modal-button', style: 'font-size: 18px; width: 23.1429px; height: 23.1429px; line-height: 23.15px;' do
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f52f6eff671..dcfe5f1cc76 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1103,6 +1103,7 @@ en:
other: "%{count} votes"
vote: Vote
show_more: Show more
+ show_thread: Show thread
sign_in_to_participate: Sign in to participate in the conversation
title: '%{name}: "%{quote}"'
visibilities:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 2f08209060d..ca105defaec 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -98,7 +98,7 @@ en:
all_day: All-day event
ends_at: End of event
scheduled_at: Schedule publication
- starts_at: Begin of event
+ starts_at: Start of event
text: Announcement
defaults:
autofollow: Invite to follow your account
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index e0549d0a598..4a56470d0a3 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
end
def flags
- 'rc1'
+ 'rc2'
end
def suffix
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 4266122b24a..98d29e6f3d3 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -619,18 +619,18 @@ RSpec.describe Account, type: :model do
end
context 'when is remote' do
- it 'is invalid if the username is not unique in case-sensitive comparison among accounts in the same normalized domain' do
+ it 'is invalid if the username is same among accounts in the same normalized domain' do
Fabricate(:account, domain: 'にゃん', username: 'username')
account = Fabricate.build(:account, domain: 'xn--r9j5b5b', username: 'username')
account.valid?
expect(account).to model_have_error_on_field(:username)
end
- it 'is valid even if the username is unique only in case-sensitive comparison among accounts in the same normalized domain' do
+ it 'is invalid if the username is not unique in case-insensitive comparison among accounts in the same normalized domain' do
Fabricate(:account, domain: 'にゃん', username: 'username')
account = Fabricate.build(:account, domain: 'xn--r9j5b5b', username: 'Username')
account.valid?
- expect(account).not_to model_have_error_on_field(:username)
+ expect(account).to model_have_error_on_field(:username)
end
it 'is valid even if the username contains hyphens' do
diff --git a/spec/validators/unique_username_validator_spec.rb b/spec/validators/unique_username_validator_spec.rb
index c2e2eedf41f..6867cbc6ce2 100644
--- a/spec/validators/unique_username_validator_spec.rb
+++ b/spec/validators/unique_username_validator_spec.rb
@@ -4,22 +4,65 @@ require 'rails_helper'
describe UniqueUsernameValidator do
describe '#validate' do
+ context 'when local account' do
+ it 'does not add errors if username is nil' do
+ account = double(username: nil, domain: nil, persisted?: false, errors: double(add: nil))
+ subject.validate(account)
+ expect(account.errors).to_not have_received(:add)
+ end
+
+ it 'does not add errors when existing one is subject itself' do
+ account = Fabricate(:account, username: 'abcdef')
+ expect(account).to be_valid
+ end
+
+ it 'adds an error when the username is already used with ignoring cases' do
+ Fabricate(:account, username: 'ABCdef')
+ account = double(username: 'abcDEF', domain: nil, persisted?: false, errors: double(add: nil))
+ subject.validate(account)
+ expect(account.errors).to have_received(:add)
+ end
+
+ it 'does not add errors when same username remote account exists' do
+ Fabricate(:account, username: 'abcdef', domain: 'example.com')
+ account = double(username: 'abcdef', domain: nil, persisted?: false, errors: double(add: nil))
+ subject.validate(account)
+ expect(account.errors).to_not have_received(:add)
+ end
+ end
+ end
+
+ context 'when remote account' do
it 'does not add errors if username is nil' do
- account = double(username: nil, persisted?: false, errors: double(add: nil))
+ account = double(username: nil, domain: 'example.com', persisted?: false, errors: double(add: nil))
subject.validate(account)
expect(account.errors).to_not have_received(:add)
end
it 'does not add errors when existing one is subject itself' do
- account = Fabricate(:account, username: 'abcdef')
+ account = Fabricate(:account, username: 'abcdef', domain: 'example.com')
expect(account).to be_valid
end
it 'adds an error when the username is already used with ignoring cases' do
- Fabricate(:account, username: 'ABCdef')
- account = double(username: 'abcDEF', persisted?: false, errors: double(add: nil))
+ Fabricate(:account, username: 'ABCdef', domain: 'example.com')
+ account = double(username: 'abcDEF', domain: 'example.com', persisted?: false, errors: double(add: nil))
subject.validate(account)
expect(account.errors).to have_received(:add)
end
+
+ it 'adds an error when the domain is already used with ignoring cases' do
+ Fabricate(:account, username: 'ABCdef', domain: 'example.com')
+ account = double(username: 'ABCdef', domain: 'EXAMPLE.COM', persisted?: false, errors: double(add: nil))
+ subject.validate(account)
+ expect(account.errors).to have_received(:add)
+ end
+
+ it 'does not add errors when account with the same username and another domain exists' do
+ Fabricate(:account, username: 'abcdef', domain: 'example.com')
+ account = double(username: 'abcdef', domain: 'example2.com', persisted?: false, errors: double(add: nil))
+ subject.validate(account)
+ expect(account.errors).to_not have_received(:add)
+ end
end
end