Merge pull request #6611 from pixelfed/staging

Update profile view
pull/6617/head
dansup 1 month ago committed by GitHub
commit f5a3301213
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +1 @@
(()=>{"use strict";var e,r,o,a={},t={};function c(e){var r=t[e];if(void 0!==r)return r.exports;var o=t[e]={id:e,loaded:!1,exports:{}};return a[e].call(o.exports,o,o.exports,c),o.loaded=!0,o.exports}c.m=a,e=[],c.O=(r,o,a,t)=>{if(!o){var n=1/0;for(f=0;f<e.length;f++){for(var[o,a,t]=e[f],d=!0,s=0;s<o.length;s++)(!1&t||n>=t)&&Object.keys(c.O).every(e=>c.O[e](o[s]))?o.splice(s--,1):(d=!1,t<n&&(n=t));if(d){e.splice(f--,1);var i=a();void 0!==i&&(r=i)}}return r}t=t||0;for(var f=e.length;f>0&&e[f-1][2]>t;f--)e[f]=e[f-1];e[f]=[o,a,t]},c.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return c.d(r,{a:r}),r},c.d=(e,r)=>{for(var o in r)c.o(r,o)&&!c.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:r[o]})},c.f={},c.e=e=>Promise.all(Object.keys(c.f).reduce((r,o)=>(c.f[o](e,r),r),[])),c.u=e=>"js/"+{529:"groups-page",1179:"daci.chunk",1240:"discover~myhashtags.chunk",1645:"profile~following.bundle",2156:"dms.chunk",2822:"group.create",2966:"discover~hashtag.bundle",3688:"discover~serverfeed.chunk",4951:"home.chunk",6250:"discover~settings.chunk",6438:"groups-page-media",6535:"discover.chunk",6740:"discover~memories.chunk",6791:"groups-page-members",7206:"groups-page-topics",7342:"groups-post",7399:"dms~message.chunk",7413:"error404.bundle",7521:"discover~findfriends.chunk",7744:"notifications.chunk",8087:"profile.chunk",8119:"i18n.bundle",8257:"groups-page-about",8408:"post.chunk",8977:"profile~followers.bundle",9124:"compose.chunk",9231:"groups-profile",9919:"changelog.bundle"}[e]+"."+{529:"2826b7d8bc08bf22",1179:"0fd66cf96e4fa175",1240:"cae15457c8907416",1645:"107cdd43840f4562",2156:"13a1bf15db918fb7",2822:"82affc4a7b5983b0",2966:"43d7fefd51744728",3688:"ced983100740f1fe",4951:"142939ee5ce02369",6250:"9ac2e2ccc42789f0",6438:"f3be2d8b0ca59cdf",6535:"0a3c5b36cedbad42",6740:"8d5803f4aca07036",6791:"a2d12bc765ad0f38",7206:"7bee36f3edc0de92",7342:"aca9f85bd8b36f70",7399:"51e1ba0ec445bf6f",7413:"c408e3fce0f80bcb",7521:"7a6cba5dc32056d0",7744:"d2559e00a1a30220",8087:"d64797605edc59d2",8119:"9ffc0aacc1ff49e5",8257:"dfb2744b2a28d4c5",8408:"fa6bc73759e67372",8977:"7ad5ad69f3e9fb0f",9124:"2c9141ff4969e238",9231:"924132e02f73d082",9919:"f97c6c2fdd203b90"}[e]+".js",c.miniCssF=e=>({2305:"css/portfolio",2540:"css/landing",3364:"css/admin",4370:"css/profile",6952:"css/appdark",8252:"css/app",8759:"css/spa"}[e]+".css"),c.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),c.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},o="pixelfed:",c.l=(e,a,t,n)=>{if(r[e])r[e].push(a);else{var d,s;if(void 0!==t)for(var i=document.getElementsByTagName("script"),f=0;f<i.length;f++){var l=i[f];if(l.getAttribute("src")==e||l.getAttribute("data-webpack")==o+t){d=l;break}}d||(s=!0,(d=document.createElement("script")).charset="utf-8",c.nc&&d.setAttribute("nonce",c.nc),d.setAttribute("data-webpack",o+t),d.src=e),r[e]=[a];var u=(o,a)=>{d.onerror=d.onload=null,clearTimeout(p);var t=r[e];if(delete r[e],d.parentNode&&d.parentNode.removeChild(d),t&&t.forEach(e=>e(a)),o)return o(a)},p=setTimeout(u.bind(null,void 0,{type:"timeout",target:d}),12e4);d.onerror=u.bind(null,d.onerror),d.onload=u.bind(null,d.onload),s&&document.head.appendChild(d)}},c.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},c.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),c.p="/",(()=>{var e={461:0,6952:0,8252:0,2305:0,3364:0,2540:0,4370:0,8759:0};c.f.j=(r,o)=>{var a=c.o(e,r)?e[r]:void 0;if(0!==a)if(a)o.push(a[2]);else if(/^((69|82)52|2305|2540|3364|4370|461|8759)$/.test(r))e[r]=0;else{var t=new Promise((o,t)=>a=e[r]=[o,t]);o.push(a[2]=t);var n=c.p+c.u(r),d=new Error;c.l(n,o=>{if(c.o(e,r)&&(0!==(a=e[r])&&(e[r]=void 0),a)){var t=o&&("load"===o.type?"missing":o.type),n=o&&o.target&&o.target.src;d.message="Loading chunk "+r+" failed.\n("+t+": "+n+")",d.name="ChunkLoadError",d.type=t,d.request=n,a[1](d)}},"chunk-"+r,r)}},c.O.j=r=>0===e[r];var r=(r,o)=>{var a,t,[n,d,s]=o,i=0;if(n.some(r=>0!==e[r])){for(a in d)c.o(d,a)&&(c.m[a]=d[a]);if(s)var f=s(c)}for(r&&r(o);i<n.length;i++)t=n[i],c.o(e,t)&&e[t]&&e[t][0](),e[t]=0;return c.O(f)},o=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];o.forEach(r.bind(null,0)),o.push=r.bind(null,o.push.bind(o))})(),c.nc=void 0})();
(()=>{"use strict";var e,r,o,a={},t={};function n(e){var r=t[e];if(void 0!==r)return r.exports;var o=t[e]={id:e,loaded:!1,exports:{}};return a[e].call(o.exports,o,o.exports,n),o.loaded=!0,o.exports}n.m=a,e=[],n.O=(r,o,a,t)=>{if(!o){var c=1/0;for(f=0;f<e.length;f++){for(var[o,a,t]=e[f],d=!0,s=0;s<o.length;s++)(!1&t||c>=t)&&Object.keys(n.O).every(e=>n.O[e](o[s]))?o.splice(s--,1):(d=!1,t<c&&(c=t));if(d){e.splice(f--,1);var i=a();void 0!==i&&(r=i)}}return r}t=t||0;for(var f=e.length;f>0&&e[f-1][2]>t;f--)e[f]=e[f-1];e[f]=[o,a,t]},n.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return n.d(r,{a:r}),r},n.d=(e,r)=>{for(var o in r)n.o(r,o)&&!n.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:r[o]})},n.f={},n.e=e=>Promise.all(Object.keys(n.f).reduce((r,o)=>(n.f[o](e,r),r),[])),n.u=e=>"js/"+{529:"groups-page",1179:"daci.chunk",1240:"discover~myhashtags.chunk",1645:"profile~following.bundle",2156:"dms.chunk",2822:"group.create",2966:"discover~hashtag.bundle",3688:"discover~serverfeed.chunk",4951:"home.chunk",6250:"discover~settings.chunk",6438:"groups-page-media",6535:"discover.chunk",6740:"discover~memories.chunk",6791:"groups-page-members",7206:"groups-page-topics",7342:"groups-post",7399:"dms~message.chunk",7413:"error404.bundle",7521:"discover~findfriends.chunk",7744:"notifications.chunk",8087:"profile.chunk",8119:"i18n.bundle",8257:"groups-page-about",8408:"post.chunk",8977:"profile~followers.bundle",9124:"compose.chunk",9231:"groups-profile",9919:"changelog.bundle"}[e]+"."+{529:"2826b7d8bc08bf22",1179:"4e7adc83fb3e6c26",1240:"b1170e28d46614b1",1645:"30a324bbbe437db7",2156:"13a1bf15db918fb7",2822:"82affc4a7b5983b0",2966:"43d7fefd51744728",3688:"b46e1b4180b850db",4951:"478a11db7f8bcc5b",6250:"a99d878b83352bea",6438:"f3be2d8b0ca59cdf",6535:"0a3c5b36cedbad42",6740:"3da68f4ee0598a4c",6791:"a2d12bc765ad0f38",7206:"7bee36f3edc0de92",7342:"aca9f85bd8b36f70",7399:"ca55c5d89171edc4",7413:"c408e3fce0f80bcb",7521:"271194c07b172af4",7744:"d2559e00a1a30220",8087:"8baf0f1c83f8793e",8119:"9ffc0aacc1ff49e5",8257:"dfb2744b2a28d4c5",8408:"d974a3aee1468f5f",8977:"8381cac06885ce77",9124:"2c9141ff4969e238",9231:"924132e02f73d082",9919:"f97c6c2fdd203b90"}[e]+".js",n.miniCssF=e=>({2305:"css/portfolio",2540:"css/landing",3364:"css/admin",4370:"css/profile",6952:"css/appdark",8252:"css/app",8759:"css/spa"}[e]+".css"),n.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),n.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},o="pixelfed:",n.l=(e,a,t,c)=>{if(r[e])r[e].push(a);else{var d,s;if(void 0!==t)for(var i=document.getElementsByTagName("script"),f=0;f<i.length;f++){var l=i[f];if(l.getAttribute("src")==e||l.getAttribute("data-webpack")==o+t){d=l;break}}d||(s=!0,(d=document.createElement("script")).charset="utf-8",n.nc&&d.setAttribute("nonce",n.nc),d.setAttribute("data-webpack",o+t),d.src=e),r[e]=[a];var u=(o,a)=>{d.onerror=d.onload=null,clearTimeout(b);var t=r[e];if(delete r[e],d.parentNode&&d.parentNode.removeChild(d),t&&t.forEach(e=>e(a)),o)return o(a)},b=setTimeout(u.bind(null,void 0,{type:"timeout",target:d}),12e4);d.onerror=u.bind(null,d.onerror),d.onload=u.bind(null,d.onload),s&&document.head.appendChild(d)}},n.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),n.p="/",(()=>{var e={461:0,6952:0,8252:0,2305:0,3364:0,2540:0,4370:0,8759:0};n.f.j=(r,o)=>{var a=n.o(e,r)?e[r]:void 0;if(0!==a)if(a)o.push(a[2]);else if(/^((69|82)52|2305|2540|3364|4370|461|8759)$/.test(r))e[r]=0;else{var t=new Promise((o,t)=>a=e[r]=[o,t]);o.push(a[2]=t);var c=n.p+n.u(r),d=new Error;n.l(c,o=>{if(n.o(e,r)&&(0!==(a=e[r])&&(e[r]=void 0),a)){var t=o&&("load"===o.type?"missing":o.type),c=o&&o.target&&o.target.src;d.message="Loading chunk "+r+" failed.\n("+t+": "+c+")",d.name="ChunkLoadError",d.type=t,d.request=c,a[1](d)}},"chunk-"+r,r)}},n.O.j=r=>0===e[r];var r=(r,o)=>{var a,t,[c,d,s]=o,i=0;if(c.some(r=>0!==e[r])){for(a in d)n.o(d,a)&&(n.m[a]=d[a]);if(s)var f=s(n)}for(r&&r(o);i<c.length;i++)t=c[i],n.o(e,t)&&e[t]&&e[t][0](),e[t]=0;return n.O(f)},o=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];o.forEach(r.bind(null,0)),o.push=r.bind(null,o.push.bind(o))})(),n.nc=void 0})();

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -3,7 +3,7 @@
"/js/activity.js": "/js/activity.js?id=5ff0d41f0c063205e2fd27b7d3a89d40",
"/js/components.js": "/js/components.js?id=6e1d1eba5b3a8d160ccd2b7203f29deb",
"/js/discover.js": "/js/discover.js?id=952469fb673a19bf07f5640d8c31d6a8",
"/js/profile.js": "/js/profile.js?id=12d18f0e260e2cf4558f3867ef541f72",
"/js/profile.js": "/js/profile.js?id=8ad0a774ba01055efb261843c462328e",
"/js/status.js": "/js/status.js?id=1e860329ca7143f91a6c5fb807ac9744",
"/js/timeline.js": "/js/timeline.js?id=d9407d6ced550261b583f0bba2c2676e",
"/js/compose.js": "/js/compose.js?id=026f9f5ad4c97335697df06eb89458fc",
@ -29,23 +29,23 @@
"/js/group-topic-feed.js": "/js/group-topic-feed.js?id=027fb6d2ccd43c34cbae36d7e8646f08",
"/js/custom_filters.js": "/js/custom_filters.js?id=f633fb6090aa4906678dc37b41f9f62d",
"/js/settings.js": "/js/settings.js?id=05d89311feefa503f2fa2272d1432b37",
"/js/manifest.js": "/js/manifest.js?id=177dacf039945f9ff777d8d0ba606759",
"/js/home.chunk.142939ee5ce02369.js": "/js/home.chunk.142939ee5ce02369.js?id=0daf66d7b809f3100033409eabb7fc25",
"/js/manifest.js": "/js/manifest.js?id=e7ae117b4426891dca99c97bf3639465",
"/js/home.chunk.478a11db7f8bcc5b.js": "/js/home.chunk.478a11db7f8bcc5b.js?id=68c89b7d50d55f19244c8a109f981296",
"/js/compose.chunk.2c9141ff4969e238.js": "/js/compose.chunk.2c9141ff4969e238.js?id=f7e545b714de63d674b717508145fdf7",
"/js/post.chunk.fa6bc73759e67372.js": "/js/post.chunk.fa6bc73759e67372.js?id=87f8d07f557d292062f79b1ae7c57e04",
"/js/profile.chunk.d64797605edc59d2.js": "/js/profile.chunk.d64797605edc59d2.js?id=1e7e8aff0d8b95c989591c7837ede3e8",
"/js/discover~memories.chunk.8d5803f4aca07036.js": "/js/discover~memories.chunk.8d5803f4aca07036.js?id=471e78558e6c5c59952d9617dc8d7699",
"/js/discover~myhashtags.chunk.cae15457c8907416.js": "/js/discover~myhashtags.chunk.cae15457c8907416.js?id=3f0ab88770f718e8ba2bcd9a81d04849",
"/js/daci.chunk.0fd66cf96e4fa175.js": "/js/daci.chunk.0fd66cf96e4fa175.js?id=1bb5931775db6f8f20e76265b5a17b77",
"/js/discover~findfriends.chunk.7a6cba5dc32056d0.js": "/js/discover~findfriends.chunk.7a6cba5dc32056d0.js?id=6f3b789d9643ab4e01be66ca2037af3e",
"/js/discover~serverfeed.chunk.ced983100740f1fe.js": "/js/discover~serverfeed.chunk.ced983100740f1fe.js?id=301cdc033fbdedb6e46d325fcbb8fe9d",
"/js/discover~settings.chunk.9ac2e2ccc42789f0.js": "/js/discover~settings.chunk.9ac2e2ccc42789f0.js?id=73f836a8c2df7b610de944f9a1ef6493",
"/js/post.chunk.d974a3aee1468f5f.js": "/js/post.chunk.d974a3aee1468f5f.js?id=e4bf5fd215a4069d4c408851b718433f",
"/js/profile.chunk.8baf0f1c83f8793e.js": "/js/profile.chunk.8baf0f1c83f8793e.js?id=f892b962c4b784adff760db16c12d9d9",
"/js/discover~memories.chunk.3da68f4ee0598a4c.js": "/js/discover~memories.chunk.3da68f4ee0598a4c.js?id=0186c30f1919e36a687293027a0aa8fd",
"/js/discover~myhashtags.chunk.b1170e28d46614b1.js": "/js/discover~myhashtags.chunk.b1170e28d46614b1.js?id=a5ad22dc16ddd2e918e8a52c8f9fce42",
"/js/daci.chunk.4e7adc83fb3e6c26.js": "/js/daci.chunk.4e7adc83fb3e6c26.js?id=b6791b9aac801ee7b327542f78f9fdd4",
"/js/discover~findfriends.chunk.271194c07b172af4.js": "/js/discover~findfriends.chunk.271194c07b172af4.js?id=1520c7e1af95783069b757f831ea2112",
"/js/discover~serverfeed.chunk.b46e1b4180b850db.js": "/js/discover~serverfeed.chunk.b46e1b4180b850db.js?id=2a707d289bfe5b6ac1813261f6f1ee2e",
"/js/discover~settings.chunk.a99d878b83352bea.js": "/js/discover~settings.chunk.a99d878b83352bea.js?id=f7f31775ce44c320881d12b9b7957309",
"/js/discover.chunk.0a3c5b36cedbad42.js": "/js/discover.chunk.0a3c5b36cedbad42.js?id=6c31483e022bef32ff56e52437739e4a",
"/js/notifications.chunk.d2559e00a1a30220.js": "/js/notifications.chunk.d2559e00a1a30220.js?id=c092e381a8385636bd0f91146c6c9774",
"/js/dms.chunk.13a1bf15db918fb7.js": "/js/dms.chunk.13a1bf15db918fb7.js?id=eaf6ffcb3e784cc7d16c4bbeadcd4d64",
"/js/dms~message.chunk.51e1ba0ec445bf6f.js": "/js/dms~message.chunk.51e1ba0ec445bf6f.js?id=de8515e5ae537d09d344f47b21ea0014",
"/js/profile~followers.bundle.7ad5ad69f3e9fb0f.js": "/js/profile~followers.bundle.7ad5ad69f3e9fb0f.js?id=4ea5c00db8e58079d5d4b7803432dacb",
"/js/profile~following.bundle.107cdd43840f4562.js": "/js/profile~following.bundle.107cdd43840f4562.js?id=8f733ca92071a454d1faab0a7c32e241",
"/js/dms~message.chunk.ca55c5d89171edc4.js": "/js/dms~message.chunk.ca55c5d89171edc4.js?id=3353b5344d9542fa0b1b67ec1253cc7a",
"/js/profile~followers.bundle.8381cac06885ce77.js": "/js/profile~followers.bundle.8381cac06885ce77.js?id=e5c9cfb367fe6a7697fd7f50ebd74f13",
"/js/profile~following.bundle.30a324bbbe437db7.js": "/js/profile~following.bundle.30a324bbbe437db7.js?id=fe94503194686408600e8750b32b08de",
"/js/discover~hashtag.bundle.43d7fefd51744728.js": "/js/discover~hashtag.bundle.43d7fefd51744728.js?id=ce2499cbb2f6f0a6d9a58ea761b6c7bd",
"/js/error404.bundle.c408e3fce0f80bcb.js": "/js/error404.bundle.c408e3fce0f80bcb.js?id=c416458981590b2ebe9fb35f5d3d1a6f",
"/js/i18n.bundle.9ffc0aacc1ff49e5.js": "/js/i18n.bundle.9ffc0aacc1ff49e5.js?id=447bbc12a507350e6aef265c54fbdab3",
@ -61,7 +61,7 @@
"/css/appdark.css": "/css/appdark.css?id=0618e5097047d418a15a992378815378",
"/css/app.css": "/css/app.css?id=269aa731b2120cc1193ad1f9f64e2748",
"/css/portfolio.css": "/css/portfolio.css?id=d98e354f173c6a8b729626384dceaa90",
"/css/admin.css": "/css/admin.css?id=20cdb9cce61b0e1bd9fb1aad30efcd2f",
"/css/admin.css": "/css/admin.css?id=9663788279cc70b5e303d22f0f8e8ce3",
"/css/landing.css": "/css/landing.css?id=fb78389492f56a927d3d9bbb3ebd8204",
"/css/profile.css": "/css/profile.css?id=ae4f5db9bb1a89db2ae293d6bde812e3",
"/css/spa.css": "/css/spa.css?id=041aed9a146db0e74b2cfe3ad8eaf96c",

