marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow abandoning any thread; add `thread:leave`/`thread:part` bangtags

staging
multiple creatures 2019-08-02 20:55:21 -05:00
parent cf333d3699
commit f0094fd143
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/components/status_action_bar.js
View File

@ -210,10 +210,8 @@ export default class StatusActionBar extends ImmutablePureComponent {
menu.push(null);
if (status.getIn(['account', 'id']) === me || withDismiss) {
menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
menu.push(null);
}
menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
menu.push(null);
if (status.getIn(['account', 'id']) === me) {
if (pinnableStatus) {

6
app/lib/bangtags.rb
View File

@ -16,6 +16,9 @@ class Bangtags
'permalink' => ['link'],
'cloudroot' => ['link'],
'blogroot' => ['link'],
'leave' => ['thread'],
'part' => ['thread'],
}
@aliases = {
@ -264,6 +267,9 @@ class Bangtags
chunk = nil
next if cmd[1].nil?
case cmd[1].downcase
when 'leave', 'part'
next if status.conversation_id.nil?
@account.mute_conversation!(status.conversation)
when 'reall'
if status.conversation_id.present?
participants = Status.where(conversation_id: status.conversation_id)