# frozen_string_literal: true
class Api::V1::StatusesController < ApiController
- before_action :authorize_if_got_token, except: [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite]
- before_action -> { doorkeeper_authorize! :write }, only: [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite]
- before_action :require_user!, except: [:show, :context, :card, :reblogged_by, :favourited_by]
- before_action :set_status, only: [:show, :context, :card, :reblogged_by, :favourited_by]
+ before_action :authorize_if_got_token, except: [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite, :mute, :unmute]
+ before_action -> { doorkeeper_authorize! :write }, only: [:create, :destroy, :reblog, :unreblog, :favourite, :unfavourite, :mute, :unmute]
+ before_action :require_user!, except: [:show, :context, :card, :reblogged_by, :favourited_by]
+ before_action :set_status, only: [:show, :context, :card, :reblogged_by, :favourited_by, :mute, :unmute]
+ before_action :set_conversation, only: [:mute, :unmute]
respond_to :json
render :show
end
+ def mute
+ current_account.mute_conversation!(@conversation)
+
+ @mutes_map = { @conversation.id => true }
+
+ render :show
+ end
+
+ def unmute
+ current_account.unmute_conversation!(@conversation)
+
+ @mutes_map = { @conversation.id => false }
+
+ render :show
+ end
+
private
def set_status
raise ActiveRecord::RecordNotFound unless @status.permitted?(current_account)
end
+ def set_conversation
+ @conversation = @status.conversation
+ raise Mastodon::ValidationError if @conversation.nil?
+ end
+
def status_params
params.permit(:status, :in_reply_to_id, :sensitive, :spoiler_text, :visibility, media_ids: [])
end
if current_account.nil?
@reblogs_map = {}
@favourites_map = {}
+ @mutes_map = {}
return
end
- status_ids = statuses.compact.flat_map { |s| [s.id, s.reblog_of_id] }.uniq
- @reblogs_map = Status.reblogs_map(status_ids, current_account)
- @favourites_map = Status.favourites_map(status_ids, current_account)
+ status_ids = statuses.compact.flat_map { |s| [s.id, s.reblog_of_id] }.uniq
+ conversation_ids = statuses.compact.map(&:conversation_id).compact.uniq
+ @reblogs_map = Status.reblogs_map(status_ids, current_account)
+ @favourites_map = Status.favourites_map(status_ids, current_account)
+ @mutes_map = Status.mutes_map(conversation_ids, current_account)
end
end
export const CONTEXT_FETCH_SUCCESS = 'CONTEXT_FETCH_SUCCESS';
export const CONTEXT_FETCH_FAIL = 'CONTEXT_FETCH_FAIL';
+export const STATUS_MUTE_REQUEST = 'STATUS_MUTE_REQUEST';
+export const STATUS_MUTE_SUCCESS = 'STATUS_MUTE_SUCCESS';
+export const STATUS_MUTE_FAIL = 'STATUS_MUTE_FAIL';
+
+export const STATUS_UNMUTE_REQUEST = 'STATUS_UNMUTE_REQUEST';
+export const STATUS_UNMUTE_SUCCESS = 'STATUS_UNMUTE_SUCCESS';
+export const STATUS_UNMUTE_FAIL = 'STATUS_UNMUTE_FAIL';
+
export function fetchStatusRequest(id, skipLoading) {
return {
type: STATUS_FETCH_REQUEST,
skipAlert: true
};
};
+
+export function muteStatus(id) {
+ return (dispatch, getState) => {
+ dispatch(muteStatusRequest(id));
+
+ api(getState).post(`/api/v1/statuses/${id}/mute`).then(response => {
+ dispatch(muteStatusSuccess(id));
+ }).catch(error => {
+ dispatch(muteStatusFail(id, error));
+ });
+ };
+};
+
+export function muteStatusRequest(id) {
+ return {
+ type: STATUS_MUTE_REQUEST,
+ id
+ };
+};
+
+export function muteStatusSuccess(id) {
+ return {
+ type: STATUS_MUTE_SUCCESS,
+ id
+ };
+};
+
+export function muteStatusFail(id, error) {
+ return {
+ type: STATUS_MUTE_FAIL,
+ id,
+ error
+ };
+};
+
+export function unmuteStatus(id) {
+ return (dispatch, getState) => {
+ dispatch(unmuteStatusRequest(id));
+
+ api(getState).post(`/api/v1/statuses/${id}/unmute`).then(response => {
+ dispatch(unmuteStatusSuccess(id));
+ }).catch(error => {
+ dispatch(unmuteStatusFail(id, error));
+ });
+ };
+};
+
+export function unmuteStatusRequest(id) {
+ return {
+ type: STATUS_UNMUTE_REQUEST,
+ id
+ };
+};
+
+export function unmuteStatusSuccess(id) {
+ return {
+ type: STATUS_UNMUTE_SUCCESS,
+ id
+ };
+};
+
+export function unmuteStatusFail(id, error) {
+ return {
+ type: STATUS_UNMUTE_FAIL,
+ id,
+ error
+ };
+};
cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
open: { id: 'status.open', defaultMessage: 'Expand this status' },
- report: { id: 'status.report', defaultMessage: 'Report @{name}' }
+ report: { id: 'status.report', defaultMessage: 'Report @{name}' },
+ muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' },
+ unmuteConversation: { id: 'status.unmute_conversation', defaultMessage: 'Unmute conversation' },
});
class StatusActionBar extends React.PureComponent {
onMute: PropTypes.func,
onBlock: PropTypes.func,
onReport: PropTypes.func,
+ onMuteConversation: PropTypes.func,
me: PropTypes.number.isRequired,
+ withDismiss: PropTypes.bool,
intl: PropTypes.object.isRequired
};
this.context.router.push('/report');
}
+ handleConversationMuteClick = () => {
+ this.props.onMuteConversation(this.props.status);
+ }
+
render () {
- const { status, me, intl } = this.props;
+ const { status, me, intl, withDismiss } = this.props;
const reblogDisabled = status.get('visibility') === 'private' || status.get('visibility') === 'direct';
+ const mutingConversation = status.get('muted');
let menu = [];
let reblogIcon = 'retweet';
menu.push({ text: intl.formatMessage(messages.open), action: this.handleOpen });
menu.push(null);
+ if (withDismiss) {
+ menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
+ menu.push(null);
+ }
+
if (status.getIn(['account', 'id']) === me) {
menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick });
} else {
blockAccount,
muteAccount
} from '../actions/accounts';
-import { deleteStatus } from '../actions/statuses';
+import { muteStatus, unmuteStatus, deleteStatus } from '../actions/statuses';
import { initReport } from '../actions/reports';
import { openModal } from '../actions/modal';
import { createSelector } from 'reselect'
}));
},
+ onMuteConversation (status) {
+ if (status.get('muted')) {
+ dispatch(unmuteStatus(status.get('id')));
+ } else {
+ dispatch(muteStatus(status.get('id')));
+ }
+ },
+
});
export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(Status));
}
renderMention (notification) {
- return <StatusContainer id={notification.get('status')} />;
+ return <StatusContainer id={notification.get('status')} withDismiss />;
}
renderFavourite (notification, link) {
<FormattedMessage id='notification.favourite' defaultMessage='{name} favourited your status' values={{ name: link }} />
</div>
- <StatusContainer id={notification.get('status')} account={notification.get('account')} muted={true} />
+ <StatusContainer id={notification.get('status')} account={notification.get('account')} muted={true} withDismiss />
</div>
);
}
<FormattedMessage id='notification.reblog' defaultMessage='{name} boosted your status' values={{ name: link }} />
</div>
- <StatusContainer id={notification.get('status')} account={notification.get('account')} muted={true} />
+ <StatusContainer id={notification.get('status')} account={notification.get('account')} muted={true} withDismiss />
</div>
);
}
reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
favourite: { id: 'status.favourite', defaultMessage: 'Favourite' },
- report: { id: 'status.report', defaultMessage: 'Report @{name}' }
+ report: { id: 'status.report', defaultMessage: 'Report @{name}' },
});
class ActionBar extends React.PureComponent {
<div className='scrollable detailed-status__wrapper'>
{ancestors}
- <DetailedStatus status={status} autoPlayGif={autoPlayGif} me={me} onOpenVideo={this.handleOpenVideo} onOpenMedia={this.handleOpenMedia} />
- <ActionBar status={status} me={me} onReply={this.handleReplyClick} onFavourite={this.handleFavouriteClick} onReblog={this.handleReblogClick} onDelete={this.handleDeleteClick} onMention={this.handleMentionClick} onReport={this.handleReport} />
+ <DetailedStatus
+ status={status}
+ autoPlayGif={autoPlayGif}
+ me={me}
+ onOpenVideo={this.handleOpenVideo}
+ onOpenMedia={this.handleOpenMedia}
+ />
+
+ <ActionBar
+ status={status}
+ me={me}
+ onReply={this.handleReplyClick}
+ onFavourite={this.handleFavouriteClick}
+ onReblog={this.handleReblogClick}
+ onDelete={this.handleDeleteClick}
+ onMention={this.handleMentionClick}
+ onReport={this.handleReport}
+ />
{descendants}
</div>
"status.load_more": "حمّل المزيد",
"status.media_hidden": "الصورة مستترة",
"status.mention": "أذكُر @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "وسع هذه المشاركة",
"status.reblog": "رَقِّي",
"status.reblogged_by": "{name} رقى",
"status.sensitive_warning": "محتوى حساس",
"status.show_less": "إعرض أقلّ",
"status.show_more": "أظهر المزيد",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "تحرير",
"tabs_bar.federated_timeline": "الموحَّد",
"tabs_bar.home": "الرئيسية",
"status.load_more": "Load more",
"status.media_hidden": "Media hidden",
"status.mention": "Споменаване",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Expand this status",
"status.reblog": "Споделяне",
"status.reblogged_by": "{name} сподели",
"status.sensitive_warning": "Деликатно съдържание",
"status.show_less": "Show less",
"status.show_more": "Show more",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Съставяне",
"tabs_bar.federated_timeline": "Federated",
"tabs_bar.home": "Начало",
"status.load_more": "Weitere laden",
"status.media_hidden": "Medien versteckt",
"status.mention": "Erwähnen",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Öffnen",
"status.reblog": "Teilen",
"status.reblogged_by": "{name} teilte",
"status.sensitive_warning": "Heikle Inhalte",
"status.show_less": "Weniger anzeigen",
"status.show_more": "Mehr anzeigen",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Schreiben",
"tabs_bar.federated_timeline": "Föderation",
"tabs_bar.home": "Home",
{
"defaultMessage": "Report @{name}",
"id": "status.report"
+ },
+ {
+ "defaultMessage": "Mute conversation",
+ "id": "status.mute_conversation"
+ },
+ {
+ "defaultMessage": "Unmute conversation",
+ "id": "status.unmute_conversation"
}
],
"path": "app/javascript/mastodon/components/status_action_bar.json"
"defaultMessage": "Expand video",
"id": "video_player.expand"
},
- {
- "defaultMessage": "Video could not be played",
- "id": "video_player.video_error"
- },
{
"defaultMessage": "Sensitive content",
"id": "status.sensitive_warning"
{
"defaultMessage": "Media hidden",
"id": "status.media_hidden"
+ },
+ {
+ "defaultMessage": "Video could not be played",
+ "id": "video_player.video_error"
}
],
"path": "app/javascript/mastodon/components/video_player.json"
"status.load_more": "Load more",
"status.media_hidden": "Media hidden",
"status.mention": "Mention @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Expand this status",
"status.reblog": "Boost",
"status.reblogged_by": "{name} boosted",
"status.sensitive_warning": "Sensitive content",
"status.show_less": "Show less",
"status.show_more": "Show more",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Compose",
"tabs_bar.federated_timeline": "Federated",
"tabs_bar.home": "Home",
"status.load_more": "Load more",
"status.media_hidden": "Media hidden",
"status.mention": "Mencii @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Expand this status",
"status.reblog": "Diskonigi",
"status.reblogged_by": "{name} diskonigita",
"status.sensitive_warning": "Tikla enhavo",
"status.show_less": "Show less",
"status.show_more": "Show more",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Ekskribi",
"tabs_bar.federated_timeline": "Federated",
"tabs_bar.home": "Hejmo",
"status.load_more": "Load more",
"status.media_hidden": "Media hidden",
"status.mention": "Mencionar",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Expandir estado",
"status.reblog": "Retoot",
"status.reblogged_by": "Retooteado por {name}",
"status.sensitive_warning": "Contenido sensible",
"status.show_less": "Mostrar menos",
"status.show_more": "Mostrar más",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Redactar",
"tabs_bar.federated_timeline": "Federated",
"tabs_bar.home": "Inicio",
"status.load_more": "بیشتر نشان بده",
"status.media_hidden": "تصویر پنهان شده",
"status.mention": "نامبردن از @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "این نوشته را باز کن",
"status.reblog": "بازبوقیدن",
"status.reblogged_by": "{name} بازبوقید",
"status.sensitive_warning": "محتوای حساس",
"status.show_less": "نهفتن",
"status.show_more": "نمایش",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "بنویسید",
"tabs_bar.federated_timeline": "همگانی",
"tabs_bar.home": "خانه",
"status.load_more": "Load more",
"status.media_hidden": "Media hidden",
"status.mention": "Mainitse @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Expand this status",
"status.reblog": "Buustaa",
"status.reblogged_by": "{name} buustasi",
"status.sensitive_warning": "Arkaluontoista sisältöä",
"status.show_less": "Show less",
"status.show_more": "Show more",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Luo",
"tabs_bar.federated_timeline": "Federated",
"tabs_bar.home": "Koti",
"status.load_more": "Charger plus",
"status.media_hidden": "Média caché",
"status.mention": "Mentionner",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Déplier ce statut",
"status.reblog": "Partager",
"status.reblogged_by": "{name} a partagé :",
"status.sensitive_warning": "Contenu délicat",
"status.show_less": "Replier",
"status.show_more": "Déplier",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Composer",
"tabs_bar.federated_timeline": "Fil public global",
"tabs_bar.home": "Accueil",
"status.load_more": "עוד",
"status.media_hidden": "מדיה מוסתרת",
"status.mention": "פניה אל @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "הרחבת הודעה",
"status.reblog": "הדהוד",
"status.reblogged_by": "הודהד על ידי {name}",
"status.sensitive_warning": "תוכן רגיש",
"status.show_less": "הראה פחות",
"status.show_more": "הראה יותר",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "חיבור",
"tabs_bar.federated_timeline": "ציר זמן בין-קהילתי",
"tabs_bar.home": "בבית",
"status.load_more": "Učitaj više",
"status.media_hidden": "Sakriven media sadržaj",
"status.mention": "Spomeni @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Proširi ovaj status",
"status.reblog": "Podigni",
"status.reblogged_by": "{name} je podigao",
"status.sensitive_warning": "Osjetljiv sadržaj",
"status.show_less": "Pokaži manje",
"status.show_more": "Pokaži više",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Sastavi",
"tabs_bar.federated_timeline": "Federalni",
"tabs_bar.home": "Dom",
"status.load_more": "Load more",
"status.media_hidden": "Media hidden",
"status.mention": "Említés",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Expand this status",
"status.reblog": "Reblog",
"status.reblogged_by": "{name} reblogolta",
"status.sensitive_warning": "Érzékeny tartalom",
"status.show_less": "Show less",
"status.show_more": "Show more",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Összeállítás",
"tabs_bar.federated_timeline": "Federated",
"tabs_bar.home": "Kezdőlap",
"status.load_more": "Tampilkan semua",
"status.media_hidden": "Media disembunyikan",
"status.mention": "Balasan @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Tampilkan status ini",
"status.reblog": "Boost",
"status.reblogged_by": "di-boost {name}",
"status.sensitive_warning": "Konten sensitif",
"status.show_less": "Tampilkan lebih sedikit",
"status.show_more": "Tampilkan semua",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Tulis",
"tabs_bar.federated_timeline": "Gabungan",
"tabs_bar.home": "Beranda",
"status.load_more": "Kargar pluse",
"status.media_hidden": "Kontenajo celita",
"status.mention": "Mencionar @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Detaligar ca mesajo",
"status.reblog": "Repetar",
"status.reblogged_by": "{name} repetita",
"status.sensitive_warning": "Trubliva kontenajo",
"status.show_less": "Montrar mine",
"status.show_more": "Montrar plue",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Kompozar",
"tabs_bar.federated_timeline": "Federata",
"tabs_bar.home": "Hemo",
"status.load_more": "Mostra di più",
"status.media_hidden": "Allegato nascosto",
"status.mention": "Nomina @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Espandi questo post",
"status.reblog": "Condividi",
"status.reblogged_by": "{name} ha condiviso",
"status.sensitive_warning": "Materiale sensibile",
"status.show_less": "Mostra meno",
"status.show_more": "Mostra di più",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Scrivi",
"tabs_bar.federated_timeline": "Federazione",
"tabs_bar.home": "Home",
"status.load_more": "もっと見る",
"status.media_hidden": "非表示のメデイア",
"status.mention": "返信",
+ "status.mute_conversation": "Mute conversation",
"status.open": "詳細を表示",
"status.reblog": "ブースト",
"status.reblogged_by": "{name} さんにブーストされました",
"status.sensitive_warning": "閲覧注意",
"status.show_less": "隠す",
"status.show_more": "もっと見る",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "投稿",
"tabs_bar.federated_timeline": "連合",
"tabs_bar.home": "ホーム",
"status.load_more": "Meer laden",
"status.media_hidden": "Media verborgen",
"status.mention": "Vermeld @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Toot volledig tonen",
"status.reblog": "Boost",
"status.reblogged_by": "{name} boostte",
"status.sensitive_warning": "Gevoelige inhoud",
"status.show_less": "Minder tonen",
"status.show_more": "Meer tonen",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Schrijven",
"tabs_bar.federated_timeline": "Globaal",
"tabs_bar.home": "Jouw tijdlijn",
"status.load_more": "Last mer",
"status.media_hidden": "Media skjult",
"status.mention": "Nevn @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Utvid denne statusen",
"status.reblog": "Fremhev",
"status.reblogged_by": "Fremhevd av {name}",
"status.sensitive_warning": "Følsomt innhold",
"status.show_less": "Vis mindre",
"status.show_more": "Vis mer",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Komponer",
"tabs_bar.federated_timeline": "Felles",
"tabs_bar.home": "Hjem",
"status.load_more": "Cargar mai",
"status.media_hidden": "Mèdia rescondut",
"status.mention": "Mencionar",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Desplegar aqueste estatut",
"status.reblog": "Partejar",
"status.reblogged_by": "{name} a partejat :",
"status.sensitive_warning": "Contengut embarrassant",
"status.show_less": "Tornar plegar",
"status.show_more": "Desplegar",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Compausar",
"tabs_bar.federated_timeline": "Fil public global",
"tabs_bar.home": "Acuèlh",
"status.load_more": "Załaduj więcej",
"status.media_hidden": "Zawartość multimedialna ukryta",
"status.mention": "Wspomnij o @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Rozszerz ten status",
"status.reblog": "Podbij",
"status.reblogged_by": "{name} podbił",
"status.sensitive_warning": "Wrażliwa zawartość",
"status.show_less": "Pokaż mniej",
"status.show_more": "Pokaż więcej",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Napisz",
"tabs_bar.federated_timeline": "Globalne",
"tabs_bar.home": "Strona główna",
"status.load_more": "Carregar mais",
"status.media_hidden": "Media escondida",
"status.mention": "Mencionar @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Expandir",
"status.reblog": "Partilhar",
"status.reblogged_by": "{name} partilhou",
"status.sensitive_warning": "Conteúdo sensível",
"status.show_less": "Mostrar menos",
"status.show_more": "Mostrar mais",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Criar",
"tabs_bar.federated_timeline": "Global",
"tabs_bar.home": "Home",
"status.load_more": "Carregar mais",
"status.media_hidden": "Media escondida",
"status.mention": "Mencionar @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Expandir",
"status.reblog": "Partilhar",
"status.reblogged_by": "{name} partilhou",
"status.sensitive_warning": "Conteúdo sensível",
"status.show_less": "Mostrar menos",
"status.show_more": "Mostrar mais",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Criar",
"tabs_bar.federated_timeline": "Global",
"tabs_bar.home": "Home",
"status.load_more": "Показать еще",
"status.media_hidden": "Медиаконтент скрыт",
"status.mention": "Упомянуть @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Развернуть статус",
"status.reblog": "Продвинуть",
"status.reblogged_by": "{name} продвинул(а)",
"status.sensitive_warning": "Чувствительный контент",
"status.show_less": "Свернуть",
"status.show_more": "Развернуть",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Написать",
"tabs_bar.federated_timeline": "Глобальная",
"tabs_bar.home": "Главная",
"status.load_more": "Daha fazla",
"status.media_hidden": "Gizli görsel",
"status.mention": "Bahset @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Bu gönderiyi genişlet",
"status.reblog": "Boost'la",
"status.reblogged_by": "{name} boost etti",
"status.sensitive_warning": "Hassas içerik",
"status.show_less": "Daha azı",
"status.show_more": "Daha fazlası",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Oluştur",
"tabs_bar.federated_timeline": "Federe",
"tabs_bar.home": "Ana sayfa",
"status.load_more": "Завантажити більше",
"status.media_hidden": "Медіаконтент приховано",
"status.mention": "Згадати",
+ "status.mute_conversation": "Mute conversation",
"status.open": "Розгорнути допис",
"status.reblog": "Передмухнути",
"status.reblogged_by": "{name} передмухнув(-ла)",
"status.sensitive_warning": "Непристойний зміст",
"status.show_less": "Згорнути",
"status.show_more": "Розгорнути",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "Написати",
"tabs_bar.federated_timeline": "Глобальна",
"tabs_bar.home": "Головна",
"status.load_more": "加载更多",
"status.media_hidden": "隐藏媒体内容",
"status.mention": "提及 @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "展开嘟文",
"status.reblog": "转嘟",
"status.reblogged_by": "{name} 转嘟",
"status.sensitive_warning": "敏感内容",
"status.show_less": "减少显示",
"status.show_more": "显示更多",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "撰写",
"tabs_bar.federated_timeline": "跨站",
"tabs_bar.home": "主页",
"status.load_more": "載入更多",
"status.media_hidden": "隱藏媒體內容",
"status.mention": "提及 @{name}",
+ "status.mute_conversation": "Mute conversation",
"status.open": "展開文章",
"status.reblog": "轉推",
"status.reblogged_by": "{name} 轉推",
"status.sensitive_warning": "敏感內容",
"status.show_less": "減少顯示",
"status.show_more": "顯示更多",
+ "status.unmute_conversation": "Unmute conversation",
"tabs_bar.compose": "撰寫",
"tabs_bar.federated_timeline": "跨站",
"tabs_bar.home": "主頁",
} from '../actions/interactions';
import {
STATUS_FETCH_SUCCESS,
- CONTEXT_FETCH_SUCCESS
+ CONTEXT_FETCH_SUCCESS,
+ STATUS_MUTE_SUCCESS,
+ STATUS_UNMUTE_SUCCESS
} from '../actions/statuses';
import {
TIMELINE_REFRESH_SUCCESS,
return state.setIn([action.status.get('id'), 'reblogged'], true);
case REBLOG_FAIL:
return state.setIn([action.status.get('id'), 'reblogged'], false);
+ case STATUS_MUTE_SUCCESS:
+ return state.setIn([action.id, 'muted'], true);
+ case STATUS_UNMUTE_SUCCESS:
+ return state.setIn([action.id, 'muted'], false);
case TIMELINE_REFRESH_SUCCESS:
case TIMELINE_EXPAND_SUCCESS:
case ACCOUNT_TIMELINE_FETCH_SUCCESS:
# Mute relationships
has_many :mute_relationships, class_name: 'Mute', foreign_key: 'account_id', dependent: :destroy
has_many :muting, -> { order('mutes.id desc') }, through: :mute_relationships, source: :target_account
+ has_many :conversation_mutes
# Media
has_many :media_attachments, dependent: :destroy
mute_relationships.find_or_create_by!(target_account: other_account)
end
+ def mute_conversation!(conversation)
+ conversation_mutes.find_or_create_by!(conversation: conversation)
+ end
+
def unfollow!(other_account)
follow = active_relationships.find_by(target_account: other_account)
follow&.destroy
mute&.destroy
end
+ def unmute_conversation!(conversation)
+ mute = conversation_mutes.find_by(conversation: conversation)
+ mute&.destroy!
+ end
+
def following?(other_account)
following.include?(other_account)
end
muting.include?(other_account)
end
+ def muting_conversation?(conversation)
+ conversation_mutes.where(conversation: conversation).exists?
+ end
+
def requested?(other_account)
follow_requests.where(target_account: other_account).exists?
end
#
class Conversation < ApplicationRecord
- validates :uri, uniqueness: true
+ validates :uri, uniqueness: true, if: :uri
has_many :statuses
--- /dev/null
+# frozen_string_literal: true
+# == Schema Information
+#
+# Table name: conversation_mutes
+#
+# id :integer not null, primary key
+# account_id :integer not null
+# conversation_id :integer not null
+#
+
+class ConversationMute < ApplicationRecord
+ belongs_to :account, required: true
+ belongs_to :conversation, required: true
+end
select('reblog_of_id').where(reblog_of_id: status_ids).where(account_id: account_id).map { |s| [s.reblog_of_id, true] }.to_h
end
+ def mutes_map(conversation_ids, account_id)
+ ConversationMute.select('conversation_id').where(conversation_id: conversation_ids).where(account_id: account_id).map { |m| [m.conversation_id, true] }.to_h
+ end
+
def reload_stale_associations!(cached_items)
account_ids = []
blocked ||= (@notification.from_account.silenced? && !@recipient.following?(@notification.from_account)) # Hellban
blocked ||= (@recipient.user.settings.interactions['must_be_follower'] && !@notification.from_account.following?(@recipient)) # Options
blocked ||= (@recipient.user.settings.interactions['must_be_following'] && !@recipient.following?(@notification.from_account)) # Options
+ blocked ||= conversation_muted?
blocked ||= send("blocked_#{@notification.type}?") # Type-dependent filters
blocked
end
+ def conversation_muted?
+ if @notification.target_status
+ @recipient.muting_conversation?(@notification.target_status.conversation)
+ else
+ false
+ end
+ end
+
def create_notification
@notification.save!
return unless @notification.browserable?
extends 'api/v1/statuses/_show'
-node(:favourited, if: proc { !current_account.nil? }) { |status| defined?(@favourites_map) ? @favourites_map[status.id] : current_account.favourited?(status) }
-node(:reblogged, if: proc { !current_account.nil? }) { |status| defined?(@reblogs_map) ? @reblogs_map[status.id] : current_account.reblogged?(status) }
+node(:favourited, if: proc { !current_account.nil? }) { |status| defined?(@favourites_map) ? @favourites_map[status.id] : current_account.favourited?(status) }
+node(:reblogged, if: proc { !current_account.nil? }) { |status| defined?(@reblogs_map) ? @reblogs_map[status.id] : current_account.reblogged?(status) }
+node(:muted, if: proc { !current_account.nil? }) { |status| defined?(@mutes_map) ? @mutes_map[status.conversation_id] : current_account.muting_conversation?(status.conversation) }
child reblog: :reblog do
extends 'api/v1/statuses/_show'
node(:favourited, if: proc { !current_account.nil? }) { |status| defined?(@favourites_map) ? @favourites_map[status.id] : current_account.favourited?(status) }
node(:reblogged, if: proc { !current_account.nil? }) { |status| defined?(@reblogs_map) ? @reblogs_map[status.id] : current_account.reblogged?(status) }
+ node(:muted, if: proc { !current_account.nil? }) { false }
end
post :unreblog
post :favourite
post :unfavourite
+ post :mute
+ post :unmute
end
end
end
add_index :mutes, [:account_id, :target_account_id], unique: true
-
end
end
--- /dev/null
+class CreateConversationMutes < ActiveRecord::Migration[5.0]
+ def change
+ create_table :conversation_mutes do |t|
+ t.integer :account_id, null: false
+ t.bigint :conversation_id, null: false
+ end
+
+ add_index :conversation_mutes, [:account_id, :conversation_id], unique: true
+ end
+end
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20170507141759) do
+ActiveRecord::Schema.define(version: 20170508230434) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
t.index ["account_id", "target_account_id"], name: "index_blocks_on_account_id_and_target_account_id", unique: true, using: :btree
end
+ create_table "conversation_mutes", force: :cascade do |t|
+ t.integer "account_id", null: false
+ t.bigint "conversation_id", null: false
+ t.index ["account_id", "conversation_id"], name: "index_conversation_mutes_on_account_id_and_conversation_id", unique: true, using: :btree
+ end
+
create_table "conversations", id: :bigserial, force: :cascade do |t|
t.string "uri"
t.datetime "created_at", null: false
expect(user.account.favourited?(status)).to be false
end
end
+
+ describe 'POST #mute' do
+ let(:status) { Fabricate(:status, account: user.account) }
+
+ before do
+ post :mute, params: { id: status.id }
+ end
+
+ it 'returns http success' do
+ expect(response).to have_http_status(:success)
+ end
+
+ it 'creates a conversation mute' do
+ expect(ConversationMute.find_by(account: user.account, conversation_id: status.conversation_id)).to_not be_nil
+ end
+ end
+
+ describe 'POST #unmute' do
+ let(:status) { Fabricate(:status, account: user.account) }
+
+ before do
+ post :mute, params: { id: status.id }
+ post :unmute, params: { id: status.id }
+ end
+
+ it 'returns http success' do
+ expect(response).to have_http_status(:success)
+ end
+
+ it 'destroys the conversation mute' do
+ expect(ConversationMute.find_by(account: user.account, conversation_id: status.conversation_id)).to be_nil
+ end
+ end
end
context 'without an oauth token' do
--- /dev/null
+Fabricator(:conversation_mute) do
+end
--- /dev/null
+require 'rails_helper'
+
+RSpec.describe ConversationMute, type: :model do
+
+end
pending
end
+ describe '.mutes_map' do
+ let(:status) { Fabricate(:status) }
+ let(:account) { Fabricate(:account) }
+
+ subject { Status.mutes_map([status.conversation.id], account) }
+
+ it 'returns a hash' do
+ expect(subject).to be_a Hash
+ end
+
+ it 'contains true value' do
+ account.mute_conversation!(status.conversation)
+ expect(subject[status.conversation.id]).to be true
+ end
+ end
+
+ describe '.favourites_map' do
+ let(:status) { Fabricate(:status) }
+ let(:account) { Fabricate(:account) }
+
+ subject { Status.favourites_map([status], account) }
+
+ it 'returns a hash' do
+ expect(subject).to be_a Hash
+ end
+
+ it 'contains true value' do
+ Fabricate(:favourite, status: status, account: account)
+ expect(subject[status.id]).to be true
+ end
+ end
+
+ describe '.reblogs_map' do
+ let(:status) { Fabricate(:status) }
+ let(:account) { Fabricate(:account) }
+
+ subject { Status.reblogs_map([status], account) }
+
+ it 'returns a hash' do
+ expect(subject).to be_a Hash
+ end
+
+ it 'contains true value' do
+ Fabricate(:status, account: account, reblog: status)
+ expect(subject[status.id]).to be true
+ end
+ end
+
describe '.local_only' do
it 'returns only statuses from local accounts' do
local_account = Fabricate(:account, domain: nil)
let(:user) { Fabricate(:user) }
let(:recipient) { user.account }
- let(:activity) { Fabricate(:follow, target_account: recipient) }
+ let(:sender) { Fabricate(:account) }
+ let(:activity) { Fabricate(:follow, account: sender, target_account: recipient) }
it { is_expected.to change(Notification, :count).by(1) }
+ it 'does not notify when sender is blocked' do
+ recipient.block!(sender)
+ is_expected.to_not change(Notification, :count)
+ end
+
+ it 'does not notify when sender is silenced and not followed' do
+ sender.update(silenced: true)
+ is_expected.to_not change(Notification, :count)
+ end
+
+ it 'does not notify when recipient is suspended' do
+ recipient.update(suspended: true)
+ is_expected.to_not change(Notification, :count)
+ end
+
+ context do
+ let(:asshole) { Fabricate(:account, username: 'asshole') }
+ let(:reply_to) { Fabricate(:status, account: asshole) }
+ let(:activity) { Fabricate(:mention, account: recipient, status: Fabricate(:status, account: sender, thread: reply_to)) }
+
+ it 'does not notify when conversation is muted' do
+ recipient.mute_conversation!(activity.status.conversation)
+ is_expected.to_not change(Notification, :count)
+ end
+
+ it 'does not notify when it is a reply to a blocked user' do
+ recipient.block!(asshole)
+ is_expected.to_not change(Notification, :count)
+ end
+ end
+
+ context do
+ let(:sender) { recipient }
+
+ it 'does not notify when recipient is the sender' do
+ is_expected.to_not change(Notification, :count)
+ end
+ end
+
describe 'email' do
before do
ActionMailer::Base.deliveries.clear
cat aescling's git repositories / mastodon.git / commitdiff