fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-18 07:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0

Browse source
This commit is contained in:
lain 2020-08-27 15:38:03 +02:00
parent 5dba3a50fc 1c05819c9b
commit 82bf27172c
57 changed files with 165 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
View file

@ -149,7 +149,9 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
from(c in Chat,
where: c.user_id == ^user_id,
where: c.recipient not in ^blocked_ap_ids,
order_by: [desc: c.updated_at]
order_by: [desc: c.updated_at],
inner_join: u in User,
on: u.ap_id == c.recipient
)
|> Repo.all()

2
priv/static/adminfe/index.html
View file

@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.40545a1f.css rel=stylesheet><link href=chunk-libs.0380664d.css rel=stylesheet><link href=app.07a1f8db.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.04c4fa2f.js></script><script type=text/javascript src=static/js/chunk-elementUI.8e5c404c.js></script><script type=text/javascript src=static/js/chunk-libs.f842b12e.js></script><script type=text/javascript src=static/js/app.a962469a.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.40545a1f.css rel=stylesheet><link href=chunk-libs.0380664d.css rel=stylesheet><link href=app.07a1f8db.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.04c4fa2f.js></script><script type=text/javascript src=static/js/chunk-elementUI.8e5c404c.js></script><script type=text/javascript src=static/js/chunk-libs.f842b12e.js></script><script type=text/javascript src=static/js/app.1df22cde.js></script></body></html>

BIN
priv/static/adminfe/static/fonts/element-icons.535877f.woff Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/static/fonts/element-icons.732389d.ttf Normal file
View file

Binary file not shown.

BIN
priv/static/adminfe/static/img/401.089007e.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 160 KiB

BIN
priv/static/adminfe/static/img/404.a57b6f3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 96 KiB

2
priv/static/adminfe/static/js/7zzA.e1ae1c94.js Normal file
View file

@ -0,0 +1,2 @@
(window.webpackJsonp=window.webpackJsonp||[]).push([["7zzA"],{"7zzA":function(e,r,n){"use strict";n.r(r);var t={beforeCreate:function(){var e=this.$route,r=e.params,n=e.query,t=r.path;this.$router.replace({path:"/"+t,query:n})},render:function(e){return e()}},o=n("KHd+"),u=Object(o.a)(t,void 0,void 0,!1,null,null,null);u.options.__file="index.vue";r.default=u.exports}}]);
//# sourceMappingURL=7zzA.e1ae1c94.js.map

1
priv/static/adminfe/static/js/7zzA.e1ae1c94.js.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sources":["webpack:///src/views/redirect/index.vue","webpack:///./src/views/redirect/index.vue?29eb","webpack:///./src/views/redirect/index.vue"],"names":["views_redirectvue_type_script_lang_js_","beforeCreate","_this$$route","this","$route","params","query","path","$router","replace","render","h","component","Object","componentNormalizer","staticRenderFns","options","__file","__webpack_exports__"],"mappings":"yGACA,ICD0MA,GDE1MC,aADA,WACA,IAAAC,EACAC,KAAAC,OAAAC,EADAH,EACAG,OAAAC,EADAJ,EACAI,MACAC,EAAAF,EAAAE,KACAJ,KAAAK,QAAAC,SAAAF,KAAA,IAAAA,EAAAD,WAEAI,OAAA,SAAAC,GACA,OAAAA,kBEDAC,EAAgBC,OAAAC,EAAA,EAAAD,CACdb,OARFU,OAAAK,GAWA,EACA,KACA,KACA,MAIAH,EAAAI,QAAAC,OAAA,YACeC,EAAA,QAAAN","file":"static/js/7zzA.e1ae1c94.js","sourcesContent":["<script>\nexport default {\n beforeCreate() {\n const { params, query } = this.$route\n const { path } = params\n this.$router.replace({ path: '/' + path, query })\n },\n render: function(h) {\n return h() // avoid warning message\n }\n}\n</script>\n","import mod from \"-!../../../node_modules/babel-loader/lib/index.js?cacheDirectory!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./index.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../node_modules/babel-loader/lib/index.js?cacheDirectory!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./index.vue?vue&type=script&lang=js&\"","var render, staticRenderFns\nimport script from \"./index.vue?vue&type=script&lang=js&\"\nexport * from \"./index.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\ncomponent.options.__file = \"index.vue\"\nexport default component.exports"],"sourceRoot":""}

