Merging with develop

Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex

1 files changed, 1 insertions, 1 deletions

diff --git a/priv/static/packs/flavours/glitch/async/mutes.js b/priv/static/packs/flavours/glitch/async/mutes.js
index a222b8d03..8afb0a8e3 100644
--- a/priv/static/packs/flavours/glitch/async/mutes.js
+++ b/priv/static/packs/flavours/glitch/async/mutes.js
@@ -1,2 +1,2 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[68],{677:function(t,e,a){"use strict";a.r(e),a.d(e,"default",function(){return y});var c,n,o,s=a(1),i=a(7),r=a(0),l=a(2),u=(a(3),a(20)),d=a(5),p=a.n(d),b=a(26),j=a.n(b),O=a(290),h=a(300),f=a(641),m=a(645),v=a(625),g=a(68),w=a(6),M=a(24),S=Object(w.f)({heading:{id:"column.mutes",defaultMessage:"Muted users"}}),y=Object(u.connect)(function(t){return{accountIds:t.getIn(["user_lists","mutes","items"])}})(c=Object(w.g)((o=n=function(n){function t(){for(var a,t=arguments.length,e=new Array(t),c=0;c<t;c++)e[c]=arguments[c];return a=n.call.apply(n,[this].concat(e))||this,Object(l.a)(Object(r.a)(Object(r.a)(a)),"handleScroll",function(t){var e=t.target;e.scrollTop===e.scrollHeight-e.clientHeight&&a.props.dispatch(Object(g.e)())}),Object(l.a)(Object(r.a)(Object(r.a)(a)),"shouldUpdateScroll",function(t,e){var a=e.location;return!(((t||{}).location||{}).state||{}).mastodonModalOpen&&!(a.state&&a.state.mastodonModalOpen)}),a}Object(i.a)(t,n);var e=t.prototype;return e.componentWillMount=function(){this.props.dispatch(Object(g.f)())},e.render=function(){var t=this.props,e=t.intl,a=t.accountIds;return a?Object(s.a)(f.a,{name:"mutes",icon:"volume-off",heading:e.formatMessage(S.heading)},void 0,Object(s.a)(m.a,{}),Object(s.a)(h.a,{scrollKey:"mutes",shouldUpdateScroll:this.shouldUpdateScroll},void 0,Object(s.a)("div",{className:"scrollable mutes",onScroll:this.handleScroll},void 0,a.map(function(t){return Object(s.a)(v.a,{id:t},t)})))):Object(s.a)(f.a,{},void 0,Object(s.a)(O.a,{}))},t}(M.a),Object(l.a)(n,"propTypes",{params:p.a.object.isRequired,dispatch:p.a.func.isRequired,accountIds:j.a.list,intl:p.a.object.isRequired}),c=o))||c)||c}}]);
+(window.webpackJsonp=window.webpackJsonp||[]).push([[68],{666:function(t,e,a){"use strict";a.r(e),a.d(e,"default",function(){return y});var c,n,o,s=a(0),i=a(3),r=a(7),l=a(1),u=(a(2),a(24)),d=a(5),p=a.n(d),b=a(27),h=a.n(b),j=a(271),O=a(426),f=a(624),m=a(629),v=a(600),g=a(136),w=a(6),M=a(25),S=Object(w.f)({heading:{id:"column.mutes",defaultMessage:"Muted users"}}),y=Object(u.connect)(function(t){return{accountIds:t.getIn(["user_lists","mutes","items"])}})(c=Object(w.g)((o=n=function(n){function t(){for(var a,t=arguments.length,e=new Array(t),c=0;c<t;c++)e[c]=arguments[c];return a=n.call.apply(n,[this].concat(e))||this,Object(l.a)(Object(i.a)(a),"handleScroll",function(t){var e=t.target;e.scrollTop===e.scrollHeight-e.clientHeight&&a.props.dispatch(Object(g.e)())}),Object(l.a)(Object(i.a)(a),"shouldUpdateScroll",function(t,e){var a=e.location;return!(((t||{}).location||{}).state||{}).mastodonModalOpen&&!(a.state&&a.state.mastodonModalOpen)}),a}Object(r.a)(t,n);var e=t.prototype;return e.componentWillMount=function(){this.props.dispatch(Object(g.f)())},e.render=function(){var t=this.props,e=t.intl,a=t.accountIds;return a?Object(s.a)(f.a,{name:"mutes",icon:"volume-off",heading:e.formatMessage(S.heading)},void 0,Object(s.a)(m.a,{}),Object(s.a)(O.a,{scrollKey:"mutes",shouldUpdateScroll:this.shouldUpdateScroll},void 0,Object(s.a)("div",{className:"scrollable mutes",onScroll:this.handleScroll},void 0,a.map(function(t){return Object(s.a)(v.a,{id:t},t)})))):Object(s.a)(f.a,{},void 0,Object(s.a)(j.a,{}))},t}(M.a),Object(l.a)(n,"propTypes",{params:p.a.object.isRequired,dispatch:p.a.func.isRequired,accountIds:h.a.list,intl:p.a.object.isRequired}),c=o))||c)||c}}]);
 //# sourceMappingURL=mutes.js.map
\ No newline at end of file