@ -137,8 +137,14 @@
<div class="font-weight-bold mr-1">{{profile.display_name}}</div>
<div v-if="profile.pronouns" class="text-muted small">{{profile.pronouns.join('/')}}</div>
</div>
<p v-if="profile.note" class="mb-0" v-html="profile.note"></p>
<p v-if="profile.website"><a :href="profile.website" class="profile-website small" rel="me external nofollow noopener" target="_blank">{{formatWebsite(profile.website)}}</a></p>
<div v-if="profile.note">
<p v-if="user || profile.followers_count > 100" class="mb-0" v-html="profile.note"></p>
<p v-else ></p>
</div>
<p v-if="profile.website">
<a v-if="user || profile.followers_count > 100" :href="profile.website" class="profile-website small" rel="me external nofollow noopener" target="_blank">{{formatWebsite(profile.website)}}</a>
<span class="profile-website small"></span>
</p>
<p class="d-flex small text-muted align-items-center">
<span v-if="profile.is_admin" class="btn btn-outline-danger btn-sm py-0 mr-3" title="Admin Account" data-toggle="tooltip">
{{ $t("profile.admin") }}

@ -6,7 +6,7 @@
@php
$acct = $profile->username . '@' . config('pixelfed.domain.app');
$metaDescription = \App\Services\AccountService::getMetaDescription($profile->id);
$metaDescription = $profile->followers_count > 100 ? \App\Services\AccountService::getMetaDescription($profile->id) : '';
@endphp
@section('content')
@ -26,20 +26,20 @@ $metaDescription = \App\Services\AccountService::getMetaDescription($profile->id
@endsection
@push('meta')<meta name="description" content="{{$metaDescription}}">
@push('meta')@if($profile->followers_count > 100)<meta name="description" content="{{$metaDescription}}">
<meta property="og:description" content="{{$metaDescription}}">
<meta property="og:image" content="{{$profile->avatarUrl()}}">
<meta property="og:image:width" content="200">
<meta property="og:image:height" content="200">
<meta property="og:image:height" content="200">@endif
<meta property="twitter:card" content="summary">
<meta property="profile:username" content="{{$acct}}">
<link href="{{$profile->permalink('.atom')}}" rel="alternate" title="{{$profile->username}} on Pixelfed" type="application/atom+xml">
<link href="{{$profile->permalink()}}" rel="alternate" type="application/activity+json">
<meta name="application-name" content="Pixelfed">
<meta name="generator" content="pixelfed">
@if($profile->website)<link href="{{$profile->website}}" rel="me" type="text/html">
@if($profile->website && $profile->followers_count > 100)<link href="{{$profile->website}}" rel="me" type="text/html">
@endif
@if(false == $settings['crawlable'] || $profile->remote_url)<meta name="robots" content="noindex, nofollow">@endif
@if(false == $settings['crawlable'] || $profile->remote_url || $profile->followers_count < 100)<meta name="robots" content="noindex, nofollow">@endif
@endpush
@push('scripts')<script type="text/javascript" src="{{ mix('js/profile.js') }}"></script>

Loading…
Cancel
Save