2
priv/static/adminfe/static/js/JEtC.f9ba4594.js Normal file
View file

@ -0,0 +1,2 @@
(window.webpackJsonp=window.webpackJsonp||[]).push([["JEtC"],{JEtC:function(o,n,i){"use strict";i.r(n);var e={name:"AuthRedirect",created:function(){var o=window.location.search.slice(1);window.opener.location.href=window.location.origin+"/login#"+o,window.close()}},t=i("KHd+"),c=Object(t.a)(e,void 0,void 0,!1,null,null,null);c.options.__file="authredirect.vue";n.default=c.exports}}]);
//# sourceMappingURL=JEtC.f9ba4594.js.map

1
priv/static/adminfe/static/js/JEtC.f9ba4594.js.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sources":["webpack:///src/views/login/authredirect.vue","webpack:///./src/views/login/authredirect.vue?a9ea","webpack:///./src/views/login/authredirect.vue"],"names":["login_authredirectvue_type_script_lang_js_","name","created","hash","window","location","search","slice","opener","href","origin","close","component","Object","componentNormalizer","render","staticRenderFns","options","__file","__webpack_exports__"],"mappings":"uGACA,ICDiNA,GDEjNC,KAAA,eACAC,QAFA,WAGA,IAAAC,EAAAC,OAAAC,SAAAC,OAAAC,MAAA,GACAH,OAAAI,OAAAH,SAAAI,KAAAL,OAAAC,SAAAK,OAAA,UAAAP,EACAC,OAAAO,sBECAC,EAAgBC,OAAAC,EAAA,EAAAD,CACdb,OARFe,OAAAC,GAWA,EACA,KACA,KACA,MAIAJ,EAAAK,QAAAC,OAAA,mBACeC,EAAA,QAAAP","file":"static/js/JEtC.f9ba4594.js","sourcesContent":["<script>\nexport default {\n name: 'AuthRedirect',\n created() {\n const hash = window.location.search.slice(1)\n window.opener.location.href = window.location.origin + '/login#' + hash\n window.close()\n }\n}\n</script>\n","import mod from \"-!../../../node_modules/babel-loader/lib/index.js?cacheDirectory!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./authredirect.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../node_modules/babel-loader/lib/index.js?cacheDirectory!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./authredirect.vue?vue&type=script&lang=js&\"","var render, staticRenderFns\nimport script from \"./authredirect.vue?vue&type=script&lang=js&\"\nexport * from \"./authredirect.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\ncomponent.options.__file = \"authredirect.vue\"\nexport default component.exports"],"sourceRoot":""}

2
priv/static/adminfe/static/js/app.1df22cde.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/app.1df22cde.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-0171.9e927b8a.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-0171.9e927b8a.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-16d0.6ce78978.js Normal file
View file

