ghost 6.21.0 → 6.21.2

package/core/built/admin/assets/{web-Bvvtl44p.js → web-BNs01IAt.js}

@@ -1 +1 @@
-import{j as t,aW as be,aV as xe,bK as Se,bL as je,B as oe,bM as _e,bN as Ce,bO as Ne,bP as ve,ck as Le,ao as ye,an as Te,aY as Fe,r as l,cl as Ee,aX as Z,aO as Oe,ak as ne,al as $,cm as ke,bS as De,aT as Me,u as Ie,aZ as Ae,aU as Pe}from"./index-CX1A5TwO.js";import{S as we,a as Ue,b as Ve,c as Re,d as Be,e as ze,f as Ke}from"./select-CeD8IhXy.js";import{u as W,S as ie,a as re,A as J,b as z,c as X,U as le}from"./post-analytics-context-D8nk51yA.js";import{C as $e,F as Ge}from"./loader-circle-CcLEGvsN.js";import{g as We,a as He,S as Qe,b as Ye}from"./kpis-vcbQvnLh.js";import{F as Xe,c as H,e as ce}from"./en-DPpVO1wK.js";import{C as ue,a as qe,b as Ze,h as Je,c as de,i as et,u as K,j as ee}from"./pagemenu-DK1tbdsq.js";import{D as tt,h as st,i as te,a as at,b as ot,c as nt,d as it,e as rt,f as lt,g as ct}from"./data-list--5Xfh5gm.js";import{a as ut}from"./wallet-cards-BlDtHc6_.js";import{P as dt,a as mt}from"./post-analytics-header-qh1LEasb.js";import{F as pt,c as ht}from"./filters-BYYV0fmK.js";import{b as gt,c as ft,F as bt,S as xt,T as St}from"./lucide-react-DHFgHS1l.js";import{U as jt}from"./user-plus-CKQ-d0d4.js";import{M as _t}from"./ticket-BnxPoED1.js";import{F as Ct}from"./message-square-text-BkERj4f5.js";import{E as Nt}from"./empty-indicator-C1cLHSRX.js";import"./posts-mIxckqHa.js";import"./source-icon-opy8g_Nk.js";import"./source-utils-B1S3ZHA2.js";import"./gh-chart-BYWaeEuY.js";import"./chart-BDdnkPgC.js";import"./_baseAssignValue-Dw5pcaUJ.js";import"./tabs-hfT89L_O.js";import"./index-BX0_v5NB.js";import"./post-share-modal-CvTf3PP9.js";import"./get-site-timezone-BDBAcjmq.js";import"./post-helpers-gInwAwEv.js";import"./trash-D6TuYuIs.js";import"./sprout-BKOFkdV8.js";import"./a-large-small-Cf_hUupE.js";import"./list-filter-BwnQ0Xlp.js";import"./at-sign-DyMz5le1.js";import"./copy-BdseBMKx.js";import"./hash-tZATAzZa.js";import"./inbox-B-LuWyHY.js";import"./minus-C6oMPJo2.js";import"./tags-C3b5AHTm.js";import"./square-BjZk7vJx.js";import"./user-round-check-BWc7Da4S.js";import"./repeat-Idtsb62O.js";import"./reply-DXS-C-Rk.js";const se=()=>{const{range:e,setRange:s}=W();return t.jsxs(we,{value:`${e}`,onValueChange:a=>{s(Number(a))},children:[t.jsxs(Ue,{className:"w-auto",children:[t.jsx($e,{className:"mr-2",size:16,strokeWidth:1.5}),t.jsx(Ve,{placeholder:"Select a period"})]}),t.jsx(Re,{align:"end",children:t.jsxs(Be,{children:[t.jsx(ze,{children:"Period"}),Object.values(ie).map(a=>t.jsx(Ke,{value:`${a.value}`,children:a.name},a.value))]})})]})};H.registerLocale(ce);const vt=e=>re[e]||H.getName(e,"en")||"Unknown",Lt=e=>{const s={"UNITED STATES":"US","UNITED STATES OF AMERICA":"US",USA:"US","UNITED KINGDOM":"GB",UK:"GB","GREAT BRITAIN":"GB",NETHERLANDS:"NL"},a=e.toUpperCase();return s[a]||(e.length>2?e.substring(0,2):e)},ae=({tableHeader:e,data:s,onLocationClick:a})=>t.jsxs(tt,{children:[e&&t.jsxs(st,{children:[t.jsx(te,{children:"Country"}),t.jsx(te,{children:"Visitors"})]}),t.jsx(at,{children:s.map(i=>{const o=vt(`${i.location}`),r=a&&i.location!=="Unknown",c=i.location?i.location.toLowerCase():"unknown";return t.jsxs(ot,{className:r?"cursor-pointer":"","data-testid":`location-row-${c}`,onClick:r?()=>a(i.location):void 0,children:[t.jsx(nt,{style:{width:`${i.percentage?Math.round(i.percentage*100):0}%`}}),t.jsx(it,{className:"group-hover/data:max-w-[calc(100%-140px)]",children:t.jsxs("div",{className:"flex items-center space-x-3 overflow-hidden",title:o,children:[t.jsx(Xe,{countryCode:`${Lt(i.location)}`,fallback:t.jsx("span",{className:"flex h-[14px] w-[22px] items-center justify-center rounded-[2px] bg-black text-white",children:t.jsx(Le.SkullAndBones,{className:"size-3"})})}),t.jsx("div",{className:"truncate font-medium",children:o})]})}),t.jsxs(rt,{children:[t.jsx(lt,{children:ye(Number(i.visits))}),t.jsx(ct,{children:Te(i.percentage)})]})]},i.location||"unknown")})})]}),yt=({data:e,isLoading:s,onLocationClick:a})=>{const i=e.slice(0,10);return t.jsx(t.Fragment,{children:s?"":t.jsx(t.Fragment,{children:e&&e.length>0&&t.jsxs(ue,{className:"group/datalist","data-testid":"locations-card",children:[t.jsxs("div",{className:"flex items-center justify-between p-6",children:[t.jsxs(qe,{className:"p-0",children:[t.jsx(Ze,{children:"Locations"}),t.jsx(Je,{children:"Where are the readers of this post"})]}),t.jsx(be,{className:"mr-2",children:"Visitors"})]}),t.jsxs(de,{className:"overflow-hidden",children:[t.jsx(xe,{}),t.jsx(ae,{data:i,tableHeader:!1,onLocationClick:a})]}),e.length>10&&t.jsx(et,{children:t.jsxs(Se,{children:[t.jsx(je,{asChild:!0,children:t.jsxs(oe,{variant:"outline",children:["View all ",t.jsx(ut,{})]})}),t.jsxs(_e,{className:"overflow-y-auto pt-0 sm:max-w-[600px]",children:[t.jsxs(Ce,{className:"sticky top-0 z-40 -mx-6 bg-background/60 p-6 backdrop-blur",children:[t.jsx(Ne,{children:"Top locations"}),t.jsx(ve,{children:"Where are the readers of this post"})]}),t.jsx("div",{className:"group/datalist",children:t.jsx(ae,{data:e,tableHeader:!0,onLocationClick:a})})]})]})})]})})})},me=e=>!e||e.length===0?J:z.filter(s=>e.includes(s.value)).reduce((s,a)=>s|a.bit,0)||J,pe=e=>{const s=[];return(e&X.PUBLIC)!==0&&s.push(z[0].value),(e&X.FREE)!==0&&s.push(z[1].value),(e&X.PAID)!==0&&s.push(z[2].value),s.join(",")};H.registerLocale(ce);const Tt=e=>re[e]||H.getName(e,"en")||e,Ft=({visits:e})=>t.jsx("span",{className:"order-2 font-mono text-xs text-muted-foreground",children:e.toLocaleString()}),Et={utm_source:{endpoint:"api_top_utm_sources",valueKey:"utm_source",transformValue:e=>({value:e||"(not set)",label:e||"(not set)"})},utm_medium:{endpoint:"api_top_utm_mediums",valueKey:"utm_medium",transformValue:e=>({value:e||"(not set)",label:e||"(not set)"})},utm_campaign:{endpoint:"api_top_utm_campaigns",valueKey:"utm_campaign",transformValue:e=>({value:e||"(not set)",label:e||"(not set)"})},utm_content:{endpoint:"api_top_utm_contents",valueKey:"utm_content",transformValue:e=>({value:e||"(not set)",label:e||"(not set)"})},utm_term:{endpoint:"api_top_utm_terms",valueKey:"utm_term",transformValue:e=>({value:e||"(not set)",label:e||"(not set)"})},source:{endpoint:"api_top_sources",valueKey:"source",transformValue:e=>({value:e||"",label:e||"Direct"})},location:{endpoint:"api_top_locations",valueKey:"location",filterItem(e){const s=String(e.location||"");return s!==""&&!le.includes(s)},transformValue:e=>({value:e,label:Tt(e)})},device:{endpoint:"api_top_devices",valueKey:"device",transformValue:e=>({value:e,label:e==="mobile-ios"?"iOS":e==="mobile-android"?"Android":e==="desktop"?"Desktop":e==="bot"?"Bot":e})}},Ot=(e,s,a)=>{const i={...a};return e.forEach(o=>{if(o.field===s||o.values.length===0)return;const r=o.values[0];o.field!=="audience"&&(o.field==="source"||o.field==="device"||o.field==="location"||o.field.startsWith("utm_"))&&(i[o.field]=r)}),i},O=(e,s=[],a,i={})=>{const{enabled:o=!0}=i,{statsConfig:r,range:c}=W(),{startDate:b,endDate:m,timezone:x}=ne(c),p=Et[e],d=l.useMemo(()=>{const j=s.find(h=>h.field==="audience");return me(j?.values)},[s]),S=l.useMemo(()=>{const j={site_uuid:r?.id||"",date_from:$(b),date_to:$(m),timezone:x,member_status:pe(d),limit:"50"};return a&&(j.post_uuid=a),Ot(s,e,j)},[r?.id,b,m,x,d,s,e,a]),{data:v,loading:k}=K({endpoint:p?.endpoint||"",statsConfig:r,params:S,enabled:o&&!!p});return{options:l.useMemo(()=>p?(v||[]).filter(h=>p.filterItem?p.filterItem(h):!0).map(h=>{const F=String(h[p.valueKey]??""),A=Number(h.visits)||0,{value:E,label:y}=p.transformValue?p.transformValue(F):{value:F,label:F};return{label:y,value:E,icon:t.jsx(Ft,{visits:A})}}):[],[v,p]),loading:k}};function kt({filters:e,onChange:s,...a}){const{appSettings:i}=Fe(),{post:o}=W(),r=o?.uuid,[c,b]=l.useState(null),[m,x]=l.useState(!1);l.useEffect(()=>{const g=window.matchMedia("(max-width: 1024px)"),C=T=>{x(T.matches)};return C(g),g.addEventListener("change",C),()=>g.removeEventListener("change",C)},[]);const p=l.useMemo(()=>{const g=[{value:"undefined",label:"Public visitors",icon:t.jsx(Z,{className:"text-gray-700"})},{value:"free",label:"Free members",icon:t.jsx(Oe,{className:"text-green"})},{value:"paid",label:"Paid members",icon:t.jsx(jt,{className:"text-orange"})}];return i?.paidMembersEnabled?g:g.filter(C=>C.value!=="paid")},[i?.paidMembersEnabled]),d=l.useCallback(g=>{const C=c===g,T=e.some(n=>n.field===g);return C||T},[c,e]),{options:S,loading:v}=O("utm_source",e,r,{enabled:d("utm_source")}),{options:k,loading:I}=O("utm_medium",e,r,{enabled:d("utm_medium")}),{options:j,loading:h}=O("utm_campaign",e,r,{enabled:d("utm_campaign")}),{options:F,loading:A}=O("utm_content",e,r,{enabled:d("utm_content")}),{options:E,loading:y}=O("utm_term",e,r,{enabled:d("utm_term")}),{options:R,loading:D}=O("source",e,r,{enabled:d("source")}),{options:U,loading:M}=O("device",e,r,{enabled:d("device")}),{options:B,loading:P}=O("location",e,r,{enabled:d("location")}),_=l.useMemo(()=>[{value:"is",label:"is"}],[]),Q=l.useMemo(()=>{const g=[{key:"utm_source",label:"UTM Source",type:"select",icon:t.jsx(_t,{className:"size-4"}),placeholder:"Select source",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:S,isLoading:v,searchable:!0,selectedOptionsClassName:"hidden"},{key:"utm_medium",label:"UTM Medium",type:"select",icon:t.jsx(xt,{className:"size-4"}),placeholder:"Select medium",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:k,isLoading:I,className:"w-60",popoverContentClassName:"w-60",searchable:!0,selectedOptionsClassName:"hidden"},{key:"utm_campaign",label:"UTM Campaign",type:"select",icon:t.jsx(Ct,{className:"size-4"}),placeholder:"Select campaign",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:j,isLoading:h,className:"w-60",popoverContentClassName:"w-60",searchable:!0,selectedOptionsClassName:"hidden"},{key:"utm_content",label:"UTM Content",type:"select",icon:t.jsx(St,{className:"size-4"}),placeholder:"Select content",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:F,isLoading:A,className:"w-60",popoverContentClassName:"w-60",searchable:!0,selectedOptionsClassName:"hidden"},{key:"utm_term",label:"UTM Term",type:"select",icon:t.jsx(ke,{className:"size-4"}),placeholder:"Select term",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:E,isLoading:y,className:"w-60",popoverContentClassName:"w-60",searchable:!0,selectedOptionsClassName:"hidden"}];return[{group:"Basic",fields:[{key:"audience",label:"Audience",type:"multiselect",icon:t.jsx(Ee,{}),options:p.map(({value:C,label:T,icon:n})=>({value:C,label:T,icon:n})),defaultOperator:"is any of",hideOperatorSelect:!0,autoCloseOnSelect:!0},{key:"source",label:"Source",type:"select",icon:t.jsx(Z,{className:"size-4"}),placeholder:"Select source",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:R,isLoading:D,className:"w-60",popoverContentClassName:"w-60",searchable:!0,selectedOptionsClassName:"hidden"},{key:"device",label:"Device",type:"select",icon:t.jsx(gt,{className:"size-4"}),placeholder:"Select device",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:U,isLoading:M,selectedOptionsClassName:"hidden"},{key:"location",label:"Location",type:"select",icon:t.jsx(ft,{className:"size-4"}),placeholder:"Select location",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:B,isLoading:P,searchable:!0,selectedOptionsClassName:"hidden"}]},{group:"UTM parameters",fields:g}]},[S,v,k,I,j,h,F,A,E,y,_,p,R,D,U,M,B,P]),w=e.length>0,Y=l.useCallback(()=>{s&&s([])},[s]);return t.jsxs("div",{className:"mt-3 flex w-full justify-between gap-2 lg:mt-0","data-testid":"stats-filter-container",children:[t.jsx(pt,{addButtonIcon:t.jsx(Ge,{}),addButtonText:w?"Add filter":"Filter",allowMultiple:!1,className:`[&>button]:order-last ${w&&"[&>button]:border-none"}`,fields:Q,filters:e,keyboardShortcut:"f",popoverAlign:m||w?"start":"end",showSearchInput:!1,onActiveFieldChange:b,onChange:s||(()=>{}),...a}),w&&t.jsxs(oe,{className:"hidden font-normal text-muted-foreground lg:flex","data-testid":"stats-filter-clear-button",variant:"ghost",onClick:Y,children:[t.jsx(bt,{}),"Clear"]})]})}const G=["audience","source","device","location","utm_source","utm_medium","utm_campaign","utm_content","utm_term"],he="__empty__",ge="%2C";function Dt(e){const s=new URLSearchParams;return e.forEach(a=>{if(G.includes(a.field)&&a.values.length>0){const i=a.values.map(o=>o===""?he:String(o).replace(/,/g,ge)).join(",");s.set(a.field,i)}}),s}const q=new Map;function Mt(e){return q.has(e)||q.set(e,`url-${e}-${Date.now()}-${Math.random().toString(36).substring(2,11)}`),q.get(e)}function It(e){const s=[],a=new Set(G);return e.forEach((i,o)=>{if(!a.has(o))return;const r=i.split(",").map(c=>c===he?"":c.replace(new RegExp(ge,"g"),","));if(r.length>0){const c=o==="audience"?"is any of":"is";s.push({id:Mt(o),field:o,operator:c,values:r})}}),s}function At(e={}){const[s,a]=De(),{onFiltersChange:i}=e,o=l.useRef(!1),r=l.useMemo(()=>It(s),[s]);l.useEffect(()=>{!o.current&&i&&i(r)},[r,i]);const c=l.useCallback(m=>{o.current=!0;const x=typeof m=="function"?m(r):m,p=Dt(x),d=new URLSearchParams(s);G.forEach(S=>{d.delete(S)}),p.forEach((S,v)=>{d.set(v,S)}),a(d,{replace:!0}),setTimeout(()=>{o.current=!1},0)},[r,s,a]),b=l.useCallback(()=>{o.current=!0;const m=new URLSearchParams(s);G.forEach(x=>{m.delete(x)}),a(m,{replace:!0}),setTimeout(()=>{o.current=!1},0)},[s,a]);return{filters:r,setFilters:c,clearFilters:b}}const Ns=()=>{const e=Me(),{postId:s}=Ie(),{statsConfig:a,isLoading:i,range:o,data:r,post:c,isPostLoading:b}=W(),{filters:m,setFilters:x}=At(),p=l.useMemo(()=>{const n=m.find(f=>f.field==="audience");return me(n?.values)},[m]);l.useEffect(()=>{!b&&c?.email_only&&e(`/posts/analytics/${s}`)},[b,c?.email_only,e,s]);const d=l.useMemo(()=>{if(!c?.published_at)return ie.ALL_TIME.value;const n=Ae(c.published_at);return o>n?n:o},[c?.published_at,o]),{startDate:S,endDate:v,timezone:k}=ne(d),I=l.useCallback(()=>{const n=document.querySelector(".overflow-y-scroll");n&&n.scrollTo({top:0,behavior:"smooth"})},[]),j=l.useMemo(()=>{const n={};return m.forEach(f=>{const N=f.field,L=f.values;if(N==="audience")return;const u=L&&L.length>0&&L[0]!==null&&L[0]!==void 0,V=N==="source"&&L?.[0]==="";if(u&&(L[0]!==""||V)){const fe=String(L[0]);n[N]=fe}}),n},[m]),h=l.useCallback((n,f)=>{x(N=>N.find(u=>u.field===n)?N.map(u=>u.field===n?{...u,values:[f]}:u):[...N,ht(n,"is",[f])]),I()},[x,I]),F=l.useCallback(n=>h("location",n),[h]),A=l.useCallback(n=>h("source",n),[h]),E=l.useMemo(()=>{const n={site_uuid:a?.id||"",date_from:$(S),date_to:$(v),timezone:k,member_status:pe(p),post_uuid:"",...j};return!b&&c?.uuid?{...n,post_uuid:c.uuid}:n},[b,c,a?.id,S,v,k,p,j]),{data:y,loading:R}=K({endpoint:"api_kpis",statsConfig:a||{id:""},params:E}),{data:D,loading:U}=K({endpoint:"api_top_locations",statsConfig:a||{id:""},params:E}),{data:M,loading:B}=K({endpoint:"api_top_sources",statsConfig:a||{id:""},params:E}),P=l.useMemo(()=>D?.reduce((n,f)=>n+Number(f.visits),0)||0,[D]),_=l.useMemo(()=>M?M.reduce((n,f)=>n+Number(f.visits||0),0):0,[M]),Q=r?.url,w=r?.icon,Y=l.useMemo(()=>{const n=D?.map(u=>({location:String(u.location),visits:Number(u.visits),percentage:P>0?Number(u.visits)/P:0,isUnknown:le.includes(String(u.location))}))||[],f=n.filter(u=>!u.isUnknown),N=n.filter(u=>u.isUnknown),L=N.length>0?[{location:"Unknown",visits:N.reduce((u,V)=>u+V.visits,0),percentage:N.reduce((u,V)=>u+V.percentage,0)}]:[];return[...f,...L]},[D,P]),g=i||b||R||U||B,C=We(y),T=m.length>0;return t.jsxs(t.Fragment,{children:[t.jsxs(dt,{currentTab:"Web",children:[T&&t.jsx(ee,{children:t.jsx(se,{})}),t.jsxs(ee,{className:`${T?"!mt-0 [grid-area:subactions] lg:!mt-[25px]":"[grid-area:actions]"}`,children:[t.jsx(kt,{filters:m,onChange:x}),!T&&t.jsx(se,{})]})]}),t.jsx(mt,{children:g?t.jsx(ue,{className:"size-full",variant:"plain",children:t.jsx(de,{className:"size-full items-center justify-center",children:t.jsx(Pe,{})})}):y&&y.length!==0&&C.visits!=="0"?t.jsxs(t.Fragment,{children:[t.jsx(He,{data:y,range:d}),t.jsxs("div",{className:"flex flex-col gap-6 lg:grid lg:grid-cols-2",children:[t.jsx(yt,{data:Y,isLoading:U,onLocationClick:F}),t.jsx(Qe,{data:M,range:d,siteIcon:w,siteUrl:Q,totalVisitors:_,onSourceClick:A})]})]}):t.jsx("div",{className:"grow",children:t.jsx(Nt,{className:"h-full",description:"Try adjusting filters to see more data.",title:`No visitors ${Ye(o)}`,children:t.jsx(Z,{strokeWidth:1.5})})})})]})};export{Ns as default};
+import{j as t,aW as be,aV as xe,bK as Se,bL as je,B as oe,bM as _e,bN as Ce,bO as Ne,bP as ve,ck as Le,ao as ye,an as Te,aY as Fe,r as l,cl as Ee,aX as Z,aO as Oe,ak as ne,al as $,cm as ke,bS as De,aT as Me,u as Ie,aZ as Ae,aU as Pe}from"./index-CM-iA6b-.js";import{S as we,a as Ue,b as Ve,c as Re,d as Be,e as ze,f as Ke}from"./select-WZUCQgjI.js";import{u as W,S as ie,a as re,A as J,b as z,c as X,U as le}from"./post-analytics-context-B2ytyOU0.js";import{C as $e,F as Ge}from"./loader-circle-B5ILzHHu.js";import{g as We,a as He,S as Qe,b as Ye}from"./kpis-B-JXQ-4C.js";import{F as Xe,c as H,e as ce}from"./en-B9ScC5j9.js";import{C as ue,a as qe,b as Ze,h as Je,c as de,i as et,u as K,j as ee}from"./pagemenu-Cr7_YYR8.js";import{D as tt,h as st,i as te,a as at,b as ot,c as nt,d as it,e as rt,f as lt,g as ct}from"./data-list-nZOiCWV9.js";import{a as ut}from"./wallet-cards-Be7G77lR.js";import{P as dt,a as mt}from"./post-analytics-header-CvR25xxU.js";import{F as pt,c as ht}from"./filters-CscMb_Gl.js";import{b as gt,c as ft,F as bt,S as xt,T as St}from"./lucide-react-CM0rB7CS.js";import{U as jt}from"./user-plus-BS8SGBmk.js";import{M as _t}from"./ticket-BtYGyQvH.js";import{F as Ct}from"./message-square-text-DVZjnBBF.js";import{E as Nt}from"./empty-indicator-DoxAratw.js";import"./posts-DTy4lguT.js";import"./source-icon-xS8eeWX-.js";import"./source-utils-B1S3ZHA2.js";import"./gh-chart-GokHrG5_.js";import"./chart-CULaDoVB.js";import"./_baseAssignValue-DPyNU5o6.js";import"./tabs-BMk71Tf2.js";import"./index-C5YCjM6z.js";import"./post-share-modal-DDhiG0X4.js";import"./get-site-timezone-BDBAcjmq.js";import"./post-helpers-gInwAwEv.js";import"./trash-B4ncKmRu.js";import"./sprout-CLmu2pln.js";import"./a-large-small-BijOKCoa.js";import"./list-filter-cWuCDOLb.js";import"./at-sign-_JfhlimD.js";import"./copy-CbX-_mHj.js";import"./hash-twG7-iIB.js";import"./inbox-BdkIJbSq.js";import"./minus-BWrVDnd-.js";import"./tags-CqHx8i6Q.js";import"./square-D0Y5-h0C.js";import"./user-round-check-BgOPeBFs.js";import"./repeat-C_xWSLK1.js";import"./reply-CXnb6Juu.js";const se=()=>{const{range:e,setRange:s}=W();return t.jsxs(we,{value:`${e}`,onValueChange:a=>{s(Number(a))},children:[t.jsxs(Ue,{className:"w-auto",children:[t.jsx($e,{className:"mr-2",size:16,strokeWidth:1.5}),t.jsx(Ve,{placeholder:"Select a period"})]}),t.jsx(Re,{align:"end",children:t.jsxs(Be,{children:[t.jsx(ze,{children:"Period"}),Object.values(ie).map(a=>t.jsx(Ke,{value:`${a.value}`,children:a.name},a.value))]})})]})};H.registerLocale(ce);const vt=e=>re[e]||H.getName(e,"en")||"Unknown",Lt=e=>{const s={"UNITED STATES":"US","UNITED STATES OF AMERICA":"US",USA:"US","UNITED KINGDOM":"GB",UK:"GB","GREAT BRITAIN":"GB",NETHERLANDS:"NL"},a=e.toUpperCase();return s[a]||(e.length>2?e.substring(0,2):e)},ae=({tableHeader:e,data:s,onLocationClick:a})=>t.jsxs(tt,{children:[e&&t.jsxs(st,{children:[t.jsx(te,{children:"Country"}),t.jsx(te,{children:"Visitors"})]}),t.jsx(at,{children:s.map(i=>{const o=vt(`${i.location}`),r=a&&i.location!=="Unknown",c=i.location?i.location.toLowerCase():"unknown";return t.jsxs(ot,{className:r?"cursor-pointer":"","data-testid":`location-row-${c}`,onClick:r?()=>a(i.location):void 0,children:[t.jsx(nt,{style:{width:`${i.percentage?Math.round(i.percentage*100):0}%`}}),t.jsx(it,{className:"group-hover/data:max-w-[calc(100%-140px)]",children:t.jsxs("div",{className:"flex items-center space-x-3 overflow-hidden",title:o,children:[t.jsx(Xe,{countryCode:`${Lt(i.location)}`,fallback:t.jsx("span",{className:"flex h-[14px] w-[22px] items-center justify-center rounded-[2px] bg-black text-white",children:t.jsx(Le.SkullAndBones,{className:"size-3"})})}),t.jsx("div",{className:"truncate font-medium",children:o})]})}),t.jsxs(rt,{children:[t.jsx(lt,{children:ye(Number(i.visits))}),t.jsx(ct,{children:Te(i.percentage)})]})]},i.location||"unknown")})})]}),yt=({data:e,isLoading:s,onLocationClick:a})=>{const i=e.slice(0,10);return t.jsx(t.Fragment,{children:s?"":t.jsx(t.Fragment,{children:e&&e.length>0&&t.jsxs(ue,{className:"group/datalist","data-testid":"locations-card",children:[t.jsxs("div",{className:"flex items-center justify-between p-6",children:[t.jsxs(qe,{className:"p-0",children:[t.jsx(Ze,{children:"Locations"}),t.jsx(Je,{children:"Where are the readers of this post"})]}),t.jsx(be,{className:"mr-2",children:"Visitors"})]}),t.jsxs(de,{className:"overflow-hidden",children:[t.jsx(xe,{}),t.jsx(ae,{data:i,tableHeader:!1,onLocationClick:a})]}),e.length>10&&t.jsx(et,{children:t.jsxs(Se,{children:[t.jsx(je,{asChild:!0,children:t.jsxs(oe,{variant:"outline",children:["View all ",t.jsx(ut,{})]})}),t.jsxs(_e,{className:"overflow-y-auto pt-0 sm:max-w-[600px]",children:[t.jsxs(Ce,{className:"sticky top-0 z-40 -mx-6 bg-background/60 p-6 backdrop-blur",children:[t.jsx(Ne,{children:"Top locations"}),t.jsx(ve,{children:"Where are the readers of this post"})]}),t.jsx("div",{className:"group/datalist",children:t.jsx(ae,{data:e,tableHeader:!0,onLocationClick:a})})]})]})})]})})})},me=e=>!e||e.length===0?J:z.filter(s=>e.includes(s.value)).reduce((s,a)=>s|a.bit,0)||J,pe=e=>{const s=[];return(e&X.PUBLIC)!==0&&s.push(z[0].value),(e&X.FREE)!==0&&s.push(z[1].value),(e&X.PAID)!==0&&s.push(z[2].value),s.join(",")};H.registerLocale(ce);const Tt=e=>re[e]||H.getName(e,"en")||e,Ft=({visits:e})=>t.jsx("span",{className:"order-2 font-mono text-xs text-muted-foreground",children:e.toLocaleString()}),Et={utm_source:{endpoint:"api_top_utm_sources",valueKey:"utm_source",transformValue:e=>({value:e||"(not set)",label:e||"(not set)"})},utm_medium:{endpoint:"api_top_utm_mediums",valueKey:"utm_medium",transformValue:e=>({value:e||"(not set)",label:e||"(not set)"})},utm_campaign:{endpoint:"api_top_utm_campaigns",valueKey:"utm_campaign",transformValue:e=>({value:e||"(not set)",label:e||"(not set)"})},utm_content:{endpoint:"api_top_utm_contents",valueKey:"utm_content",transformValue:e=>({value:e||"(not set)",label:e||"(not set)"})},utm_term:{endpoint:"api_top_utm_terms",valueKey:"utm_term",transformValue:e=>({value:e||"(not set)",label:e||"(not set)"})},source:{endpoint:"api_top_sources",valueKey:"source",transformValue:e=>({value:e||"",label:e||"Direct"})},location:{endpoint:"api_top_locations",valueKey:"location",filterItem(e){const s=String(e.location||"");return s!==""&&!le.includes(s)},transformValue:e=>({value:e,label:Tt(e)})},device:{endpoint:"api_top_devices",valueKey:"device",transformValue:e=>({value:e,label:e==="mobile-ios"?"iOS":e==="mobile-android"?"Android":e==="desktop"?"Desktop":e==="bot"?"Bot":e})}},Ot=(e,s,a)=>{const i={...a};return e.forEach(o=>{if(o.field===s||o.values.length===0)return;const r=o.values[0];o.field!=="audience"&&(o.field==="source"||o.field==="device"||o.field==="location"||o.field.startsWith("utm_"))&&(i[o.field]=r)}),i},O=(e,s=[],a,i={})=>{const{enabled:o=!0}=i,{statsConfig:r,range:c}=W(),{startDate:b,endDate:m,timezone:x}=ne(c),p=Et[e],d=l.useMemo(()=>{const j=s.find(h=>h.field==="audience");return me(j?.values)},[s]),S=l.useMemo(()=>{const j={site_uuid:r?.id||"",date_from:$(b),date_to:$(m),timezone:x,member_status:pe(d),limit:"50"};return a&&(j.post_uuid=a),Ot(s,e,j)},[r?.id,b,m,x,d,s,e,a]),{data:v,loading:k}=K({endpoint:p?.endpoint||"",statsConfig:r,params:S,enabled:o&&!!p});return{options:l.useMemo(()=>p?(v||[]).filter(h=>p.filterItem?p.filterItem(h):!0).map(h=>{const F=String(h[p.valueKey]??""),A=Number(h.visits)||0,{value:E,label:y}=p.transformValue?p.transformValue(F):{value:F,label:F};return{label:y,value:E,icon:t.jsx(Ft,{visits:A})}}):[],[v,p]),loading:k}};function kt({filters:e,onChange:s,...a}){const{appSettings:i}=Fe(),{post:o}=W(),r=o?.uuid,[c,b]=l.useState(null),[m,x]=l.useState(!1);l.useEffect(()=>{const g=window.matchMedia("(max-width: 1024px)"),C=T=>{x(T.matches)};return C(g),g.addEventListener("change",C),()=>g.removeEventListener("change",C)},[]);const p=l.useMemo(()=>{const g=[{value:"undefined",label:"Public visitors",icon:t.jsx(Z,{className:"text-gray-700"})},{value:"free",label:"Free members",icon:t.jsx(Oe,{className:"text-green"})},{value:"paid",label:"Paid members",icon:t.jsx(jt,{className:"text-orange"})}];return i?.paidMembersEnabled?g:g.filter(C=>C.value!=="paid")},[i?.paidMembersEnabled]),d=l.useCallback(g=>{const C=c===g,T=e.some(n=>n.field===g);return C||T},[c,e]),{options:S,loading:v}=O("utm_source",e,r,{enabled:d("utm_source")}),{options:k,loading:I}=O("utm_medium",e,r,{enabled:d("utm_medium")}),{options:j,loading:h}=O("utm_campaign",e,r,{enabled:d("utm_campaign")}),{options:F,loading:A}=O("utm_content",e,r,{enabled:d("utm_content")}),{options:E,loading:y}=O("utm_term",e,r,{enabled:d("utm_term")}),{options:R,loading:D}=O("source",e,r,{enabled:d("source")}),{options:U,loading:M}=O("device",e,r,{enabled:d("device")}),{options:B,loading:P}=O("location",e,r,{enabled:d("location")}),_=l.useMemo(()=>[{value:"is",label:"is"}],[]),Q=l.useMemo(()=>{const g=[{key:"utm_source",label:"UTM Source",type:"select",icon:t.jsx(_t,{className:"size-4"}),placeholder:"Select source",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:S,isLoading:v,searchable:!0,selectedOptionsClassName:"hidden"},{key:"utm_medium",label:"UTM Medium",type:"select",icon:t.jsx(xt,{className:"size-4"}),placeholder:"Select medium",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:k,isLoading:I,className:"w-60",popoverContentClassName:"w-60",searchable:!0,selectedOptionsClassName:"hidden"},{key:"utm_campaign",label:"UTM Campaign",type:"select",icon:t.jsx(Ct,{className:"size-4"}),placeholder:"Select campaign",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:j,isLoading:h,className:"w-60",popoverContentClassName:"w-60",searchable:!0,selectedOptionsClassName:"hidden"},{key:"utm_content",label:"UTM Content",type:"select",icon:t.jsx(St,{className:"size-4"}),placeholder:"Select content",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:F,isLoading:A,className:"w-60",popoverContentClassName:"w-60",searchable:!0,selectedOptionsClassName:"hidden"},{key:"utm_term",label:"UTM Term",type:"select",icon:t.jsx(ke,{className:"size-4"}),placeholder:"Select term",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:E,isLoading:y,className:"w-60",popoverContentClassName:"w-60",searchable:!0,selectedOptionsClassName:"hidden"}];return[{group:"Basic",fields:[{key:"audience",label:"Audience",type:"multiselect",icon:t.jsx(Ee,{}),options:p.map(({value:C,label:T,icon:n})=>({value:C,label:T,icon:n})),defaultOperator:"is any of",hideOperatorSelect:!0,autoCloseOnSelect:!0},{key:"source",label:"Source",type:"select",icon:t.jsx(Z,{className:"size-4"}),placeholder:"Select source",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:R,isLoading:D,className:"w-60",popoverContentClassName:"w-60",searchable:!0,selectedOptionsClassName:"hidden"},{key:"device",label:"Device",type:"select",icon:t.jsx(gt,{className:"size-4"}),placeholder:"Select device",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:U,isLoading:M,selectedOptionsClassName:"hidden"},{key:"location",label:"Location",type:"select",icon:t.jsx(ft,{className:"size-4"}),placeholder:"Select location",operators:_,defaultOperator:"is",hideOperatorSelect:!0,options:B,isLoading:P,searchable:!0,selectedOptionsClassName:"hidden"}]},{group:"UTM parameters",fields:g}]},[S,v,k,I,j,h,F,A,E,y,_,p,R,D,U,M,B,P]),w=e.length>0,Y=l.useCallback(()=>{s&&s([])},[s]);return t.jsxs("div",{className:"mt-3 flex w-full justify-between gap-2 lg:mt-0","data-testid":"stats-filter-container",children:[t.jsx(pt,{addButtonIcon:t.jsx(Ge,{}),addButtonText:w?"Add filter":"Filter",allowMultiple:!1,className:`[&>button]:order-last ${w&&"[&>button]:border-none"}`,fields:Q,filters:e,keyboardShortcut:"f",popoverAlign:m||w?"start":"end",showSearchInput:!1,onActiveFieldChange:b,onChange:s||(()=>{}),...a}),w&&t.jsxs(oe,{className:"hidden font-normal text-muted-foreground lg:flex","data-testid":"stats-filter-clear-button",variant:"ghost",onClick:Y,children:[t.jsx(bt,{}),"Clear"]})]})}const G=["audience","source","device","location","utm_source","utm_medium","utm_campaign","utm_content","utm_term"],he="__empty__",ge="%2C";function Dt(e){const s=new URLSearchParams;return e.forEach(a=>{if(G.includes(a.field)&&a.values.length>0){const i=a.values.map(o=>o===""?he:String(o).replace(/,/g,ge)).join(",");s.set(a.field,i)}}),s}const q=new Map;function Mt(e){return q.has(e)||q.set(e,`url-${e}-${Date.now()}-${Math.random().toString(36).substring(2,11)}`),q.get(e)}function It(e){const s=[],a=new Set(G);return e.forEach((i,o)=>{if(!a.has(o))return;const r=i.split(",").map(c=>c===he?"":c.replace(new RegExp(ge,"g"),","));if(r.length>0){const c=o==="audience"?"is any of":"is";s.push({id:Mt(o),field:o,operator:c,values:r})}}),s}function At(e={}){const[s,a]=De(),{onFiltersChange:i}=e,o=l.useRef(!1),r=l.useMemo(()=>It(s),[s]);l.useEffect(()=>{!o.current&&i&&i(r)},[r,i]);const c=l.useCallback(m=>{o.current=!0;const x=typeof m=="function"?m(r):m,p=Dt(x),d=new URLSearchParams(s);G.forEach(S=>{d.delete(S)}),p.forEach((S,v)=>{d.set(v,S)}),a(d,{replace:!0}),setTimeout(()=>{o.current=!1},0)},[r,s,a]),b=l.useCallback(()=>{o.current=!0;const m=new URLSearchParams(s);G.forEach(x=>{m.delete(x)}),a(m,{replace:!0}),setTimeout(()=>{o.current=!1},0)},[s,a]);return{filters:r,setFilters:c,clearFilters:b}}const Ns=()=>{const e=Me(),{postId:s}=Ie(),{statsConfig:a,isLoading:i,range:o,data:r,post:c,isPostLoading:b}=W(),{filters:m,setFilters:x}=At(),p=l.useMemo(()=>{const n=m.find(f=>f.field==="audience");return me(n?.values)},[m]);l.useEffect(()=>{!b&&c?.email_only&&e(`/posts/analytics/${s}`)},[b,c?.email_only,e,s]);const d=l.useMemo(()=>{if(!c?.published_at)return ie.ALL_TIME.value;const n=Ae(c.published_at);return o>n?n:o},[c?.published_at,o]),{startDate:S,endDate:v,timezone:k}=ne(d),I=l.useCallback(()=>{const n=document.querySelector(".overflow-y-scroll");n&&n.scrollTo({top:0,behavior:"smooth"})},[]),j=l.useMemo(()=>{const n={};return m.forEach(f=>{const N=f.field,L=f.values;if(N==="audience")return;const u=L&&L.length>0&&L[0]!==null&&L[0]!==void 0,V=N==="source"&&L?.[0]==="";if(u&&(L[0]!==""||V)){const fe=String(L[0]);n[N]=fe}}),n},[m]),h=l.useCallback((n,f)=>{x(N=>N.find(u=>u.field===n)?N.map(u=>u.field===n?{...u,values:[f]}:u):[...N,ht(n,"is",[f])]),I()},[x,I]),F=l.useCallback(n=>h("location",n),[h]),A=l.useCallback(n=>h("source",n),[h]),E=l.useMemo(()=>{const n={site_uuid:a?.id||"",date_from:$(S),date_to:$(v),timezone:k,member_status:pe(p),post_uuid:"",...j};return!b&&c?.uuid?{...n,post_uuid:c.uuid}:n},[b,c,a?.id,S,v,k,p,j]),{data:y,loading:R}=K({endpoint:"api_kpis",statsConfig:a||{id:""},params:E}),{data:D,loading:U}=K({endpoint:"api_top_locations",statsConfig:a||{id:""},params:E}),{data:M,loading:B}=K({endpoint:"api_top_sources",statsConfig:a||{id:""},params:E}),P=l.useMemo(()=>D?.reduce((n,f)=>n+Number(f.visits),0)||0,[D]),_=l.useMemo(()=>M?M.reduce((n,f)=>n+Number(f.visits||0),0):0,[M]),Q=r?.url,w=r?.icon,Y=l.useMemo(()=>{const n=D?.map(u=>({location:String(u.location),visits:Number(u.visits),percentage:P>0?Number(u.visits)/P:0,isUnknown:le.includes(String(u.location))}))||[],f=n.filter(u=>!u.isUnknown),N=n.filter(u=>u.isUnknown),L=N.length>0?[{location:"Unknown",visits:N.reduce((u,V)=>u+V.visits,0),percentage:N.reduce((u,V)=>u+V.percentage,0)}]:[];return[...f,...L]},[D,P]),g=i||b||R||U||B,C=We(y),T=m.length>0;return t.jsxs(t.Fragment,{children:[t.jsxs(dt,{currentTab:"Web",children:[T&&t.jsx(ee,{children:t.jsx(se,{})}),t.jsxs(ee,{className:`${T?"!mt-0 [grid-area:subactions] lg:!mt-[25px]":"[grid-area:actions]"}`,children:[t.jsx(kt,{filters:m,onChange:x}),!T&&t.jsx(se,{})]})]}),t.jsx(mt,{children:g?t.jsx(ue,{className:"size-full",variant:"plain",children:t.jsx(de,{className:"size-full items-center justify-center",children:t.jsx(Pe,{})})}):y&&y.length!==0&&C.visits!=="0"?t.jsxs(t.Fragment,{children:[t.jsx(He,{data:y,range:d}),t.jsxs("div",{className:"flex flex-col gap-6 lg:grid lg:grid-cols-2",children:[t.jsx(yt,{data:Y,isLoading:U,onLocationClick:F}),t.jsx(Qe,{data:M,range:d,siteIcon:w,siteUrl:Q,totalVisitors:_,onSourceClick:A})]})]}):t.jsx("div",{className:"grow",children:t.jsx(Nt,{className:"h-full",description:"Try adjusting filters to see more data.",title:`No visitors ${Ye(o)}`,children:t.jsx(Z,{strokeWidth:1.5})})})})]})};export{Ns as default};

