+ {mute_expires_at}
diff --git a/app/javascript/mastodon/features/ui/components/mute_modal.js b/app/javascript/mastodon/features/ui/components/mute_modal.js
index 852830c3c2..51228b532e 100644
--- a/app/javascript/mastodon/features/ui/components/mute_modal.js
+++ b/app/javascript/mastodon/features/ui/components/mute_modal.js
@@ -1,25 +1,31 @@
import React from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
-import { injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
import Toggle from 'react-toggle';
import Button from '../../../components/button';
import { closeModal } from '../../../actions/modal';
import { muteAccount } from '../../../actions/accounts';
-import { toggleHideNotifications } from '../../../actions/mutes';
+import { toggleHideNotifications, changeMuteDuration } from '../../../actions/mutes';
+const messages = defineMessages({
+ minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
+ hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
+ days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
+});
const mapStateToProps = state => {
return {
account: state.getIn(['mutes', 'new', 'account']),
notifications: state.getIn(['mutes', 'new', 'notifications']),
+ muteDuration: state.getIn(['mutes', 'new', 'duration']),
};
};
const mapDispatchToProps = dispatch => {
return {
- onConfirm(account, notifications) {
- dispatch(muteAccount(account.get('id'), notifications));
+ onConfirm(account, notifications, muteDuration) {
+ dispatch(muteAccount(account.get('id'), notifications, muteDuration));
},
onClose() {
@@ -29,6 +35,10 @@ const mapDispatchToProps = dispatch => {
onToggleNotifications() {
dispatch(toggleHideNotifications());
},
+
+ onChangeMuteDuration(e) {
+ dispatch(changeMuteDuration(e.target.value));
+ },
};
};
@@ -43,6 +53,8 @@ class MuteModal extends React.PureComponent {
onConfirm: PropTypes.func.isRequired,
onToggleNotifications: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
+ muteDuration: PropTypes.number.isRequired,
+ onChangeMuteDuration: PropTypes.func.isRequired,
};
componentDidMount() {
@@ -51,7 +63,7 @@ class MuteModal extends React.PureComponent {
handleClick = () => {
this.props.onClose();
- this.props.onConfirm(this.props.account, this.props.notifications);
+ this.props.onConfirm(this.props.account, this.props.notifications, this.props.muteDuration);
}
handleCancel = () => {
@@ -66,8 +78,12 @@ class MuteModal extends React.PureComponent {
this.props.onToggleNotifications();
}
+ changeMuteDuration = (e) => {
+ this.props.onChangeMuteDuration(e);
+ }
+
render () {
- const { account, notifications } = this.props;
+ const { account, notifications, muteDuration, intl } = this.props;
return (
@@ -91,6 +107,21 @@ class MuteModal extends React.PureComponent {
+
+ :
+
+ {/* eslint-disable-next-line jsx-a11y/no-onchange */}
+
+
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 9c8b3d11ba..b537313408 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -276,6 +276,8 @@
"missing_indicator.label": "Not found",
"missing_indicator.sublabel": "This resource could not be found",
"mute_modal.hide_notifications": "Hide notifications from this user?",
+ "mute_modal.duration": "Duration",
+ "mute_modal.indefinite": "Indefinite",
"navigation_bar.apps": "Mobile apps",
"navigation_bar.blocks": "Blocked users",
"navigation_bar.bookmarks": "Bookmarks",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index ec3d0ee59a..2a1df987c1 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -268,6 +268,8 @@
"missing_indicator.label": "見つかりません",
"missing_indicator.sublabel": "見つかりませんでした",
"mute_modal.hide_notifications": "このユーザーからの通知を隠しますか？",
+ "mute_modal.duration": "ミュートする期間",
+ "mute_modal.indefinite": "無期限",
"navigation_bar.apps": "アプリ",
"navigation_bar.blocks": "ブロックしたユーザー",
"navigation_bar.bookmarks": "ブックマーク",
diff --git a/app/javascript/mastodon/reducers/mutes.js b/app/javascript/mastodon/reducers/mutes.js
index 4672e50974..a9eb61ff83 100644
--- a/app/javascript/mastodon/reducers/mutes.js
+++ b/app/javascript/mastodon/reducers/mutes.js
@@ -3,12 +3,14 @@ import Immutable from 'immutable';
import {
MUTES_INIT_MODAL,
MUTES_TOGGLE_HIDE_NOTIFICATIONS,
+ MUTES_CHANGE_DURATION,
} from '../actions/mutes';
const initialState = Immutable.Map({
new: Immutable.Map({
account: null,
notifications: true,
+ duration: 0,
}),
});
@@ -21,6 +23,8 @@ export default function mutes(state = initialState, action) {
});
case MUTES_TOGGLE_HIDE_NOTIFICATIONS:
return state.updateIn(['new', 'notifications'], (old) => !old);
+ case MUTES_CHANGE_DURATION:
+ return state.setIn(['new', 'duration'], Number(action.duration));
default:
return state;
}
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 6b81e76237..64f4adb848 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -759,3 +759,8 @@ html {
.compose-form .compose-form__warning {
box-shadow: none;
}
+
+.mute-modal select {
+ border: 1px solid lighten($ui-base-color, 8%);
+ background: $simple-background-color url("data:image/svg+xml;utf8,
") no-repeat right 8px center / auto 16px;
+}
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 8a8f20baa5..378d1640fd 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5074,6 +5074,22 @@ a.status-card.compact:hover {
}
}
}
+
+ select {
+ appearance: none;
+ box-sizing: border-box;
+ font-size: 14px;
+ color: $inverted-text-color;
+ display: inline-block;
+ width: auto;
+ outline: 0;
+ font-family: inherit;
+ background: $simple-background-color url("data:image/svg+xml;utf8,
") no-repeat right 8px center / auto 16px;
+ border: 1px solid darken($simple-background-color, 14%);
+ border-radius: 4px;
+ padding: 6px 10px;
+ padding-right: 30px;
+ }
}
.confirmation-modal__container,
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb
index 427ebdae29..6a0ad5aa98 100644
--- a/app/models/concerns/account_interactions.rb
+++ b/app/models/concerns/account_interactions.rb
@@ -131,9 +131,12 @@ module AccountInteractions
.find_or_create_by!(target_account: other_account)
end
- def mute!(other_account, notifications: nil)
+ def mute!(other_account, notifications: nil, duration: 0)
notifications = true if notifications.nil?
- mute = mute_relationships.create_with(hide_notifications: notifications).find_or_create_by!(target_account: other_account)
+ mute = mute_relationships.create_with(hide_notifications: notifications).find_or_initialize_by(target_account: other_account)
+ mute.expires_in = duration.zero? ? nil : duration
+ mute.save!
+
remove_potential_friendship(other_account)
# When toggling a mute between hiding and allowing notifications, the mute will already exist, so the find_or_create_by! call will return the existing Mute without updating the hide_notifications attribute. Therefore, we check that hide_notifications? is what we want and set it if it isn't.
diff --git a/app/models/mute.rb b/app/models/mute.rb
index 0e00c2278f..578345ef64 100644
--- a/app/models/mute.rb
+++ b/app/models/mute.rb
@@ -9,11 +9,13 @@
# account_id :bigint(8) not null
# target_account_id :bigint(8) not null
# hide_notifications :boolean default(TRUE), not null
+# expires_at :datetime
#
class Mute < ApplicationRecord
include Paginable
include RelationshipCacheable
+ include Expireable
belongs_to :account
belongs_to :target_account, class_name: 'Account'
diff --git a/app/serializers/rest/muted_account_serializer.rb b/app/serializers/rest/muted_account_serializer.rb
new file mode 100644
index 0000000000..3ddd706dcd
--- /dev/null
+++ b/app/serializers/rest/muted_account_serializer.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class REST::MutedAccountSerializer < REST::AccountSerializer
+ attribute :mute_expires_at
+
+ def mute_expires_at
+ mute = current_user.account.mute_relationships.find_by(target_account_id: object.id)
+ mute && !mute.expired? ? mute.expires_at : nil
+ end
+end
diff --git a/app/services/mute_service.rb b/app/services/mute_service.rb
index 676804cb99..9ae9afd623 100644
--- a/app/services/mute_service.rb
+++ b/app/services/mute_service.rb
@@ -1,10 +1,10 @@
# frozen_string_literal: true
class MuteService < BaseService
- def call(account, target_account, notifications: nil)
+ def call(account, target_account, notifications: nil, duration: 0)
return if account.id == target_account.id
- mute = account.mute!(target_account, notifications: notifications)
+ mute = account.mute!(target_account, notifications: notifications, duration: duration)
if mute.hide_notifications?
BlockWorker.perform_async(account.id, target_account.id)
@@ -12,6 +12,8 @@ class MuteService < BaseService
MuteWorker.perform_async(account.id, target_account.id)
end
+ DeleteMuteWorker.perform_at(duration.seconds, mute.id) if duration != 0
+
mute
end
end
diff --git a/app/workers/delete_mute_worker.rb b/app/workers/delete_mute_worker.rb
new file mode 100644
index 0000000000..eb031020e1
--- /dev/null
+++ b/app/workers/delete_mute_worker.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class DeleteMuteWorker
+ include Sidekiq::Worker
+
+ def perform(mute_id)
+ mute = Mute.find_by(id: mute_id)
+ UnmuteService.new.call(mute.account, mute.target_account) if mute&.expired?
+ end
+end
diff --git a/db/migrate/20200317021758_add_expires_at_to_mutes.rb b/db/migrate/20200317021758_add_expires_at_to_mutes.rb
new file mode 100644
index 0000000000..eaae8319d7
--- /dev/null
+++ b/db/migrate/20200317021758_add_expires_at_to_mutes.rb
@@ -0,0 +1,5 @@
+class AddExpiresAtToMutes < ActiveRecord::Migration[5.2]
+ def change
+ add_column :mutes, :expires_at, :datetime
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5805f31050..262e25b3ba 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -545,6 +545,7 @@ ActiveRecord::Schema.define(version: 2020_10_08_220312) do
t.boolean "hide_notifications", default: true, null: false
t.bigint "account_id", null: false
t.bigint "target_account_id", null: false
+ t.datetime "expires_at"
t.index ["account_id", "target_account_id"], name: "index_mutes_on_account_id_and_target_account_id", unique: true
t.index ["target_account_id"], name: "index_mutes_on_target_account_id"
end