@ -0,0 +1,2 @@
(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-16d0"],{aSQl:function(e,n,t){"use strict";t.d(n,"a",function(){return p});var r=t("o0o1"),a=t.n(r),o=t("yXPU"),s=t.n(o),u=t("oAJy"),c=t.n(u),i=t("LvDl"),l=t.n(i),p=function(){var e=s()(a.a.mark(function e(n){var t,r;return a.a.wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return e.next=2,c.a.getItem("vuex-lz");case 2:if(t=e.sent,void 0!==(r=l.a.get(t,"oauth.userToken"))){e.next=6;break}throw new Error("PleromaFE token not found");case 6:return e.next=8,n.dispatch("LoginByPleromaFE",{token:r});case 8:case"end":return e.stop()}},e)}));return function(n){return e.apply(this,arguments)}}()},iRgq:function(e,n,t){"use strict";t.r(n);var r=t("o0o1"),a=t.n(r),o=t("yXPU"),s=t.n(o),u=t("XJYT"),c=t("aSQl"),i=t("mSNy"),l={name:"LoginPleroma",mounted:function(){var e=s()(a.a.mark(function e(){var n;return a.a.wrap(function(e){for(;;)switch(e.prev=e.next){case 0:return n=u.Loading.service({fullscreen:!0}),e.prev=1,e.next=4,Object(c.a)(this.$store);case 4:e.next=9;break;case 6:e.prev=6,e.t0=e.catch(1),this.$message.error(i.a.t("login.pleromaFELoginFailed"));case 9:n.close(),this.$router.push({path:"/users/index"}),this.$message.success(i.a.t("login.pleromaFELoginSucceed"));case 12:case"end":return e.stop()}},e,this,[[1,6]])}));return function(){return e.apply(this,arguments)}}()},p=t("KHd+"),f=Object(p.a)(l,function(){var e=this.$createElement;return(this._self._c||e)("div")},[],!1,null,null,null);f.options.__file="pleroma.vue";n.default=f.exports}}]);
//# sourceMappingURL=chunk-16d0.6ce78978.js.map

1
priv/static/adminfe/static/js/chunk-16d0.6ce78978.js.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sources":["webpack:///./src/services/pleromaAuth.js","webpack:///./src/views/login/pleroma.vue?ed01","webpack:///./src/views/login/pleroma.vue?5ee7","webpack:///src/views/login/pleroma.vue","webpack:///./src/views/login/pleroma.vue"],"names":["authenticateWithPleromaFE","_ref","_babel_runtime_helpers_asyncToGenerator__WEBPACK_IMPORTED_MODULE_1___default","_babel_runtime_regenerator__WEBPACK_IMPORTED_MODULE_0___default","a","mark","_callee","store","pleromaFEState","token","wrap","_context","prev","next","localforage","getItem","sent","undefined","_","get","Error","dispatch","stop","_x","apply","this","arguments","login_pleromavue_type_script_lang_js_","name","mounted","_mounted","asyncToGenerator_default","regenerator_default","loadingInstance","element_ui_common","service","fullscreen","Object","pleromaAuth","$store","t0","$message","error","lang","t","close","$router","push","path","success","component","componentNormalizer","_h","$createElement","_self","_c","options","__file","__webpack_exports__"],"mappings":"8NAKaA,EAAyB,eAAAC,EAAAC,IAAAC,EAAAC,EAAAC,KAAG,SAAAC,EAAMC,GAAN,IAAAC,EAAAC,EAAA,OAAAN,EAAAC,EAAAM,KAAA,SAAAC,GAAA,cAAAA,EAAAC,KAAAD,EAAAE,MAAA,cAAAF,EAAAE,KAAA,EACVC,IAAYC,QAHjB,WAEe,UACjCP,EADiCG,EAAAK,UAIzBC,KAFRR,EAAQS,IAAEC,IAAIX,EAAgB,oBAFG,CAAAG,EAAAE,KAAA,cAK/B,IAAIO,MAAM,6BALqB,cAAAT,EAAAE,KAAA,EAQjCN,EAAMc,SAAS,oBAAsBZ,UARJ,wBAAAE,EAAAW,SAAAhB,MAAH,gBAAAiB,GAAA,OAAAtB,EAAAuB,MAAAC,KAAAC,YAAA,6CCLtC,kFCA4MC,GCU5MC,KAAA,eACAC,QAFA,eAAAC,EAAAC,IAAAC,EAAA5B,EAAAC,KAAA,SAAAC,IAAA,IAAA2B,EAAA,OAAAD,EAAA5B,EAAAM,KAAA,SAAAC,GAAA,cAAAA,EAAAC,KAAAD,EAAAE,MAAA,cAGAoB,EAAAC,EAAA,QAAAC,SAAAC,YAAA,IAHAzB,EAAAC,KAAA,EAAAD,EAAAE,KAAA,EAMAwB,OAAAC,EAAA,EAAAD,CAAAZ,KAAAc,QANA,OAAA5B,EAAAE,KAAA,eAAAF,EAAAC,KAAA,EAAAD,EAAA6B,GAAA7B,EAAA,SAQAc,KAAAgB,SAAAC,MAAAC,EAAA,EAAAC,EAAA,+BARA,OAWAX,EAAAY,QACApB,KAAAqB,QAAAC,MAAAC,KAAA,iBACAvB,KAAAgB,SAAAQ,QAAAN,EAAA,EAAAC,EAAA,gCAbA,yBAAAjC,EAAAW,SAAAhB,EAAAmB,OAAA,mCAAAK,EAAAN,MAAAC,KAAAC,YAAA,gBCFAwB,EAAgBb,OAAAc,EAAA,EAAAd,CACdV,EHRF,WAA0B,IAAayB,EAAb3B,KAAa4B,eAAkD,OAA/D5B,KAAuC6B,MAAAC,IAAAH,GAAwB,YGWzF,EACA,KACA,KACA,MAIAF,EAAAM,QAAAC,OAAA,cACeC,EAAA,QAAAR","file":"static/js/chunk-16d0.6ce78978.js","sourcesContent":["import localforage from 'localforage'\nimport _ from 'lodash'\n\nconst pleromaFEStateKey = 'vuex-lz'\n\nexport const authenticateWithPleromaFE = async(store) => {\n const pleromaFEState = await localforage.getItem(pleromaFEStateKey)\n const token = _.get(pleromaFEState, 'oauth.userToken')\n\n if (token === undefined) {\n throw new Error('PleromaFE token not found')\n }\n\n await store.dispatch('LoginByPleromaFE', { token })\n}\n","var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div')}\nvar staticRenderFns = []\n\nexport { render, staticRenderFns }","import mod from \"-!../../../node_modules/babel-loader/lib/index.js?cacheDirectory!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./pleroma.vue?vue&type=script&lang=js&\"; export default mod; export * from \"-!../../../node_modules/babel-loader/lib/index.js?cacheDirectory!../../../node_modules/vue-loader/lib/index.js??vue-loader-options!./pleroma.vue?vue&type=script&lang=js&\"","<template>\n <div />\n</template>\n\n<script>\nimport { Loading } from 'element-ui'\nimport { authenticateWithPleromaFE } from '@/services/pleromaAuth'\nimport i18n from '@/lang'\n\nexport default {\n name: 'LoginPleroma',\n async mounted() {\n const loadingInstance = Loading.service({ fullscreen: true })\n\n try {\n await authenticateWithPleromaFE(this.$store)\n } catch (error) {\n this.$message.error(i18n.t('login.pleromaFELoginFailed'))\n }\n\n loadingInstance.close()\n this.$router.push({ path: '/users/index' })\n this.$message.success(i18n.t('login.pleromaFELoginSucceed'))\n }\n}\n</script>\n","import { render, staticRenderFns } from \"./pleroma.vue?vue&type=template&id=e44cae32&\"\nimport script from \"./pleroma.vue?vue&type=script&lang=js&\"\nexport * from \"./pleroma.vue?vue&type=script&lang=js&\"\n\n\n/* normalize component */\nimport normalizer from \"!../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js\"\nvar component = normalizer(\n script,\n render,\n staticRenderFns,\n false,\n null,\n null,\n null\n \n)\n\ncomponent.options.__file = \"pleroma.vue\"\nexport default component.exports"],"sourceRoot":""}

2
priv/static/adminfe/static/js/chunk-176e.5c19378d.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-176e.5c19378d.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-2d97.079e9e64.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-2d97.079e9e64.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-40a4.5dc0e299.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-40a4.5dc0e299.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-5118.7c48ad58.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-5118.7c48ad58.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-565e.e1555105.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-565e.e1555105.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-60a9.22fe45f3.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-60a9.22fe45f3.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-654e.38dd4b85.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-654e.38dd4b85.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-68ea.0dae7e55.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-68ea.0dae7e55.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-6e81.6043af74.js Normal file
View file

@ -0,0 +1,2 @@
(window.webpackJsonp=window.webpackJsonp||[]).push([["chunk-6e81"],{BF41:function(t,a,i){},"UUO+":function(t,a,i){"use strict";i.r(a);var e=i("zGwZ"),s=i.n(e),r={name:"Page401",data:function(){return{errGif:s.a+"?"+ +new Date,ewizardClap:"https://wpimg.wallstcn.com/007ef517-bafd-4066-aae4-6883632d9646",dialogVisible:!1}},methods:{back:function(){this.$route.query.noGoBack?this.$router.push({path:"/dashboard"}):this.$router.go(-1)}}},n=(i("UrVv"),i("KHd+")),l=Object(n.a)(r,function(){var t=this,a=t.$createElement,i=t._self._c||a;return i("div",{staticClass:"errPage-container"},[i("el-button",{staticClass:"pan-back-btn",attrs:{icon:"arrow-left"},on:{click:t.back}},[t._v("返回")]),t._v(" "),i("el-row",[i("el-col",{attrs:{span:12}},[i("h1",{staticClass:"text-jumbo text-ginormous"},[t._v("Oops!")]),t._v("\n gif来源"),i("a",{attrs:{href:"https://zh.airbnb.com/",target:"_blank"}},[t._v("airbnb")]),t._v(" 页面\n "),i("h2",[t._v("你没有权限去该页面")]),t._v(" "),i("h6",[t._v("如有不满请联系你领导")]),t._v(" "),i("ul",{staticClass:"list-unstyled"},[i("li",[t._v("或者你可以去:")]),t._v(" "),i("li",{staticClass:"link-type"},[i("router-link",{attrs:{to:"/dashboard"}},[t._v("回首页")])],1),t._v(" "),i("li",{staticClass:"link-type"},[i("a",{attrs:{href:"https://www.taobao.com/"}},[t._v("随便看看")])]),t._v(" "),i("li",[i("a",{attrs:{href:"#"},on:{click:function(a){a.preventDefault(),t.dialogVisible=!0}}},[t._v("点我看图")])])])]),t._v(" "),i("el-col",{attrs:{span:12}},[i("img",{attrs:{src:t.errGif,width:"313",height:"428",alt:"Girl has dropped her ice cream."}})])],1),t._v(" "),i("el-dialog",{attrs:{visible:t.dialogVisible,title:"随便看"},on:{"update:visible":function(a){t.dialogVisible=a}}},[i("img",{staticClass:"pan-img",attrs:{src:t.ewizardClap}})])],1)},[],!1,null,"ab9be52c",null);l.options.__file="401.vue";a.default=l.exports},UrVv:function(t,a,i){"use strict";var e=i("BF41");i.n(e).a},zGwZ:function(t,a,i){t.exports=i.p+"static/img/401.089007e.gif"}}]);
//# sourceMappingURL=chunk-6e81.6043af74.js.map

1
priv/static/adminfe/static/js/chunk-6e81.6043af74.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-6e8c.2aa335e0.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-6e8c.2aa335e0.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-7503.278e0031.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-7503.278e0031.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-7c6b.1ebeb0e4.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-7c6b.1ebeb0e4.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-97e2.c51fe6b0.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-97e2.c51fe6b0.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-9a72.41e843cd.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-9a72.41e843cd.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-commons.51fe2926.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-commons.51fe2926.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-df62.6c5105a6.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-df62.6c5105a6.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/chunk-elementUI.8e5c404c.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-elementUI.8e5c404c.js.map Normal file
View file

File diff suppressed because one or more lines are too long

73
priv/static/adminfe/static/js/chunk-libs.f842b12e.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/chunk-libs.f842b12e.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/oAJy.840fb1c2.js Normal file
View file

File diff suppressed because one or more lines are too long

1
priv/static/adminfe/static/js/oAJy.840fb1c2.js.map Normal file
View file

File diff suppressed because one or more lines are too long

2
priv/static/adminfe/static/js/runtime.04c4fa2f.js Normal file
View file

@ -0,0 +1,2 @@
!function(e){function n(n){for(var c,r,a=n[0],h=n[1],f=n[2],i=0,l=[];i<a.length;i++)r=a[i],u[r]&&l.push(u[r][0]),u[r]=0;for(c in h)Object.prototype.hasOwnProperty.call(h,c)&&(e[c]=h[c]);for(d&&d(n);l.length;)l.shift()();return o.push.apply(o,f||[]),t()}function t(){for(var e,n=0;n<o.length;n++){for(var t=o[n],c=!0,r=1;r<t.length;r++){var h=t[r];0!==u[h]&&(c=!1)}c&&(o.splice(n--,1),e=a(a.s=t[0]))}return e}var c={},r={runtime:0},u={runtime:0},o=[];function a(n){if(c[n])return c[n].exports;var t=c[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=[];r[e]?n.push(r[e]):0!==r[e]&&{"chunk-68ea":1,"chunk-6e81":1,"chunk-commons":1,"chunk-2d97":1,"chunk-0171":1,"chunk-565e":1,"chunk-60a9":1,"chunk-7c6b":1,"chunk-97e2":1,"chunk-176e":1,"chunk-40a4":1,"chunk-654e":1,"chunk-6e8c":1,"chunk-7503":1,"chunk-9a72":1}[e]&&n.push(r[e]=new Promise(function(n,t){for(var c=({"chunk-commons":"chunk-commons"}[e]||e)+"."+{"7zzA":"31d6cfe0",JEtC:"31d6cfe0","chunk-68ea":"7633295f","chunk-6e81":"0e9e6d27","chunk-commons":"a343b725","chunk-2d97":"82cbb623","chunk-0171":"aa11eafe","chunk-5118":"31d6cfe0","chunk-565e":"8c036a6e","chunk-60a9":"7b5b9559","chunk-7c6b":"b529c720","chunk-97e2":"9f9fab0f","chunk-df62":"31d6cfe0","chunk-176e":"b7aa5351","chunk-40a4":"665332db","chunk-654e":"b2e16b59","chunk-6e8c":"ef26acfd","chunk-7503":"cc089ee4",oAJy:"31d6cfe0","chunk-16d0":"31d6cfe0","chunk-9a72":"786caeb3"}[e]+".css",r=a.p+c,u=document.getElementsByTagName("link"),o=0;o<u.length;o++){var h=(i=u[o]).getAttribute("data-href")||i.getAttribute("href");if("stylesheet"===i.rel&&(h===c||h===r))return n()}var f=document.getElementsByTagName("style");for(o=0;o<f.length;o++){var i;if((h=(i=f[o]).getAttribute("data-href"))===c||h===r)return n()}var d=document.createElement("link");d.rel="stylesheet",d.type="text/css",d.onload=n,d.onerror=function(n){var c=n&&n.target&&n.target.src||r,u=new Error("Loading CSS chunk "+e+" failed.\n("+c+")");u.request=c,t(u)},d.href=r,document.getElementsByTagName("head")[0].appendChild(d)}).then(function(){r[e]=0}));var t=u[e];if(0!==t)if(t)n.push(t[2]);else{var c=new Promise(function(n,c){t=u[e]=[n,c]});n.push(t[2]=c);var o,h=document.createElement("script");h.charset="utf-8",h.timeout=120,a.nc&&h.setAttribute("nonce",a.nc),h.src=function(e){return a.p+"static/js/"+({"chunk-commons":"chunk-commons"}[e]||e)+"."+{"7zzA":"e1ae1c94",JEtC:"f9ba4594","chunk-68ea":"0dae7e55","chunk-6e81":"6043af74","chunk-commons":"51fe2926","chunk-2d97":"079e9e64","chunk-0171":"9e927b8a","chunk-5118":"7c48ad58","chunk-565e":"e1555105","chunk-60a9":"22fe45f3","chunk-7c6b":"1ebeb0e4","chunk-97e2":"c51fe6b0","chunk-df62":"6c5105a6","chunk-176e":"5c19378d","chunk-40a4":"5dc0e299","chunk-654e":"38dd4b85","chunk-6e8c":"2aa335e0","chunk-7503":"278e0031",oAJy:"840fb1c2","chunk-16d0":"6ce78978","chunk-9a72":"41e843cd"}[e]+".js"}(e),o=function(n){h.onerror=h.onload=null,clearTimeout(f);var t=u[e];if(0!==t){if(t){var c=n&&("load"===n.type?"missing":n.type),r=n&&n.target&&n.target.src,o=new Error("Loading chunk "+e+" failed.\n("+c+": "+r+")");o.type=c,o.request=r,t[1](o)}u[e]=void 0}};var f=setTimeout(function(){o({type:"timeout",target:h})},12e4);h.onerror=h.onload=o,document.head.appendChild(h)}return Promise.all(n)},a.m=e,a.c=c,a.d=function(e,n,t){a.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,n){if(1&n&&(e=a(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var c in e)a.d(t,c,function(n){return e[n]}.bind(null,c));return t},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="",a.oe=function(e){throw console.error(e),e};var h=window.webpackJsonp=window.webpackJsonp||[],f=h.push.bind(h);h.push=n,h=h.slice();for(var i=0;i<h.length;i++)n(h[i]);var d=f;t()}([]);
//# sourceMappingURL=runtime.04c4fa2f.js.map

1
priv/static/adminfe/static/js/runtime.04c4fa2f.js.map Normal file
View file

File diff suppressed because one or more lines are too long

15
test/web/pleroma_api/controllers/chat_controller_test.exs
View file

@ -267,6 +267,21 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
describe "GET /api/v1/pleroma/chats" do
setup do: oauth_access(["read:chats"])
test "it does not return chats with deleted users", %{conn: conn, user: user} do
recipient = insert(:user)
{:ok, _} = Chat.get_or_create(user.id, recipient.ap_id)
Pleroma.Repo.delete(recipient)
User.invalidate_cache(recipient)
result =
conn
|> get("/api/v1/pleroma/chats")
|> json_response_and_validate_schema(200)
assert length(result) == 0
end
test "it does not return chats with users you blocked", %{conn: conn, user: user} do
recipient = insert(:user)