package/core/built/admin/index.html

@@ -3,7 +3,7 @@
   <head>
     <link rel="stylesheet" href="./assets/vendor-0ede59da8efb5e28fa929557f7ff7154.css">
     <link rel="stylesheet" href="./assets/ghost-1627c2071621864e79a845529769ff19.css">
-    <meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%226.21%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%228785c87985%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%223574dc2aad%22%2C%22activitypubFilename%22%3A%22activitypub.js%22%2C%22activitypubHash%22%3A%2258788e91cd%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%22b8baca4053%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%22a37abdfe6f%22%2C%22activitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%22%7D">
+    <meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%226.21%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%228785c87985%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%2224fb0ad2c1%22%2C%22activitypubFilename%22%3A%22activitypub.js%22%2C%22activitypubHash%22%3A%2258788e91cd%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%22b8baca4053%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%22a37abdfe6f%22%2C%22activitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%22%7D">
 
     <meta charset="UTF-8" />
 
@@ -17,7 +17,7 @@
     <meta name="apple-mobile-web-app-title" content="Ghost" />
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
-    <script type="module" crossorigin src="./assets/index-CX1A5TwO.js"></script>
+    <script type="module" crossorigin src="./assets/index-CM-iA6b-.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-BQQ-gECj.css">
   </head>
   <body class="react-admin">
