From 8d32ff058984db3fd00e51e03c3ea7e28a83aabf Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 10 Dec 2018 21:23:29 -0700 Subject: [PATCH 1/2] Update Timeline.vue, add missing notification type --- config/pixelfed.php | 2 +- public/js/components.js | 2 +- public/mix-manifest.json | 2 +- resources/assets/js/components/Timeline.vue | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config/pixelfed.php b/config/pixelfed.php index c13931be..c4c55bfd 100644 --- a/config/pixelfed.php +++ b/config/pixelfed.php @@ -23,7 +23,7 @@ return [ | This value is the version of your PixelFed instance. | */ - 'version' => '0.5.1', + 'version' => '0.5.2', /* |-------------------------------------------------------------------------- diff --git a/public/js/components.js b/public/js/components.js index 28802d7b..9b21b553 100644 --- a/public/js/components.js +++ b/public/js/components.js @@ -1 +1 @@ -!function(t){var e={};function n(i){if(e[i])return e[i].exports;var r=e[i]={i:i,l:!1,exports:{}};return t[i].call(r.exports,r,r.exports,n),r.l=!0,r.exports}n.m=t,n.c=e,n.d=function(t,e,i){n.o(t,e)||Object.defineProperty(t,e,{configurable:!1,enumerable:!0,get:i})},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="/",n(n.s=2)}({"/7en":function(t,e,n){var i,r;"undefined"!=typeof window&&window,void 0===(r="function"==typeof(i=function(){"use strict";function t(){}var e=t.prototype;return e.on=function(t,e){if(t&&e){var n=this._events=this._events||{},i=n[t]=n[t]||[];return-1==i.indexOf(e)&&i.push(e),this}},e.once=function(t,e){if(t&&e){this.on(t,e);var n=this._onceEvents=this._onceEvents||{};return(n[t]=n[t]||{})[e]=!0,this}},e.off=function(t,e){var n=this._events&&this._events[t];if(n&&n.length){var i=n.indexOf(e);return-1!=i&&n.splice(i,1),this}},e.emitEvent=function(t,e){var n=this._events&&this._events[t];if(n&&n.length){n=n.slice(0),e=e||[];for(var i=this._onceEvents&&this._onceEvents[t],r=0;r1&&($(".section-explore .loader").hide(),$(".section-explore .row.d-none").removeClass("d-none"))})}}}},"1/oy":function(t,e,n){var i=n("eAYY");"string"==typeof i&&(i=[[t.i,i,""]]);var r={transform:void 0};n("MTIv")(i,r);i.locals&&(t.exports=i.locals)},"162o":function(t,e,n){(function(t){var i=void 0!==t&&t||"undefined"!=typeof self&&self||window,r=Function.prototype.apply;function o(t,e){this._id=t,this._clearFn=e}e.setTimeout=function(){return new o(r.call(setTimeout,i,arguments),clearTimeout)},e.setInterval=function(){return new o(r.call(setInterval,i,arguments),clearInterval)},e.clearTimeout=e.clearInterval=function(t){t&&t.close()},o.prototype.unref=o.prototype.ref=function(){},o.prototype.close=function(){this._clearFn.call(i,this._id)},e.enroll=function(t,e){clearTimeout(t._idleTimeoutId),t._idleTimeout=e},e.unenroll=function(t){clearTimeout(t._idleTimeoutId),t._idleTimeout=-1},e._unrefActive=e.active=function(t){clearTimeout(t._idleTimeoutId);var e=t._idleTimeout;e>=0&&(t._idleTimeoutId=setTimeout(function(){t._onTimeout&&t._onTimeout()},e))},n("mypn"),e.setImmediate="undefined"!=typeof self&&self.setImmediate||void 0!==t&&t.setImmediate||this&&this.setImmediate,e.clearImmediate="undefined"!=typeof self&&self.clearImmediate||void 0!==t&&t.clearImmediate||this&&this.clearImmediate}).call(e,n("DuR2"))},"1MO9":function(t,e,n){(t.exports=n("FZ+f")(!1)).push([t.i,"input.form-control[type=color],input.form-control[type=range]{height:2.25rem}input.form-control.form-control-sm[type=color],input.form-control.form-control-sm[type=range]{height:1.9375rem}input.form-control.form-control-lg[type=color],input.form-control.form-control-lg[type=range]{height:3rem}input.form-control[type=color]{padding:.25rem}input.form-control.form-control-sm[type=color]{padding:.125rem}",""])},"1ndg":function(t,e){t.exports={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"container"},[n("div",{staticClass:"row"},[n("div",{staticClass:"col-md-8 col-lg-8 pt-2 px-0 my-3 timeline"},[t._m(0),t._v(" "),t._l(t.feed,function(e,i){return n("div",{key:e.id,staticClass:"card mb-4 status-card card-md-rounded-0",attrs:{"data-status-id":e.id}},[n("div",{staticClass:"card-header d-inline-flex align-items-center bg-white"},[n("img",{staticStyle:{"border-radius":"32px"},attrs:{src:e.account.avatar,width:"32px",height:"32px"}}),t._v(" "),n("a",{staticClass:"username font-weight-bold pl-2 text-dark",attrs:{href:e.account.url}},[t._v("\n\t\t\t\t\t\t"+t._s(e.account.username)+"\n\t\t\t\t\t")]),t._v(" "),n("div",{staticClass:"text-right",staticStyle:{"flex-grow":"1"}},[n("div",{staticClass:"dropdown"},[t._m(1,!0),t._v(" "),n("div",{staticClass:"dropdown-menu dropdown-menu-right",attrs:{"aria-labelledby":"dropdownMenuButton"}},[n("a",{staticClass:"dropdown-item font-weight-bold",attrs:{href:e.url}},[t._v("Go to post")]),t._v(" "),n("span",{class:[t.statusOwner(e)?"d-none":""]},[n("a",{staticClass:"dropdown-item font-weight-bold",attrs:{href:t.reportUrl(e)}},[t._v("Report")]),t._v(" "),n("a",{staticClass:"dropdown-item font-weight-bold",on:{click:function(n){t.muteProfile(e)}}},[t._v("Mute Profile")]),t._v(" "),n("a",{staticClass:"dropdown-item font-weight-bold",on:{click:function(n){t.blockProfile(e)}}},[t._v("Block Profile")])]),t._v(" "),n("span",{class:[t.statusOwner(e)?"":"d-none"]},[n("a",{staticClass:"dropdown-item font-weight-bold",attrs:{href:t.editUrl(e)}},[t._v("Edit")]),t._v(" "),n("a",{staticClass:"dropdown-item font-weight-bold text-danger",on:{click:function(n){t.deletePost(e)}}},[t._v("Delete")])])])])])]),t._v(" "),n("div",{staticClass:"postPresenterContainer"},["photo"===e.pf_type?n("div",{staticClass:"w-100"},[1==e.sensitive?n("div",[n("details",{staticClass:"details-animated"},[n("summary",[n("p",{staticClass:"mb-0 lead font-weight-bold"},[t._v(t._s(e.spoiler_text?e.spoiler_text:"CW / NSFW / Hidden Media"))]),t._v(" "),n("p",{staticClass:"font-weight-light"},[t._v("(click to show)")])]),t._v(" "),n("a",{staticClass:"max-hide-overflow",attrs:{href:e.url}},[n("img",{staticClass:"card-img-top",attrs:{src:e.media_attachments[0].url}})])])]):n("div",[n("div",[n("img",{staticClass:"card-img-top",attrs:{src:e.media_attachments[0].url}})])])]):"video"===e.pf_type?n("div",{staticClass:"w-100"},[1==e.sensitive?n("div",[n("details",{staticClass:"details-animated"},[n("summary",[n("p",{staticClass:"mb-0 lead font-weight-bold"},[t._v(t._s(e.spoiler_text?e.spoiler_text:"CW / NSFW / Hidden Media"))]),t._v(" "),n("p",{staticClass:"font-weight-light"},[t._v("(click to show)")])]),t._v(" "),n("div",{staticClass:"embed-responsive embed-responsive-16by9"},[n("video",{staticClass:"video",attrs:{preload:"none",controls:"",loop:""}},[n("source",{attrs:{src:e.media_attachments[0].url,type:e.media_attachments[0].mime}})])])])]):n("div",{staticClass:"embed-responsive embed-responsive-16by9"},[n("video",{staticClass:"video",attrs:{preload:"none",controls:"",loop:""}},[n("source",{attrs:{src:e.media_attachments[0].url,type:e.media_attachments[0].mime}})])])]):"photo:album"===e.pf_type?n("div",[1==e.sensitive?n("div",[n("details",{staticClass:"details-animated"},[n("summary",[n("p",{staticClass:"mb-0 lead font-weight-bold"},[t._v(t._s(e.spoiler_text?e.spoiler_text:"CW / NSFW / Hidden Media"))]),t._v(" "),n("p",{staticClass:"font-weight-light"},[t._v("(click to show)")])]),t._v(" "),n("b-carousel",{staticStyle:{"text-shadow":"1px 1px 2px #333"},attrs:{id:e.id+"-carousel",controls:"",indicators:"",background:"#ffffff",interval:0}},t._l(e.media_attachments,function(t,e){return n("b-carousel-slide",{key:t.id},[n("img",{staticClass:"d-block img-fluid w-100",attrs:{slot:"img",src:t.url,alt:t.description},slot:"img"})])}))],1)]):n("div",[n("b-carousel",{staticStyle:{"text-shadow":"1px 1px 2px #333"},attrs:{id:e.id+"-carousel",controls:"",indicators:"",background:"#ffffff",interval:0}},t._l(e.media_attachments,function(t,e){return n("b-carousel-slide",{key:t.id},[n("img",{staticClass:"d-block img-fluid w-100",attrs:{slot:"img",src:t.url,alt:t.description},slot:"img"})])}))],1)]):"video:album"===e.pf_type?n("div",{staticClass:"w-100"},[1==e.sensitive?n("div",[n("details",{staticClass:"details-animated"},[n("summary",[n("p",{staticClass:"mb-0 lead font-weight-bold"},[t._v(t._s(e.spoiler_text?e.spoiler_text:"CW / NSFW / Hidden Media"))]),t._v(" "),n("p",{staticClass:"font-weight-light"},[t._v("(click to show)")])]),t._v(" "),n("b-carousel",{staticStyle:{"text-shadow":"1px 1px 2px #333","background-color":"#000"},attrs:{id:e.id+"-carousel",controls:"","img-blank":"",background:"#ffffff",interval:0}},t._l(e.media_attachments,function(t,e){return n("b-carousel-slide",{key:t.id+"-media"},[n("video",{staticClass:"embed-responsive-item",attrs:{slot:"img",preload:"none",controls:"",loop:"",alt:t.description,width:"100%",height:"100%"},slot:"img"},[n("source",{attrs:{src:t.url,type:t.mime}})])])}))],1)]):n("div",[n("b-carousel",{staticStyle:{"text-shadow":"1px 1px 2px #333","background-color":"#000"},attrs:{id:e.id+"-carousel",controls:"","img-blank":"",background:"#ffffff",interval:0}},t._l(e.media_attachments,function(t,e){return n("b-carousel-slide",{key:t.id+"-media"},[n("video",{staticClass:"embed-responsive-item",attrs:{slot:"img",preload:"none",controls:"",loop:"",alt:t.description,width:"100%",height:"100%"},slot:"img"},[n("source",{attrs:{src:t.url,type:t.mime}})])])}))],1)]):"photo:video:album"===e.pf_type?n("div",{staticClass:"w-100"},[1==e.sensitive?n("div",[n("details",{staticClass:"details-animated"},[n("summary",[n("p",{staticClass:"mb-0 lead font-weight-bold"},[t._v(t._s(e.spoiler_text?e.spoiler_text:"CW / NSFW / Hidden Media"))]),t._v(" "),n("p",{staticClass:"font-weight-light"},[t._v("(click to show)")])]),t._v(" "),n("b-carousel",{staticStyle:{"text-shadow":"1px 1px 2px #333","background-color":"#000"},attrs:{id:e.id+"-carousel",controls:"","img-blank":"",background:"#ffffff",interval:0}},t._l(e.media_attachments,function(e,i){return n("b-carousel-slide",{key:e.id+"-media"},["Video"==e.type?n("video",{staticClass:"embed-responsive-item",attrs:{slot:"img",preload:"none",controls:"",loop:"",alt:e.description,width:"100%",height:"100%"},slot:"img"},[n("source",{attrs:{src:e.url,type:e.mime}})]):"Image"==e.type?n("img",{staticClass:"d-block img-fluid w-100",attrs:{slot:"img",src:e.url,alt:e.description},slot:"img"}):n("p",{staticClass:"text-center p-0 font-weight-bold text-white"},[t._v("Error: Problem rendering preview.")])])}))],1)]):n("div",[n("b-carousel",{staticStyle:{"text-shadow":"1px 1px 2px #333","background-color":"#000"},attrs:{id:e.id+"-carousel",controls:"","img-blank":"",background:"#ffffff",interval:0}},t._l(e.media_attachments,function(e,i){return n("b-carousel-slide",{key:e.id+"-media"},["Video"==e.type?n("video",{staticClass:"embed-responsive-item",attrs:{slot:"img",preload:"none",controls:"",loop:"",alt:e.description,width:"100%",height:"100%"},slot:"img"},[n("source",{attrs:{src:e.url,type:e.mime}})]):"Image"==e.type?n("img",{staticClass:"d-block img-fluid w-100",attrs:{slot:"img",src:e.url,alt:e.description},slot:"img"}):n("p",{staticClass:"text-center p-0 font-weight-bold text-white"},[t._v("Error: Problem rendering preview.")])])}))],1)]):n("div",{staticClass:"w-100"},[n("p",{staticClass:"text-center p-0 font-weight-bold text-white"},[t._v("Error: Problem rendering preview.")])])]),t._v(" "),n("div",{staticClass:"card-body"},[n("div",{staticClass:"reactions my-1"},[n("h3",{class:[e.favourited?"fas fa-heart text-danger pr-3 m-0 cursor-pointer":"far fa-heart pr-3 m-0 like-btn cursor-pointer"],attrs:{title:"Like"},on:{click:function(n){t.likeStatus(e,n)}}}),t._v(" "),n("h3",{staticClass:"far fa-comment pr-3 m-0 cursor-pointer",attrs:{title:"Comment"},on:{click:function(n){t.commentFocus(e,n)}}}),t._v(" "),n("h3",{class:[e.reblogged?"far fa-share-square pr-3 m-0 text-primary cursor-pointer":"far fa-share-square pr-3 m-0 share-btn cursor-pointer"],attrs:{title:"Share"},on:{click:function(n){t.shareStatus(e,n)}}})]),t._v(" "),n("div",{staticClass:"likes font-weight-bold"},[n("span",{staticClass:"like-count"},[t._v(t._s(e.favourites_count))]),t._v(" "+t._s(1==e.favourites_count?"like":"likes")+"\n\t\t\t\t\t")]),t._v(" "),n("div",{staticClass:"caption"},[n("p",{staticClass:"mb-2 read-more",staticStyle:{overflow:"hidden"}},[n("span",{staticClass:"username font-weight-bold"},[n("bdi",[n("a",{staticClass:"text-dark",attrs:{href:e.account.url}},[t._v(t._s(e.account.username))])])]),t._v(" "),n("span",{domProps:{innerHTML:t._s(e.content)}})])]),t._v(" "),n("div",{staticClass:"comments"}),t._v(" "),n("div",{staticClass:"timestamp pt-1"},[n("p",{staticClass:"small text-uppercase mb-0"},[n("a",{staticClass:"text-muted",attrs:{href:e.url}},[n("timeago",{directives:[{name:"b-tooltip",rawName:"v-b-tooltip.hover.bottom",modifiers:{hover:!0,bottom:!0}}],attrs:{datetime:e.created_at,"auto-update":60,"converter-options":{includeSeconds:!0},title:t.timestampFormat(e.created_at)}})],1)])])]),t._v(" "),n("div",{staticClass:"card-footer bg-white d-none"},[n("form",{on:{submit:function(n){n.preventDefault(),t.commentSubmit(e,n)}}},[n("input",{attrs:{type:"hidden",name:"item",value:""}}),t._v(" "),n("input",{staticClass:"form-control status-reply-input",attrs:{name:"comment",placeholder:"Add a comment…",autocomplete:"off"}})])])])})],2),t._v(" "),n("div",{staticClass:"col-md-4 col-lg-4 pt-2 my-3"},[n("div",{staticClass:"mb-4"},[n("div",{staticClass:"card profile-card"},[t._m(2),t._v(" "),n("div",{staticClass:"card-body contents d-none"},[n("div",{staticClass:"media d-flex align-items-center"},[n("a",{attrs:{href:t.profile.url}},[n("img",{staticClass:"mr-3 rounded-circle box-shadow",attrs:{src:t.profile.avatar||"/storage/avatars/default.png",alt:"avatar",width:"64px"}})]),t._v(" "),n("div",{staticClass:"media-body"},[n("p",{staticClass:"mb-0 px-0 font-weight-bold"},[n("a",{staticClass:"text-dark",attrs:{href:t.profile.url}},[t._v("@"+t._s(t.profile.username))])]),t._v(" "),n("p",{staticClass:"my-0 text-muted text-truncate pb-0"},[t._v(t._s(t.profile.display_name))])])])]),t._v(" "),n("div",{staticClass:"card-footer bg-white py-1 d-none"},[n("div",{staticClass:"d-flex justify-content-between text-center"},[n("span",{staticClass:"pl-3"},[n("p",{staticClass:"mb-0 font-weight-bold"},[t._v(t._s(t.profile.statuses_count))]),t._v(" "),n("p",{staticClass:"mb-0 small text-muted"},[t._v("Posts")])]),t._v(" "),n("span",[n("p",{staticClass:"mb-0 font-weight-bold"},[t._v(t._s(t.profile.followers_count))]),t._v(" "),n("p",{staticClass:"mb-0 small text-muted"},[t._v("Followers")])]),t._v(" "),n("span",{staticClass:"pr-3"},[n("p",{staticClass:"mb-0 font-weight-bold"},[t._v(t._s(t.profile.following_count))]),t._v(" "),n("p",{staticClass:"mb-0 small text-muted"},[t._v("Following")])])])])])]),t._v(" "),n("div",{staticClass:"mb-4"},[n("div",{staticClass:"card notification-card"},[t._m(3),t._v(" "),t._m(4),t._v(" "),n("div",{staticClass:"card-body pt-2 contents",staticStyle:{"max-height":"300px","overflow-y":"scroll"}},t._l(t.notifications,function(e,i){return n("div",{staticClass:"media mb-3 align-items-center"},[n("img",{staticClass:"mr-2 rounded-circle img-thumbnail",attrs:{src:e.account.avatar,alt:"",width:"32px"}}),t._v(" "),n("div",{staticClass:"media-body font-weight-light small"},["favourite"==e.type?n("div",[n("p",{staticClass:"my-0"},[n("span",{staticClass:"font-weight-bold"},[t._v(t._s(e.account.username))]),t._v(" liked your post.\n\t\t\t\t\t\t\t\t\t")])]):"comment"==e.type?n("div",[n("p",{staticClass:"my-0"},[n("span",{staticClass:"font-weight-bold"},[t._v(t._s(e.account.username))]),t._v(" commented on your post.\n\t\t\t\t\t\t\t\t\t")])]):"mention"==e.type?n("div",[n("p",{staticClass:"my-0"},[n("span",{staticClass:"font-weight-bold"},[t._v(t._s(e.account.username))]),t._v(" mentioned you.\n\t\t\t\t\t\t\t\t\t")])]):t._e()])])}))])]),t._v(" "),t._m(5)])])])},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"loader text-center"},[e("div",{staticClass:"lds-ring"},[e("div"),e("div"),e("div"),e("div")])])},function(){var t=this.$createElement,e=this._self._c||t;return e("button",{staticClass:"btn btn-link text-dark no-caret dropdown-toggle",attrs:{type:"button","data-toggle":"dropdown","aria-haspopup":"true","aria-expanded":"false",title:"Post options"}},[e("span",{staticClass:"fas fa-ellipsis-v fa-lg text-muted"})])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"card-body loader text-center"},[e("div",{staticClass:"lds-ring"},[e("div"),e("div"),e("div"),e("div")])])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"card-header bg-white"},[e("p",{staticClass:"mb-0 d-flex align-items-center justify-content-between"},[e("span",{staticClass:"text-muted font-weight-bold"},[this._v("Notifications")]),this._v(" "),e("a",{staticClass:"text-dark small",attrs:{href:"/account/activity"}},[this._v("See All")])])])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"card-body loader text-center",staticStyle:{height:"300px"}},[e("div",{staticClass:"lds-ring"},[e("div"),e("div"),e("div"),e("div")])])},function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("footer",[n("div",{staticClass:"container pb-5"},[n("p",{staticClass:"mb-0 text-uppercase font-weight-bold text-muted small"},[n("a",{staticClass:"text-dark pr-2",attrs:{href:"/site/about"}},[t._v("About Us")]),t._v(" "),n("a",{staticClass:"text-dark pr-2",attrs:{href:"/site/help"}},[t._v("Support")]),t._v(" "),n("a",{staticClass:"text-dark pr-2",attrs:{href:"/site/open-source"}},[t._v("Open Source")]),t._v(" "),n("a",{staticClass:"text-dark pr-2",attrs:{href:"/site/language"}},[t._v("Language")]),t._v(" "),n("a",{staticClass:"text-dark pr-2",attrs:{href:"/site/terms"}},[t._v("Terms")]),t._v(" "),n("a",{staticClass:"text-dark pr-2",attrs:{href:"/site/privacy"}},[t._v("Privacy")]),t._v(" "),n("a",{staticClass:"text-dark pr-2",attrs:{href:"/site/platform"}},[t._v("API")])]),t._v(" "),n("p",{staticClass:"mb-0 text-uppercase font-weight-bold text-muted small"},[n("a",{staticClass:"text-muted",attrs:{href:"http://pixelfed.org",rel:"noopener",title:"","data-toggle":"tooltip"}},[t._v("Powered by PixelFed")])])])])}]}},2:function(t,e,n){t.exports=n("Tkmu")},"20cu":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default={data:function(){return{tokens:[]}},ready:function(){this.prepareComponent()},mounted:function(){this.prepareComponent()},methods:{prepareComponent:function(){this.getTokens()},getTokens:function(){var t=this;axios.get("/oauth/tokens").then(function(e){t.tokens=e.data})},revoke:function(t){var e=this;axios.delete("/oauth/tokens/"+t.id).then(function(t){e.getTokens()})}}}},"25hp":function(t,e,n){var i=n("G7No");t.exports=function(t,e){var n=i(t,e)/1e3;return n>0?Math.floor(n):Math.ceil(n)}},"2XjJ":function(t,e){t.exports={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"container"},[n("section",{staticClass:"mb-5 section-explore"},[n("p",{staticClass:"lead text-muted font-weight-bold mb-0"},[t._v("Explore")]),t._v(" "),n("div",{staticClass:"profile-timeline"},[t._m(0),t._v(" "),n("div",{staticClass:"row d-none"},t._l(t.posts,function(t){return n("div",{staticClass:"col-4 p-0 p-sm-2 p-md-3"},[n("a",{staticClass:"card info-overlay card-md-border-0",attrs:{href:t.url}},[n("div",{staticClass:"square filter_class"},[n("div",{staticClass:"square-content",style:{"background-image":"url("+t.thumb+")"}})])])])}))])]),t._v(" "),t._m(1)])},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"loader text-center"},[e("div",{staticClass:"lds-ring"},[e("div"),e("div"),e("div"),e("div")])])},function(){var t=this.$createElement,e=this._self._c||t;return e("section",{staticClass:"mb-5"},[e("p",{staticClass:"lead text-center"},[this._v("To view more posts, check the "),e("a",{staticClass:"font-weight-bold",attrs:{href:"/"}},[this._v("home")]),this._v(" or "),e("a",{staticClass:"font-weight-bold",attrs:{href:"/timeline/public"}},[this._v("local")]),this._v(" timelines.")])])}]}},"2yyp":function(t,e){t.exports={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"postComponent d-none"},[n("div",{staticClass:"container px-0 mt-md-4"},[n("div",{staticClass:"card card-md-rounded-0 status-container orientation-unknown"},[n("div",{staticClass:"row px-0 mx-0"},[n("div",{staticClass:"d-flex d-md-none align-items-center justify-content-between card-header bg-white w-100"},[n("a",{staticClass:"d-flex align-items-center status-username text-truncate",attrs:{href:t.statusProfileUrl,"data-toggle":"tooltip","data-placement":"bottom",title:t.statusUsername}},[n("div",{staticClass:"status-avatar mr-2"},[n("img",{staticStyle:{"border-radius":"12px"},attrs:{src:t.statusAvatar,width:"24px",height:"24px"}})]),t._v(" "),n("div",{staticClass:"username"},[n("span",{staticClass:"username-link font-weight-bold text-dark"},[t._v(t._s(t.statusUsername))])])]),t._v(" "),n("div",{staticClass:"float-right"},[n("div",{staticClass:"post-actions"},[n("div",{staticClass:"dropdown"},[t._m(0),t._v(" "),n("div",{staticClass:"dropdown-menu dropdown-menu-right",attrs:{"aria-labelledby":"dropdownMenuButton"}},[n("span",{staticClass:"menu-user d-none"},[n("a",{staticClass:"dropdown-item font-weight-bold",attrs:{href:t.reportUrl()}},[t._v("Report")]),t._v(" "),n("a",{staticClass:"dropdown-item font-weight-bold",on:{click:t.muteProfile}},[t._v("Mute Profile")]),t._v(" "),n("a",{staticClass:"dropdown-item font-weight-bold",on:{click:t.blockProfile}},[t._v("Block Profile")])]),t._v(" "),n("span",{staticClass:"menu-author d-none"},[n("a",{staticClass:"dropdown-item font-weight-bold",attrs:{href:t.editUrl()}},[t._v("Edit")]),t._v(" "),n("a",{staticClass:"dropdown-item font-weight-bold text-danger",on:{click:t.deletePost}},[t._v("Delete")])])])])])])]),t._v(" "),t._m(1),t._v(" "),n("div",{staticClass:"col-12 col-md-4 px-0 d-flex flex-column border-left border-md-left-0"},[n("div",{staticClass:"d-md-flex d-none align-items-center justify-content-between card-header py-3 bg-white"},[n("a",{staticClass:"d-flex align-items-center status-username text-truncate",attrs:{href:t.statusProfileUrl,"data-toggle":"tooltip","data-placement":"bottom",title:t.statusUsername}},[n("div",{staticClass:"status-avatar mr-2"},[n("img",{staticStyle:{"border-radius":"12px"},attrs:{src:t.statusAvatar,width:"24px",height:"24px"}})]),t._v(" "),n("div",{staticClass:"username"},[n("span",{staticClass:"username-link font-weight-bold text-dark"},[t._v(t._s(t.statusUsername))])])]),t._v(" "),n("div",{staticClass:"float-right"},[n("div",{staticClass:"post-actions"},[n("div",{staticClass:"dropdown"},[t._m(2),t._v(" "),n("div",{staticClass:"dropdown-menu dropdown-menu-right",attrs:{"aria-labelledby":"dropdownMenuButton"}},[n("span",{staticClass:"menu-user d-none"},[n("a",{staticClass:"dropdown-item font-weight-bold",attrs:{href:t.reportUrl()}},[t._v("Report")]),t._v(" "),n("a",{staticClass:"dropdown-item font-weight-bold",on:{click:t.muteProfile}},[t._v("Mute Profile")]),t._v(" "),n("a",{staticClass:"dropdown-item font-weight-bold",on:{click:t.blockProfile}},[t._v("Block Profile")])]),t._v(" "),n("span",{staticClass:"menu-author d-none"},[n("a",{staticClass:"dropdown-item font-weight-bold",attrs:{href:t.editUrl()}},[t._v("Edit")]),t._v(" "),n("a",{staticClass:"dropdown-item font-weight-bold text-danger",on:{click:t.deletePost}},[t._v("Delete")])])])])])])]),t._v(" "),n("div",{staticClass:"d-flex flex-md-column flex-column-reverse h-100"},[n("div",{staticClass:"card-body status-comments"},[n("div",{staticClass:"status-comment"},[n("p",{staticClass:"mb-1 read-more",staticStyle:{overflow:"hidden"}},[n("span",{staticClass:"font-weight-bold pr-1"},[t._v(t._s(t.statusUsername))]),t._v(" "),n("span",{staticClass:"comment-text",attrs:{id:t.status.id+"-status-readmore"},domProps:{innerHTML:t._s(t.status.content)}})]),t._v(" "),n("post-comments",{attrs:{user:this.user,"post-id":t.statusId,"post-username":t.statusUsername}})],1)]),t._v(" "),n("div",{staticClass:"card-body flex-grow-0 py-1"},[n("div",{staticClass:"reactions my-1"},[n("h3",{class:[t.reactions.liked?"fas fa-heart text-danger pr-3 m-0":"far fa-heart pr-3 m-0 like-btn"],attrs:{title:"Like"},on:{click:t.likeStatus}}),t._v(" "),n("h3",{staticClass:"far fa-comment pr-3 m-0",attrs:{title:"Comment"},on:{click:t.commentFocus}}),t._v(" "),n("h3",{class:[t.reactions.shared?"far fa-share-square pr-3 m-0 text-primary":"far fa-share-square pr-3 m-0 share-btn"],attrs:{title:"Share"},on:{click:t.shareStatus}}),t._v(" "),n("h3",{class:[t.reactions.bookmarked?"fas fa-bookmark text-warning m-0 float-right":"far fa-bookmark m-0 float-right"],attrs:{title:"Bookmark"},on:{click:t.bookmarkStatus}})]),t._v(" "),n("div",{staticClass:"reaction-counts font-weight-bold mb-0"},[n("span",{staticStyle:{cursor:"pointer"},on:{click:t.likesModal}},[n("span",{staticClass:"like-count"},[t._v(t._s(t.status.favourites_count||0))]),t._v(" likes\n ")]),t._v(" "),n("span",{staticClass:"float-right",staticStyle:{cursor:"pointer"},on:{click:t.sharesModal}},[n("span",{staticClass:"share-count pl-4"},[t._v(t._s(t.status.reblogs_count||0))]),t._v(" shares\n ")])]),t._v(" "),n("div",{staticClass:"timestamp"},[n("a",{staticClass:"small text-muted",attrs:{href:t.statusUrl}},[t._v("\n "+t._s(t.timestampFormat())+"\n ")])])])]),t._v(" "),n("div",{staticClass:"card-footer bg-white sticky-md-bottom"},[t._m(3),t._v(" "),n("form",{staticClass:"comment-form d-none",attrs:{method:"post",action:"/i/comment","data-id":t.statusId,"data-truncate":"false"}},[n("input",{attrs:{type:"hidden",name:"_token",value:""}}),t._v(" "),n("input",{attrs:{type:"hidden",name:"item"},domProps:{value:t.statusId}}),t._v(" "),n("input",{staticClass:"form-control",attrs:{name:"comment",placeholder:"Add a comment...",autocomplete:"off"}})])])])])])]),t._v(" "),n("b-modal",{ref:"likesModal",attrs:{id:"l-modal","hide-footer":"",centered:"",title:"Likes","body-class":"list-group-flush p-0"}},[n("div",{staticClass:"list-group"},[t._l(t.likes,function(e){return n("div",{staticClass:"list-group-item border-0"},[n("div",{staticClass:"media"},[n("a",{attrs:{href:e.url}},[n("img",{staticClass:"mr-3 rounded-circle box-shadow",attrs:{src:e.avatar,alt:e.username+"'s avatar",width:"30px"}})]),t._v(" "),n("div",{staticClass:"media-body"},[n("p",{staticClass:"mb-0",staticStyle:{"font-size":"14px"}},[n("a",{staticClass:"font-weight-bold text-dark",attrs:{href:e.url}},[t._v("\n "+t._s(e.username)+"\n ")])]),t._v(" "),n("p",{staticClass:"text-muted mb-0",staticStyle:{"font-size":"14px"}},[t._v("\n "+t._s(e.display_name)+"\n ")])])])])}),t._v(" "),n("infinite-loading",{attrs:{spinner:"spiral"},on:{infinite:t.infiniteLikesHandler}},[n("div",{attrs:{slot:"no-more"},slot:"no-more"}),t._v(" "),n("div",{attrs:{slot:"no-results"},slot:"no-results"})])],2)]),t._v(" "),n("b-modal",{ref:"sharesModal",attrs:{id:"s-modal","hide-footer":"",centered:"",title:"Shares","body-class":"list-group-flush p-0"}},[n("div",{staticClass:"list-group"},[t._l(t.shares,function(e){return n("div",{staticClass:"list-group-item border-0"},[n("div",{staticClass:"media"},[n("a",{attrs:{href:e.url}},[n("img",{staticClass:"mr-3 rounded-circle box-shadow",attrs:{src:e.avatar,alt:e.username+"'s avatar",width:"30px"}})]),t._v(" "),n("div",{staticClass:"media-body"},[n("p",{staticClass:"mb-0",staticStyle:{"font-size":"14px"}},[n("a",{staticClass:"font-weight-bold text-dark",attrs:{href:e.url}},[t._v("\n "+t._s(e.username)+"\n ")])]),t._v(" "),n("p",{staticClass:"text-muted mb-0",staticStyle:{"font-size":"14px"}},[t._v("\n "+t._s(e.display_name)+"\n ")])])])])}),t._v(" "),n("infinite-loading",{attrs:{spinner:"spiral"},on:{infinite:t.infiniteSharesHandler}},[n("div",{attrs:{slot:"no-more"},slot:"no-more"}),t._v(" "),n("div",{attrs:{slot:"no-results"},slot:"no-results"})])],2)])],1)},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("button",{staticClass:"btn btn-link text-dark no-caret dropdown-toggle",attrs:{type:"button","data-toggle":"dropdown","aria-haspopup":"true","aria-expanded":"false",title:"Post options"}},[e("span",{staticClass:"fas fa-ellipsis-v text-muted"})])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"col-12 col-md-8 status-photo px-0 mx-0"},[e("div",{staticClass:"postPresenterLoader text-center"},[e("div",{staticClass:"lds-ring"},[e("div"),e("div"),e("div"),e("div")])]),this._v(" "),e("div",{staticClass:"postPresenterContainer d-none"})])},function(){var t=this.$createElement,e=this._self._c||t;return e("button",{staticClass:"btn btn-link text-dark no-caret dropdown-toggle",attrs:{type:"button","data-toggle":"dropdown","aria-haspopup":"true","aria-expanded":"false",title:"Post options"}},[e("span",{staticClass:"fas fa-ellipsis-v text-muted"})])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"comment-form-guest"},[e("a",{attrs:{href:"/login"}},[this._v("Login")]),this._v(" to like or comment.\n ")])}]}},"3G5u":function(t,e){t.exports={render:function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",[n("div",[n("div",{staticClass:"card card-default mb-4"},[n("div",{staticClass:"card-header font-weight-bold bg-white"},[n("div",{staticStyle:{display:"flex","justify-content":"space-between","align-items":"center"}},[n("span",[t._v("\n Personal Access Tokens\n ")]),t._v(" "),n("a",{staticClass:"action-link",attrs:{tabindex:"-1"},on:{click:t.showCreateTokenForm}},[t._v("\n Create New Token\n ")])])]),t._v(" "),n("div",{staticClass:"card-body"},[0===t.tokens.length?n("p",{staticClass:"mb-0"},[t._v("\n You have not created any personal access tokens.\n ")]):t._e(),t._v(" "),t.tokens.length>0?n("table",{staticClass:"table table-borderless mb-0"},[t._m(0),t._v(" "),n("tbody",t._l(t.tokens,function(e){return n("tr",[n("td",{staticStyle:{"vertical-align":"middle"}},[t._v("\n "+t._s(e.name)+"\n ")]),t._v(" "),n("td",{staticStyle:{"vertical-align":"middle"}},[n("a",{staticClass:"action-link text-danger",on:{click:function(n){t.revoke(e)}}},[t._v("\n Delete\n ")])])])}))]):t._e()])])]),t._v(" "),n("div",{staticClass:"modal fade",attrs:{id:"modal-create-token",tabindex:"-1",role:"dialog"}},[n("div",{staticClass:"modal-dialog"},[n("div",{staticClass:"modal-content"},[t._m(1),t._v(" "),n("div",{staticClass:"modal-body"},[t.form.errors.length>0?n("div",{staticClass:"alert alert-danger"},[t._m(2),t._v(" "),n("br"),t._v(" "),n("ul",t._l(t.form.errors,function(e){return n("li",[t._v("\n "+t._s(e)+"\n ")])}))]):t._e(),t._v(" "),n("form",{attrs:{role:"form"},on:{submit:function(e){return e.preventDefault(),t.store(e)}}},[n("div",{staticClass:"form-group row"},[n("label",{staticClass:"col-md-4 col-form-label"},[t._v("Name")]),t._v(" "),n("div",{staticClass:"col-md-6"},[n("input",{directives:[{name:"model",rawName:"v-model",value:t.form.name,expression:"form.name"}],staticClass:"form-control",attrs:{id:"create-token-name",type:"text",name:"name",autocomplete:"off"},domProps:{value:t.form.name},on:{input:function(e){e.target.composing||t.$set(t.form,"name",e.target.value)}}})])]),t._v(" "),t.scopes.length>0?n("div",{staticClass:"form-group row"},[n("label",{staticClass:"col-md-4 col-form-label"},[t._v("Scopes")]),t._v(" "),n("div",{staticClass:"col-md-6"},t._l(t.scopes,function(e){return n("div",[n("div",{staticClass:"checkbox"},[n("label",[n("input",{attrs:{type:"checkbox"},domProps:{checked:t.scopeIsAssigned(e.id)},on:{click:function(n){t.toggleScope(e.id)}}}),t._v("\n\n "+t._s(e.id)+"\n ")])])])}))]):t._e()])]),t._v(" "),n("div",{staticClass:"modal-footer"},[n("button",{staticClass:"btn btn-secondary font-weight-bold",attrs:{type:"button","data-dismiss":"modal"}},[t._v("Close")]),t._v(" "),n("button",{staticClass:"btn btn-primary font-weight-bold",attrs:{type:"button"},on:{click:t.store}},[t._v("\n Create\n ")])])])])]),t._v(" "),n("div",{staticClass:"modal fade",attrs:{id:"modal-access-token",tabindex:"-1",role:"dialog"}},[n("div",{staticClass:"modal-dialog"},[n("div",{staticClass:"modal-content"},[t._m(3),t._v(" "),n("div",{staticClass:"modal-body"},[n("p",[t._v("\n Here is your new personal access token. This is the only time it will be shown so don't lose it!\n You may now use this token to make API requests.\n ")]),t._v(" "),n("textarea",{staticClass:"form-control",attrs:{rows:"10"}},[t._v(t._s(t.accessToken))])]),t._v(" "),t._m(4)])])])])},staticRenderFns:[function(){var t=this.$createElement,e=this._self._c||t;return e("thead",[e("tr",[e("th",[this._v("Name")]),this._v(" "),e("th")])])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"modal-header"},[e("h4",{staticClass:"modal-title"},[this._v("\n Create Token\n ")]),this._v(" "),e("button",{staticClass:"close",attrs:{type:"button","data-dismiss":"modal","aria-hidden":"true"}},[this._v("×")])])},function(){var t=this.$createElement,e=this._self._c||t;return e("p",{staticClass:"mb-0"},[e("strong",[this._v("Whoops!")]),this._v(" Something went wrong!")])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"modal-header"},[e("h4",{staticClass:"modal-title"},[this._v("\n Personal Access Token\n ")]),this._v(" "),e("button",{staticClass:"close",attrs:{type:"button","data-dismiss":"modal","aria-hidden":"true"}},[this._v("×")])])},function(){var t=this.$createElement,e=this._self._c||t;return e("div",{staticClass:"modal-footer"},[e("button",{staticClass:"btn btn-secondary",attrs:{type:"button","data-dismiss":"modal"}},[this._v("Close")])])}]}},"3H+/":function(t,e,n){var i,r;!function(o,a){i=[n("/7en"),n("h803")],void 0===(r=function(t,e){return a(o,t,e)}.apply(e,i))||(t.exports=r)}(window,function(t,e,n){var i=t.jQuery,r={};function o(t,e){var a=n.getQueryElement(t);if(a){if((t=a).infiniteScrollGUID){var s=r[t.infiniteScrollGUID];return s.option(e),s}this.element=t,this.options=n.extend({},o.defaults),this.option(e),i&&(this.$element=i(this.element)),this.create()}else console.error("Bad element for InfiniteScroll: "+(a||t))}o.defaults={},o.create={},o.destroy={};var a=o.prototype;n.extend(a,e.prototype);var s=0;a.create=function(){var t=this.guid=++s;if(this.element.infiniteScrollGUID=t,r[t]=this,this.pageIndex=1,this.loadCount=0,this.updateGetPath(),this.getPath&&this.getPath())for(var e in this.updateGetAbsolutePath(),this.log("initialized",[this.element.className]),this.callOnInit(),o.create)o.create[e].call(this);else console.error("Disabling InfiniteScroll")},a.option=function(t){n.extend(this.options,t)},a.callOnInit=function(){var t=this.options.onInit;t&&t.call(this,this)},a.dispatchEvent=function(t,e,n){this.log(t,n);var r=e?[e].concat(n):n;if(this.emitEvent(t,r),i&&this.$element){var o=t+=".infiniteScroll";if(e){var a=i.Event(e);a.type=t,o=a}this.$element.trigger(o,n)}};var l={initialized:function(t){return"on "+t},request:function(t){return"URL: "+t},load:function(t,e){return(t.title||"")+". URL: "+e},error:function(t,e){return t+". URL: "+e},append:function(t,e,n){return n.length+" items. URL: "+e},last:function(t,e){return"URL: "+e},history:function(t,e){return"URL: "+e},pageIndex:function(t,e){return"current page determined to be: "+t+" from "+e}};a.log=function(t,e){if(this.options.debug){var n="[InfiniteScroll] "+t,i=l[t];i&&(n+=". "+i.apply(this,e)),console.log(n)}},a.updateMeasurements=function(){this.windowHeight=t.innerHeight;var e=this.element.getBoundingClientRect();this.top=e.top+t.pageYOffset},a.updateScroller=function(){var e=this.options.elementScroll;if(e){if(this.scroller=!0===e?this.element:n.getQueryElement(e),!this.scroller)throw"Unable to find elementScroll: "+e}else this.scroller=t},a.updateGetPath=function(){var t=this.options.path;if(t){var e=typeof t;if("function"!=e)"string"==e&&t.match("{{#}}")?this.updateGetPathTemplate(t):this.updateGetPathSelector(t);else this.getPath=t}else console.error("InfiniteScroll path option required. Set as: "+t)},a.updateGetPathTemplate=function(t){this.getPath=function(){var e=this.pageIndex+1;return t.replace("{{#}}",e)}.bind(this);var e=t.replace("{{#}}","(\\d\\d?\\d?)"),n=new RegExp(e),i=location.href.match(n);i&&(this.pageIndex=parseInt(i[1],10),this.log("pageIndex",[this.pageIndex,"template string"]))};var c=[/^(.*?\/?page\/?)(\d\d?\d?)(.*?$)/,/^(.*?\/?\?page=)(\d\d?\d?)(.*?$)/,/(.*?)(\d\d?\d?)(?!.*\d)(.*?$)/];return a.updateGetPathSelector=function(t){var e=document.querySelector(t);if(e){for(var n,i,r=e.getAttribute("href"),o=0;r&&o=0,this.isPrefilling?(this.log("prefill"),this.loadNextPage()):this.stopPrefill()},n.getPrefillDistance=function(){return this.options.elementScroll?this.scroller.clientHeight-this.scroller.scrollHeight:this.windowHeight-this.element.clientHeight},n.stopPrefill=function(){this.log("stopPrefill"),this.off("append",this.prefill)},e})},"99Qu":function(t,e,n){var i,r;!function(o,a){i=[n("3H+/"),n("h803")],void 0===(r=function(t,e){return a(o,t,e)}.apply(e,i))||(t.exports=r)}(window,function(t,e,n){var i=e.prototype;return e.defaults.scrollThreshold=400,e.create.scrollWatch=function(){this.pageScrollHandler=this.onPageScroll.bind(this),this.resizeHandler=this.onResize.bind(this);var t=this.options.scrollThreshold;(t||0===t)&&this.enableScrollWatch()},e.destroy.scrollWatch=function(){this.disableScrollWatch()},i.enableScrollWatch=function(){this.isScrollWatching||(this.isScrollWatching=!0,this.updateMeasurements(),this.updateScroller(),this.on("last",this.disableScrollWatch),this.bindScrollWatchEvents(!0))},i.disableScrollWatch=function(){this.isScrollWatching&&(this.bindScrollWatchEvents(!1),delete this.isScrollWatching)},i.bindScrollWatchEvents=function(e){var n=e?"addEventListener":"removeEventListener";this.scroller[n]("scroll",this.pageScrollHandler),t[n]("resize",this.resizeHandler)},i.onPageScroll=e.throttle(function(){this.getBottomDistance()<=this.options.scrollThreshold&&this.dispatchEvent("scrollThreshold")}),i.getBottomDistance=function(){return this.options.elementScroll?this.getElementBottomDistance():this.getWindowBottomDistance()},i.getWindowBottomDistance=function(){return this.top+this.element.clientHeight-(t.pageYOffset+this.windowHeight)},i.getElementBottomDistance=function(){return this.scroller.scrollHeight-(this.scroller.scrollTop+this.scroller.clientHeight)},i.onResize=function(){this.updateMeasurements()},n.debounceMethod(e,"onResize",150),e})},"A/e+":function(t,e,n){var i=n("VU/8")(n("5m3O"),n("ITff"),!1,function(t){n("SZtu")},"data-v-6c5fc404",null);t.exports=i.exports},BXHd:function(t,e){$(document).ready(function(){$(document).on("submit",".bookmark-form",function(t){t.preventDefault();var e=$(this).data("id");axios.post("/i/bookmark",{item:e})})})},"Bx+d":function(t,e,n){"use strict";function i(t){if(Array.isArray(t)){for(var e=0,n=Array(t.length);e");t.addClass("d-flex align-items-center"),e[0].filter_class&&i.addClass(e[0].filter_class);var r=$("");if(r.attr("src",e[0].url),r.attr("title",e[0].description),i.append(r),1==n.sensitive){var o=n.spoiler_text?n.spoiler_text:"CW / NSFW / Hidden Media",a=$("
").addClass("details-animated w-100"),s=$(""),l=$("

").addClass("mb-0 lead font-weight-bold").text(o),c=$("

").addClass("font-weight-light").text("(click to show)");s.append(l,c),a.append(s,i),t.append(a)}else t.append(i)},video:function(t,e,n){var i=$("

");t.addClass("d-flex align-items-center");var r=$("
From 564fd932903b53a4c7adc303017d7b37f9911792 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 10 Dec 2018 21:26:11 -0700 Subject: [PATCH 2/2] Update StatusController --- app/Http/Controllers/StatusController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/StatusController.php b/app/Http/Controllers/StatusController.php index f2504231..8c04bbf4 100644 --- a/app/Http/Controllers/StatusController.php +++ b/app/Http/Controllers/StatusController.php @@ -279,7 +279,7 @@ class StatusController extends Controller $photos = 0; $videos = 0; foreach($mimes as $mime) { - if(in_array($mime, $allowed) == false) { + if(in_array($mime, $allowed) == false && $mime !== 'video/mp4') { continue; } if(str_contains($mime, 'image/')) {