@@ -39,8 +39,8 @@
     <div id="ember-notifications-wormhole"></div>
     <script src="./assets/vendor-0e6161f8da2ad46cf62cef0a53cfb16a.js"></script>
     <script src="./assets/chunk.119.8ed8af850063f930a797.js"></script>
-    <script src="./assets/chunk.138.5c4b0d0ae3f21c9c726d.js"></script>
-    <script src="./assets/chunk.524.54ba5b50c191627c46f2.js"></script>
-    <script src="./assets/ghost-565670d46ad5b30935426b5dfa95bc81.js"></script>
+    <script src="./assets/chunk.482.c45c97fe666cd1a6b060.js"></script>
+    <script src="./assets/chunk.524.7fc2692374515780e66e.js"></script>
+    <script src="./assets/ghost-d1843f84a9476ccbdf2a350848ac88aa.js"></script>
   </body>
 </html>

package/core/frontend/helpers/cancel_link.js

@@ -4,7 +4,7 @@
 // Should be used inside of a subscription context, e.g.: `{{#foreach @member.subscriptions}} {{cancel_link}} {{/foreach}}`
 // Outputs cancel/renew links to manage subscription renewal after the subscription period ends.
 //
-// Defaults to class="cancel-subscription-link" errorClass="cancel-subscription-error" cancelLabel="Cancel subscription" continueLabel="Continue subscription"
+// Defaults to class="cancel-subscription-link" errorClass="cancel-subscription-error" cancelLabel="Cancel subscription" continueLabel="Resume subscription"
 const {labs} = require('../services/proxy');
 const {templates} = require('../services/handlebars');
 
@@ -28,7 +28,7 @@ function cancel_link(options) { // eslint-disable-line camelcase
         class: truncateOptions.class || 'gh-subscription-cancel',
         errorClass: truncateOptions.errorClass || 'gh-error gh-error-subscription-cancel',
         cancelLabel: truncateOptions.cancelLabel || 'Cancel subscription',
-        continueLabel: truncateOptions.continueLabel || 'Continue subscription'
+        continueLabel: truncateOptions.continueLabel || 'Resume subscription'
     };
 
     return templates.execute('cancel_link', data);

package/core/server/api/endpoints/authors-public.js

@@ -1,7 +1,7 @@
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
-const {rejectPrivateFieldsTransformer} = require('./utils/public-endpoint-utils');
+const {rejectContentApiRestrictedFieldsTransformer} = require('./utils/api-filter-utils');
 
 const ALLOWED_INCLUDES = ['count.posts'];
 
@@ -36,7 +36,7 @@ const controller = {
         query(frame) {
             const options = {
                 ...frame.options,
-                mongoTransformer: rejectPrivateFieldsTransformer
+                mongoTransformer: rejectContentApiRestrictedFieldsTransformer
             };
             return models.Author.findPage(options);
         }
@@ -68,7 +68,7 @@ const controller = {
         async query(frame) {
             const options = {
                 ...frame.options,
-                mongoTransformer: rejectPrivateFieldsTransformer
+                mongoTransformer: rejectContentApiRestrictedFieldsTransformer
             };
 
             const model = await models.Author.findOne(frame.data, options);

package/core/server/api/endpoints/files.js

@@ -1,4 +1,5 @@
 const storage = require('../../adapters/storage');
+const mime = require('mime-types');
 
 /** @type {import('@tryghost/api-framework').Controller} */
 const controller = {
@@ -13,7 +14,7 @@ const controller = {
             const filePath = await storage.getStorage('files').save({
                 name: frame.file.originalname,
                 path: frame.file.path,
-                type: frame.file.mimetype
+                type: mime.lookup(frame.file.originalname) || 'application/octet-stream'
             });
 
             return {

package/core/server/api/endpoints/pages-public.js

@@ -1,7 +1,7 @@
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
-const {rejectPrivateFieldsTransformer} = require('./utils/public-endpoint-utils');
+const {rejectContentApiRestrictedFieldsTransformer} = require('./utils/api-filter-utils');
 
 const ALLOWED_INCLUDES = ['tags', 'authors', 'tiers'];
 
@@ -42,7 +42,7 @@ const controller = {
         query(frame) {
             const options = {
                 ...frame.options,
-                mongoTransformer: rejectPrivateFieldsTransformer
+                mongoTransformer: rejectContentApiRestrictedFieldsTransformer
             };
             return models.Post.findPage(options);
         }
@@ -78,7 +78,7 @@ const controller = {
         async query(frame) {
             const options = {
                 ...frame.options,
-                mongoTransformer: rejectPrivateFieldsTransformer
+                mongoTransformer: rejectContentApiRestrictedFieldsTransformer
             };
             const model = await models.Post.findOne(frame.data, options);
             if (!model) {

package/core/server/api/endpoints/posts-public.js

@@ -4,7 +4,7 @@ const errors = require('@tryghost/errors');
 const postsPublicService = require('../../services/posts-public');
 const getPostServiceInstance = require('../../services/posts/posts-service-instance');
 const postsService = getPostServiceInstance();
-const {rejectPrivateFieldsTransformer} = require('./utils/public-endpoint-utils');
+const {rejectContentApiRestrictedFieldsTransformer} = require('./utils/api-filter-utils');
 
 const ALLOWED_INCLUDES = ['tags', 'authors', 'tiers', 'sentiment'];
 
@@ -100,7 +100,7 @@ const controller = {
         query(frame) {
             const options = {
                 ...frame.options,
-                mongoTransformer: rejectPrivateFieldsTransformer
+                mongoTransformer: rejectContentApiRestrictedFieldsTransformer
             };
             return postsService.browsePosts(options);
         }
@@ -154,7 +154,7 @@ const controller = {
         async query(frame) {
             const options = {
                 ...frame.options,
-                mongoTransformer: rejectPrivateFieldsTransformer
+                mongoTransformer: rejectContentApiRestrictedFieldsTransformer
             };
             const model = await models.Post.findOne(frame.data, options);
             if (!model) {

package/core/server/api/endpoints/users.js

@@ -6,6 +6,7 @@ const dbBackup = require('../../data/db/backup');
 const auth = require('../../services/auth');
 const apiMail = require('./index').mail;
 const apiSettings = require('./index').settings;
+const {rejectAdminApiRestrictedFieldsTransformer} = require('./utils/api-filter-utils');
 const UsersService = require('../../services/users');
 const userService = new UsersService({dbBackup, models, auth, apiMail, apiSettings});
 const ALLOWED_INCLUDES = ['count.posts', 'permissions', 'roles', 'roles.permissions'];
@@ -106,7 +107,11 @@ const controller = {
         },
         permissions: true,
         query(frame) {
-            return models.User.findPage(frame.options);
+            const options = {
+                ...frame.options,
+                mongoTransformer: rejectAdminApiRestrictedFieldsTransformer
+            };
+            return models.User.findPage(options);
         }
     },
 
@@ -116,7 +121,6 @@ const controller = {
         },
         options: [
             'include',
-            'filter',
             'fields',
             'debug'
         ],

package/core/server/api/endpoints/utils/api-filter-utils.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rejectAdminApiRestrictedFieldsTransformer = exports.rejectContentApiRestrictedFieldsTransformer = void 0;
+const mongo_utils_1 = require("@tryghost/mongo-utils");
+const CONTENT_API_RESTRICTED_FIELDS = new Set([
+    'password',
+    'email'
+]);
+const ADMIN_API_RESTRICTED_FIELDS = new Set([
+    'password'
+]);
+function hasRestrictedSegment(key, fields) {
+    return key.toLowerCase().split('.').some(segment => fields.has(segment));
+}
+const rejectContentApiRestrictedFieldsTransformer = (input) => {
+    return (0, mongo_utils_1.rejectStatements)(input, (key) => hasRestrictedSegment(key, CONTENT_API_RESTRICTED_FIELDS));
+};
+exports.rejectContentApiRestrictedFieldsTransformer = rejectContentApiRestrictedFieldsTransformer;
+const rejectAdminApiRestrictedFieldsTransformer = (input) => {
+    return (0, mongo_utils_1.rejectStatements)(input, (key) => hasRestrictedSegment(key, ADMIN_API_RESTRICTED_FIELDS));
+};
+exports.rejectAdminApiRestrictedFieldsTransformer = rejectAdminApiRestrictedFieldsTransformer;

package/core/server/api/endpoints/utils/api-filter-utils.ts

@@ -0,0 +1,22 @@
+import {rejectStatements} from '@tryghost/mongo-utils';
+
+const CONTENT_API_RESTRICTED_FIELDS = new Set([
+    'password',
+    'email'
+]);
+
+const ADMIN_API_RESTRICTED_FIELDS = new Set([
+    'password'
+]);
+
+function hasRestrictedSegment(key: string, fields: Set<string>): boolean {
+    return key.toLowerCase().split('.').some(segment => fields.has(segment));
+}
+
+export const rejectContentApiRestrictedFieldsTransformer = (input: unknown) => {
+    return rejectStatements(input, (key: string) => hasRestrictedSegment(key, CONTENT_API_RESTRICTED_FIELDS));
+};
+
+export const rejectAdminApiRestrictedFieldsTransformer = (input: unknown) => {
+    return rejectStatements(input, (key: string) => hasRestrictedSegment(key, ADMIN_API_RESTRICTED_FIELDS));
+};

package/core/server/lib/lexical.js

@@ -97,7 +97,8 @@ module.exports = {
             feature: {
                 contentVisibility: true, // force on until Koenig has been bumped
                 emailCustomization: true, // force on until Koenig has been bumped
-                emailUniqueid: labs.isSet('emailUniqueid')
+                emailUniqueid: labs.isSet('emailUniqueid'),
+                pictureImageFormats: labs.isSet('pictureImageFormats')
             },
             nodeRenderers: this.customNodeRenderers
         }, userOptions);

package/core/server/lib/mobiledoc.js

@@ -140,7 +140,7 @@ module.exports = {
                     size = await getUnsplashSize(payload.src);
                 } else if (isRelativeImagePath || storageUtils.isLocalImage(payload.src)) {
                     size = await imageSize.getOriginalImageSizeFromStorageUrl(payload.src);
-                } else {
+                } else if (storageUtils.isInternalImage(payload.src)) {
                     size = await imageSize.getImageSizeFromUrl(payload.src);
                 }
 

package/core/server/lib/request-external.js

@@ -4,6 +4,7 @@
  */
 
 const got = /** @type {Got} */ (/** @type {unknown} */ (require('got')));
+const dns = require('dns');
 const net = require('net');
 const dnsPromises = require('dns').promises;
 const errors = require('@tryghost/errors');
@@ -139,6 +140,23 @@ function isPrivateIp(addr) {
         if (/^fe[89ab][0-9a-f]:/i.test(normalized6)) {
             return true;
         }
+        // Re-check for IPv4-mapped IPv6 after normalization
+        // Handles expanded forms like 0:0:0:0:0:ffff:127.0.0.1 which normalize to ::ffff:...
+        const v4DottedNorm = normalized6.match(/^::ffff:(\d[\d.]+)$/i);
+        if (v4DottedNorm) {
+            const normV4 = normalizeIPv4(v4DottedNorm[1]);
+            if (normV4) {
+                return isPrivateIPv4(normV4);
+            }
+            return true;
+        }
+        const v4HexNorm = normalized6.match(/^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/i);
+        if (v4HexNorm) {
+            const hi = parseInt(v4HexNorm[1], 16);
+            const lo = parseInt(v4HexNorm[2], 16);
+            const mapped = ((hi >> 8) & 0xff) + '.' + (hi & 0xff) + '.' + ((lo >> 8) & 0xff) + '.' + (lo & 0xff);
+            return isPrivateIPv4(mapped);
+        }
         return false;
     }
 
@@ -193,8 +211,65 @@ async function disableRetries(options) {
     options.timeout = 5000;
 }
 
+/**
+ * Install a custom dnsLookup on the request options that validates the resolved
+ * IP at connection time. This eliminates the DNS rebinding / TOCTOU gap between
+ * the beforeRequest DNS check and the actual TCP connection: the IP validated
+ * here is the same one Node's http module will connect to.
+ */
+function installSafeDnsLookup(options) {
+    if (config.get('env') === 'development') {
+        return;
+    }
+
+    const siteUrl = new URL(config.get('url'));
+    if (options.url.host === siteUrl.host) {
+        return;
+    }
+
+    const requestHref = options.url.href;
+    // Use 'lookup' (the native http.request option) rather than 'dnsLookup'
+    // (got's public API property which doesn't flow to the native request).
+    options.lookup = (hostname, dnsOpts, callback) => {
+        if (typeof dnsOpts === 'function') {
+            callback = dnsOpts;
+            dnsOpts = {};
+        }
+        dns.lookup(hostname, dnsOpts, (err, addressOrResult, family) => {
+            if (err) {
+                return callback(err, addressOrResult, family);
+            }
+            // When all:true, result is an array of {address, family} objects
+            if (dnsOpts && dnsOpts.all) {
+                const results = /** @type {{address: string, family: number}[]} */ (addressOrResult);
+                for (const entry of results) {
+                    if (isPrivateIp(entry.address)) {
+                        return callback(new errors.InternalServerError({
+                            message: 'URL resolves to a non-permitted private IP block',
+                            code: 'URL_PRIVATE_INVALID',
+                            context: requestHref
+                        }));
+                    }
+                }
+                return callback(null, results);
+            }
+            if (isPrivateIp(/** @type {string} */ (addressOrResult))) {
+                return callback(new errors.InternalServerError({
+                    message: 'URL resolves to a non-permitted private IP block',
+                    code: 'URL_PRIVATE_INVALID',
+                    context: requestHref
+                }));
+            }
+            callback(null, addressOrResult, family);
+        });
+    };
+}
+
 // same as our normal request lib but if any request in a redirect chain resolves
 // to a private IP address it will be blocked before the request is made.
+// The beforeRequest hooks provide a first-pass DNS check with clear error messages.
+// installSafeDnsLookup provides the authoritative gate at the connection layer,
+// preventing DNS rebinding attacks where the IP changes between check and connect.
 /** @type {ExtendOptions} */
 const gotOpts = {
     headers: {
@@ -203,11 +278,12 @@ const gotOpts = {
     timeout: 10000, // default is no timeout
     hooks: {
         init: process.env.NODE_ENV?.startsWith('test') ? [disableRetries] : [],
-        beforeRequest: [errorIfInvalidUrl, errorIfHostnameResolvesToPrivateIp],
-        beforeRedirect: [errorIfHostnameResolvesToPrivateIp]
+        beforeRequest: [errorIfInvalidUrl, errorIfHostnameResolvesToPrivateIp, installSafeDnsLookup],
+        beforeRedirect: [errorIfHostnameResolvesToPrivateIp, installSafeDnsLookup]
     }
 };
 
 const externalRequest = got.extend(gotOpts);
 externalRequest.isPrivateIp = isPrivateIp;
+externalRequest._installSafeDnsLookup = installSafeDnsLookup;
 module.exports = externalRequest;

package/core/server/services/email-service/email-templates/partials/styles.hbs

@@ -1048,7 +1048,8 @@ td.kg-card-spacing {
 }
 
 .kg-bookmark-thumbnail {
-    min-width: 140px;
+    flex: 0 1 33%;
+    width: 33%;
     max-width: 180px;
     background-repeat: no-repeat;
     background-size: cover;
@@ -1082,6 +1083,7 @@ td.kg-card-spacing {
 
 .kg-bookmark-author {
     line-height: 1.5em;
+    white-space: nowrap;
 }
 
 .kg-bookmark-publisher {

package/core/server/services/koenig/node-renderers/image-renderer.js

@@ -1,10 +1,24 @@
+const path = require('path');
+const imageTransform = require('@tryghost/image-transform');
 const {getAvailableImageWidths} = require('../render-utils/get-available-image-widths');
 const {isContentImage} = require('../render-utils/is-content-image');
-const {setSrcsetAttribute} = require('../render-utils/srcset-attribute');
+const {getSrcsetAttribute, setSrcsetAttribute} = require('../render-utils/srcset-attribute');
 const {getResizedImageDimensions} = require('../render-utils/get-resized-image-dimensions');
 const {addCreateDocumentOption} = require('../render-utils/add-create-document-option');
 const {renderEmptyContainer} = require('../render-utils/render-empty-container');
 
+const MODERN_IMAGE_FORMATS = ['avif', 'webp'];
+
+function isAnimatedImage(url = '') {
+    try {
+        const parsedUrl = new URL(url, 'http://localhost');
+        const extension = path.extname(parsedUrl.pathname).toLowerCase();
+        return extension === '.gif';
+    } catch (err) {
+        return false;
+    }
+}
+
 function renderImageNode(node, options = {}) {
     addCreateDocumentOption(options);
 
@@ -62,22 +76,78 @@ function renderImageNode(node, options = {}) {
         img.setAttribute('height', height);
     }
 
+    const imgAttributes = {
+        src: node.src,
+        width: node.width,
+        height: node.height
+    };
+
+    let picture = null;
+
     if (options.target !== 'email') {
-        const imgAttributes = {
-            src: node.src,
-            width: node.width,
-            height: node.height
-        };
         setSrcsetAttribute(img, imgAttributes, options);
 
+        let sizes;
         if (img.getAttribute('srcset') && node.width && node.width >= 720) {
             // standard size
             if (!node.cardWidth || node.cardWidth === 'regular') {
-                img.setAttribute('sizes', '(min-width: 720px) 720px');
+                sizes = '(min-width: 720px) 720px';
             }
 
             if (node.cardWidth === 'wide' && node.width >= 1200) {
-                img.setAttribute('sizes', '(min-width: 1200px) 1200px');
+                sizes = '(min-width: 1200px) 1200px';
+            }
+        }
+
+        if (sizes) {
+            img.setAttribute('sizes', sizes);
+        }
+
+        const shouldRenderPicture = Boolean(
+            options.feature?.pictureImageFormats &&
+            img.getAttribute('srcset') &&
+            !isAnimatedImage(node.src) &&
+            isContentImage(node.src, options.siteUrl, options.imageBaseUrl) &&
+            options.canTransformImage?.(node.src) &&
+            imageTransform.canTransformFiles()
+        );
+
+        if (shouldRenderPicture) {
+            picture = document.createElement('picture');
+            let sourcesAdded = false;
+
+            MODERN_IMAGE_FORMATS.forEach((format) => {
+                if (!imageTransform.canTransformToFormat(format)) {
+                    return;
+                }
+
+                const formattedSrcset = getSrcsetAttribute({
+                    src: node.src,
+                    width: node.width,
+                    options,
+                    format
+                });
+
+                if (!formattedSrcset) {
+                    return;
+                }
+
+                const source = document.createElement('source');
+                source.setAttribute('srcset', formattedSrcset);
+                source.setAttribute('type', `image/${format}`);
+
+                if (sizes) {
+                    source.setAttribute('sizes', sizes);
+                }
+
+                picture.appendChild(source);
+                sourcesAdded = true;
+            });
+
+            if (sourcesAdded) {
+                picture.appendChild(img);
+            } else {
+                picture = null;
             }
         }
     }
@@ -113,10 +183,10 @@ function renderImageNode(node, options = {}) {
     if (node.href) {
         const a = document.createElement('a');
         a.setAttribute('href', node.href);
-        a.appendChild(img);
+        a.appendChild(picture || img);
         figure.appendChild(a);
     } else {
-        figure.appendChild(img);
+        figure.appendChild(picture || img);
     }
 
     if (node.caption) {

package/core/server/services/koenig/render-utils/srcset-attribute.js

@@ -4,7 +4,7 @@ const {isUnsplashImage} = require('./is-unsplash-image');
 
 // default content sizes: [600, 1000, 1600, 2400]
 
-const getSrcsetAttribute = function ({src, width, options}) {
+const getSrcsetAttribute = function ({src, width, options, format}) {
     if (!options.imageOptimization || options.imageOptimization.srcsets === false || !width || !options.imageOptimization.contentImageSizes) {
         return;
     }
@@ -23,10 +23,19 @@ const getSrcsetAttribute = function ({src, width, options}) {
         srcsetWidths.forEach((srcsetWidth) => {
             if (srcsetWidth === width) {
                 // use original image path if width matches exactly (avoids 302s from size->original)
-                srcs.push(`${src} ${srcsetWidth}w`);
+                // unless a specific output format was requested
+                if (format) {
+                    srcs.push(`${imagesPath}/size/w${srcsetWidth}/format/${format}/${filename} ${srcsetWidth}w`);
+                } else {
+                    srcs.push(`${src} ${srcsetWidth}w`);
+                }
             } else if (srcsetWidth <= width) {
                 // avoid creating srcset sizes larger than intrinsic image width
-                srcs.push(`${imagesPath}/size/w${srcsetWidth}/${filename} ${srcsetWidth}w`);
+                if (format) {
+                    srcs.push(`${imagesPath}/size/w${srcsetWidth}/format/${format}/${filename} ${srcsetWidth}w`);
+                } else {
+                    srcs.push(`${imagesPath}/size/w${srcsetWidth}/${filename} ${srcsetWidth}w`);
+                }
             }
         });
 
@@ -42,6 +51,9 @@ const getSrcsetAttribute = function ({src, width, options}) {
 
         srcsetWidths.forEach((srcsetWidth) => {
             unsplashUrl.searchParams.set('w', srcsetWidth);
+            if (format) {
+                unsplashUrl.searchParams.set('fm', format);
+            }
             srcs.push(`${unsplashUrl.href} ${srcsetWidth}w`);
         });