Merge pull request #5917 from pixelfed/staging

Fix timeAgo and notifications
pull/5926/head^2
daniel 5 months ago committed by GitHub
commit e9aaeae758
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -62,6 +62,7 @@
"requests": "Requests"
},
"notifications": {
"title": "Notifications",
"liked": "liked your",
"commented": "commented on your",
"reacted": "reacted to your",
@ -80,7 +81,24 @@
"modlog": "modlog",
"post": "post",
"story": "story",
"noneFound": "No notifications found"
"noneFound": "No notifications found",
"youRecent": "You recent",
"hasUnlisted": "has been unlisted",
"cannotDisplay": "We cannot display this notification at this time.",
"followRequest": "Follow Requests",
"filteringResults": "Filtering results may not include older notifications",
"mentions": "Mentions",
"mentionsDescription": "Replies to your posts and posts you were mentioned in",
"likes": "Likes",
"likesDescription": "Accounts that liked your posts",
"followers": "Followers",
"followersDescription": "Accounts that followed you",
"reblogs": "Reblogs",
"reblogsDescription": "Accounts that shared or reblogged your posts",
"dms": "DMs",
"dmsDescription": "Direct messages you have with other accounts",
"accept": "Accept",
"reject": "Reject"
},
"post": {
"shareToFollowers": "Share to followers",
@ -100,7 +118,24 @@
"followRequested": "Follow Requested",
"joined": "Joined",
"emptyCollections": "We can't seem to find any collections",
"emptyPosts": "We can't seem to find any posts"
"emptyPosts": "We can't seem to find any posts",
"blocking": "You are blocking this account",
"sponsor": "Donate",
"followYou": "Follows You",
"archives": "Archives",
"bookmarks": "Bookmarks",
"likes": "Likes",
"muted": "Muted",
"blocked": "Blocked",
"myPortifolio": "My Portfolio",
"private": "This profile is private",
"public": "Public",
"draft": "Draft",
"emptyLikes": "We can't seem to find any posts you have liked",
"emptyBookmarks": "We can't seem to find any posts you have bookmarked",
"emptyArchives": "We can't seem to find any archived posts",
"untitled": "Untitled",
"noDescription": "No description available"
},
"menu": {
"viewPost": "View Post",
@ -143,7 +178,11 @@
"embedConfirmText": "By using this embed, you agree to our",
"deletePostConfirm": "Are you sure you want to delete this post?",
"archivePostConfirm": "Are you sure you want to archive this post?",
"unarchivePostConfirm": "Are you sure you want to unarchive this post?"
"unarchivePostConfirm": "Are you sure you want to unarchive this post?",
"pin": "Pin",
"unpin": "Unpin",
"pinPostConfirm": "Are you sure you want to pin this post?",
"unpinPostConfirm": "Are you sure you want to unpin this post?"
},
"story": {
"add": "Add Story"

@ -46,6 +46,7 @@
"profile": "Perfil",
"drive": "Drive",
"settings": "Defini\u00e7\u00f5es",
"appearance": "Apar\u00eancia",
"compose": "Criar novo",
"logout": "Terminar Sess\u00e3o",
"about": "Sobre",
@ -61,25 +62,43 @@
"requests": "Pedidos"
},
"notifications": {
"liked": "curtiu seu",
"commented": "comentou em seu",
"reacted": "reagiu ao seu",
"shared": "compartilhou seu",
"tagged": "marcou voc\u00ea em um",
"updatedA": "atualizou um(a)",
"title": "Notifica\u00e7\u00f5es",
"liked": "curtiu sua",
"commented": "comentou na sua",
"reacted": "reagiu \u00e0 sua",
"shared": "compartilhou a sua",
"tagged": "marcou voc\u00ea numa publica\u00e7\u00e3o",
"updatedA": "atualizou",
"sentA": "enviou um",
"followed": "seguiu",
"mentioned": "mencionou",
"you": "voc\u00ea",
"yourApplication": "A sua candidatura para se juntar",
"applicationApproved": "foi aprovado!",
"applicationRejected": "foi rejeitado. Voc\u00ea pode se inscrever novamente para participar em 6 meses.",
"applicationApproved": "foi aprovada!",
"applicationRejected": "foi rejeitada. Voc\u00ea pode inscrever-se novamente em 6 meses.",
"dm": "mensagem direta",
"groupPost": "postagem do grupo",
"groupPost": "publica\u00e7\u00e3o de grupo",
"modlog": "hist\u00f3rico de modera\u00e7\u00e3o",
"post": "publica\u00e7\u00e3o",
"story": "hist\u00f3ria",
"noneFound": "Nenhuma notifica\u00e7\u00e3o encontrada"
"story": "est\u00f3ria",
"noneFound": "Nenhuma notifica\u00e7\u00e3o encontrada",
"youRecent": "Voc\u00ea recente",
"hasUnlisted": "foi removida da lista",
"cannotDisplay": "N\u00e3o podemos exibir esta notifica\u00e7\u00e3o no momento.",
"followRequest": "Pedidos de Seguimento",
"filteringResults": "Os resultados do filtro podem n\u00e3o incluir notifica\u00e7\u00f5es mais antigas",
"mentions": "Men\u00e7\u00f5es",
"mentionsDescription": "Respostas \u00e0s suas publica\u00e7\u00f5es e publica\u00e7\u00f5es em que voc\u00ea foi mencionado",
"likes": "Curtidas",
"likesDescription": "Contas que curtiram das suas publica\u00e7\u00f5es",
"followers": "Seguidores",
"followersDescription": "Contas que seguiram voc\u00ea",
"reblogs": "Reblogs",
"reblogsDescription": "Contas que compartilharam ou reblogaram suas publica\u00e7\u00f5es",
"dms": "DMs",
"dmsDescription": "Mensagens diretas que voc\u00ea tem com outras contas",
"accept": "Aceitar",
"reject": "Rejeitar"
},
"post": {
"shareToFollowers": "Partilhar com os seguidores",
@ -99,7 +118,24 @@
"followRequested": "Pedido para seguir enviado",
"joined": "Juntou-se",
"emptyCollections": "N\u00e3o conseguimos encontrar nenhuma cole\u00e7\u00e3o",
"emptyPosts": "N\u00e3o conseguimos encontrar nenhuma publica\u00e7\u00e3o"
"emptyPosts": "N\u00e3o conseguimos encontrar nenhuma publica\u00e7\u00e3o",
"blocking": "Voc\u00ea est\u00e1 bloqueando esta conta",
"sponsor": "Doar",
"followYou": "Segue voc\u00ea",
"archives": "Arquivados",
"bookmarks": "Favoritos",
"likes": "Curtidas",
"muted": "Silenciado",
"blocked": "Bloqueado",
"myPortifolio": "Meu Portf\u00f3lio",
"private": "Este perfil \u00e9 privado",
"public": "P\u00fablico",
"draft": "Rascunho",
"emptyLikes": "N\u00e3o conseguimos encontrar nenhuma publica\u00e7\u00e3o que voc\u00ea tenha curtido",
"emptyBookmarks": "N\u00e3o conseguimos encontrar nenhuma publica\u00e7\u00e3o nos seus favoritos",
"emptyArchives": "N\u00e3o conseguimos encontrar nenhuma publica\u00e7\u00e3o arquivada",
"untitled": "Sem t\u00edtulo",
"noDescription": "Nenhuma descri\u00e7\u00e3o dispon\u00edvel"
},
"menu": {
"viewPost": "Ver publica\u00e7\u00e3o",
@ -142,7 +178,11 @@
"embedConfirmText": "Ao usar de forma \u201cembed\u201d, voc\u00ea concorda com nossas",
"deletePostConfirm": "Tem a certeza que pretende apagar esta publica\u00e7\u00e3o?",
"archivePostConfirm": "Tem a certeza que pretende arquivar esta publica\u00e7\u00e3o?",
"unarchivePostConfirm": "Tem a certeza que pretende desarquivar este post?"
"unarchivePostConfirm": "Tem a certeza que pretende desarquivar este post?",
"pin": "Fixar",
"unpin": "Desfixar",
"pinPostConfirm": "Tem certeza de que deseja fixar esta publica\u00e7\u00e3o?",
"unpinPostConfirm": "Tem certeza de que deseja desafixar esta publica\u00e7\u00e3o?"
},
"story": {
"add": "Adicionar Story"
@ -166,5 +206,18 @@
"sendingReport": "A enviar den\u00fancia",
"thanksMsg": "Obrigado pela den\u00fancia, pessoas como voc\u00ea ajudam a manter a nossa comunidade segura!",
"contactAdminMsg": "Se quiser entrar em contato com um administrador acerca desta publica\u00e7\u00e3o ou den\u00fancia"
},
"appearance": {
"theme": "Tema",
"profileLayout": "Layout do Perfil",
"compactPreviews": "Pr\u00e9-visualiza\u00e7\u00f5es Compactas",
"loadComments": "Carregar Coment\u00e1rios",
"hideStats": "Ocultar Contagens e Estat\u00edsticas",
"auto": "Autom\u00e1tico",
"lightMode": "Modo Claro",
"darkMode": "Modo Escuro",
"grid": "Grade",
"masonry": "Mansory",
"feed": "Feed"
}
}

2
public/js/app.js vendored

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

File diff suppressed because one or more lines are too long

@ -1 +1 @@
(()=>{"use strict";var e,r,a,o={},t={};function n(e){var r=t[e];if(void 0!==r)return r.exports;var a=t[e]={id:e,loaded:!1,exports:{}};return o[e].call(a.exports,a,a.exports,n),a.loaded=!0,a.exports}n.m=o,e=[],n.O=(r,a,o,t)=>{if(!a){var c=1/0;for(f=0;f<e.length;f++){for(var[a,o,t]=e[f],d=!0,s=0;s<a.length;s++)(!1&t||c>=t)&&Object.keys(n.O).every((e=>n.O[e](a[s])))?a.splice(s--,1):(d=!1,t<c&&(c=t));if(d){e.splice(f--,1);var i=o();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]=[a,o,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 a in r)n.o(r,a)&&!n.o(e,a)&&Object.defineProperty(e,a,{enumerable:!0,get:r[a]})},n.f={},n.e=e=>Promise.all(Object.keys(n.f).reduce(((r,a)=>(n.f[a](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:"4a77f2a4e0024224",1179:"8cf1cb07ac8a9100",1240:"03a9fc477579fd24",1645:"8ebe39a19638db1b",2156:"13449036a5b769e6",2822:"38102523ebf4cde9",2966:"b783a54ac20f3e93",3688:"4e135dd1c07c17dd",4951:"fec949c588d3a0ec",6250:"295935b63f9c0971",6438:"526b66b27a0bd091",6535:"0ca404627af971f2",6740:"9621c5ecf4482f0a",6791:"c59de89c3b8e3a02",7206:"d279a2438ee20311",7342:"e160e406bdb4a1b0",7399:"f0d6ccb6f2f1cbf7",7413:"f5958c1713b4ab7c",7521:"bf787612b58e5473",7744:"a755ad4eb2972fbf",8087:"25876d18c9eeb7c6",8119:"85976a3b9d6b922a",8257:"16d96a32748daa93",8408:"48fdffa21ac83f3a",8977:"9d2008cfa13a6f17",9124:"80e32f21442c8a91",9231:"58b5bf1af4d0722e",9919:"efd3d17aee17020e"}[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={},a="pixelfed:",n.l=(e,o,t,c)=>{if(r[e])r[e].push(o);else{var d,s;if(void 0!==t)for(var i=document.getElementsByTagName("script"),f=0;f<i.length;f++){var u=i[f];if(u.getAttribute("src")==e||u.getAttribute("data-webpack")==a+t){d=u;break}}d||(s=!0,(d=document.createElement("script")).charset="utf-8",d.timeout=120,n.nc&&d.setAttribute("nonce",n.nc),d.setAttribute("data-webpack",a+t),d.src=e),r[e]=[o];var l=(a,o)=>{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(o))),a)return a(o)},p=setTimeout(l.bind(null,void 0,{type:"timeout",target:d}),12e4);d.onerror=l.bind(null,d.onerror),d.onload=l.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,a)=>{var o=n.o(e,r)?e[r]:void 0;if(0!==o)if(o)a.push(o[2]);else if(/^((69|82)52|2305|2540|3364|4370|461|8759)$/.test(r))e[r]=0;else{var t=new Promise(((a,t)=>o=e[r]=[a,t]));a.push(o[2]=t);var c=n.p+n.u(r),d=new Error;n.l(c,(a=>{if(n.o(e,r)&&(0!==(o=e[r])&&(e[r]=void 0),o)){var t=a&&("load"===a.type?"missing":a.type),c=a&&a.target&&a.target.src;d.message="Loading chunk "+r+" failed.\n("+t+": "+c+")",d.name="ChunkLoadError",d.type=t,d.request=c,o[1](d)}}),"chunk-"+r,r)}},n.O.j=r=>0===e[r];var r=(r,a)=>{var o,t,[c,d,s]=a,i=0;if(c.some((r=>0!==e[r]))){for(o in d)n.o(d,o)&&(n.m[o]=d[o]);if(s)var f=s(n)}for(r&&r(a);i<c.length;i++)t=c[i],n.o(e,t)&&e[t]&&e[t][0](),e[t]=0;return n.O(f)},a=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];a.forEach(r.bind(null,0)),a.push=r.bind(null,a.push.bind(a))})(),n.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:"4a77f2a4e0024224",1179:"8cf1cb07ac8a9100",1240:"03a9fc477579fd24",1645:"8ebe39a19638db1b",2156:"13449036a5b769e6",2822:"38102523ebf4cde9",2966:"9e342ac5d1df33af",3688:"4e135dd1c07c17dd",4951:"abfb6c7049f7833d",6250:"295935b63f9c0971",6438:"526b66b27a0bd091",6535:"0ca404627af971f2",6740:"9621c5ecf4482f0a",6791:"c59de89c3b8e3a02",7206:"d279a2438ee20311",7342:"e160e406bdb4a1b0",7399:"f0d6ccb6f2f1cbf7",7413:"f5958c1713b4ab7c",7521:"bf787612b58e5473",7744:"a8193668255b2c9a",8087:"25876d18c9eeb7c6",8119:"85976a3b9d6b922a",8257:"16d96a32748daa93",8408:"192819f7b133173e",8977:"9d2008cfa13a6f17",9124:"80e32f21442c8a91",9231:"58b5bf1af4d0722e",9919:"efd3d17aee17020e"}[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 u=i[f];if(u.getAttribute("src")==e||u.getAttribute("data-webpack")==o+t){d=u;break}}d||(s=!0,(d=document.createElement("script")).charset="utf-8",d.timeout=120,n.nc&&d.setAttribute("nonce",n.nc),d.setAttribute("data-webpack",o+t),d.src=e),r[e]=[a];var l=(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(l.bind(null,void 0,{type:"timeout",target:d}),12e4);d.onerror=l.bind(null,d.onerror),d.onload=l.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

File diff suppressed because one or more lines are too long

2
public/js/spa.js vendored

File diff suppressed because one or more lines are too long

@ -1,5 +1,5 @@
{
"/js/app.js": "/js/app.js?id=01640f9df96d57fa07a677a851e07934",
"/js/app.js": "/js/app.js?id=32db2813fed31fece75a036e7c1e10f5",
"/js/activity.js": "/js/activity.js?id=a7e66fc4edffd7ac88264ec77ecc897f",
"/js/components.js": "/js/components.js?id=9b6f094bb7d0e43a737ed1d1756f8653",
"/js/discover.js": "/js/discover.js?id=0a7264152a6fcef7a5b2a2fc5775c86c",
@ -17,7 +17,7 @@
"/js/story-compose.js": "/js/story-compose.js?id=a25351b1487264fd49458d47cd8c121f",
"/js/direct.js": "/js/direct.js?id=3e9c970e8ee5cc4e744a262b6b58339a",
"/js/admin.js": "/js/admin.js?id=4f07b4fac37aa56cf7db83f76a20d0d6",
"/js/spa.js": "/js/spa.js?id=d2af4db6988b0ef161b89809d6f41a33",
"/js/spa.js": "/js/spa.js?id=f294392686ec7102a84207cd90421448",
"/js/stories.js": "/js/stories.js?id=f5637cea14c47edfa96df7346b724236",
"/js/portfolio.js": "/js/portfolio.js?id=5f64242a8cccdeb9d0642c9216396192",
"/js/account-import.js": "/js/account-import.js?id=910fa8ccd6563f4711fa4214b00e898e",
@ -27,10 +27,10 @@
"/js/groups.js": "/js/groups.js?id=31ff019e974862dc0e565fbc3209166f",
"/js/group-status.js": "/js/group-status.js?id=c5a4b95b4b180f70fa10e01760f8c999",
"/js/group-topic-feed.js": "/js/group-topic-feed.js?id=587c552bb4d1a9f329ac5ed4a5827e61",
"/js/manifest.js": "/js/manifest.js?id=75d6e5832987e8e354fa46a56dc6aee5",
"/js/home.chunk.fec949c588d3a0ec.js": "/js/home.chunk.fec949c588d3a0ec.js?id=8c72419c75a578f6819324d508f23b4f",
"/js/manifest.js": "/js/manifest.js?id=562a659e178c10f73b4ca0053f69f7e3",
"/js/home.chunk.abfb6c7049f7833d.js": "/js/home.chunk.abfb6c7049f7833d.js?id=6e040173a4d04d35d239a59569de809f",
"/js/compose.chunk.80e32f21442c8a91.js": "/js/compose.chunk.80e32f21442c8a91.js?id=c27c7ab6f212ffbdbf58f532133ef610",
"/js/post.chunk.48fdffa21ac83f3a.js": "/js/post.chunk.48fdffa21ac83f3a.js?id=a112cbd4be2d1f768f1410865f3b16e8",
"/js/post.chunk.192819f7b133173e.js": "/js/post.chunk.192819f7b133173e.js?id=1661efd83647801e6aa5d3cebb2c57bd",
"/js/profile.chunk.25876d18c9eeb7c6.js": "/js/profile.chunk.25876d18c9eeb7c6.js?id=c4c0ef1586def4185037ff1d05c4a18e",
"/js/discover~memories.chunk.9621c5ecf4482f0a.js": "/js/discover~memories.chunk.9621c5ecf4482f0a.js?id=55e3a3786066d7e8cecc3a66a7332960",
"/js/discover~myhashtags.chunk.03a9fc477579fd24.js": "/js/discover~myhashtags.chunk.03a9fc477579fd24.js?id=76b01eea69a257b36cb046cedd1cdfba",
@ -39,12 +39,12 @@
"/js/discover~serverfeed.chunk.4e135dd1c07c17dd.js": "/js/discover~serverfeed.chunk.4e135dd1c07c17dd.js?id=52ce6ef8ca5b08628df6530abbab8d2a",
"/js/discover~settings.chunk.295935b63f9c0971.js": "/js/discover~settings.chunk.295935b63f9c0971.js?id=b74753937401ff97936daed7af0aa47f",
"/js/discover.chunk.0ca404627af971f2.js": "/js/discover.chunk.0ca404627af971f2.js?id=fb662f204f0a3d50ce8e7ee65f5499d1",
"/js/notifications.chunk.a755ad4eb2972fbf.js": "/js/notifications.chunk.a755ad4eb2972fbf.js?id=04421d6fe4bae55dd2d044eecc41eb14",
"/js/notifications.chunk.a8193668255b2c9a.js": "/js/notifications.chunk.a8193668255b2c9a.js?id=00edadf32d620edca819d5308873a4e7",
"/js/dms.chunk.13449036a5b769e6.js": "/js/dms.chunk.13449036a5b769e6.js?id=e78688a49ad274ca3bc4cc7bc54a20c4",
"/js/dms~message.chunk.f0d6ccb6f2f1cbf7.js": "/js/dms~message.chunk.f0d6ccb6f2f1cbf7.js?id=e130002bd287f084ffca6de9dd758e9d",
"/js/profile~followers.bundle.9d2008cfa13a6f17.js": "/js/profile~followers.bundle.9d2008cfa13a6f17.js?id=6e9c0c2c42d55c4c3db48aacda336e69",
"/js/profile~following.bundle.8ebe39a19638db1b.js": "/js/profile~following.bundle.8ebe39a19638db1b.js?id=239a879240723ec8cef74958f10167e9",
"/js/discover~hashtag.bundle.b783a54ac20f3e93.js": "/js/discover~hashtag.bundle.b783a54ac20f3e93.js?id=37846a632e2e99b6b401a6b9f6b4354a",
"/js/discover~hashtag.bundle.9e342ac5d1df33af.js": "/js/discover~hashtag.bundle.9e342ac5d1df33af.js?id=79c91ec5bbe1be32948a832771072017",
"/js/error404.bundle.f5958c1713b4ab7c.js": "/js/error404.bundle.f5958c1713b4ab7c.js?id=0dc878fd60f73c85280b293b6d6c091a",
"/js/i18n.bundle.85976a3b9d6b922a.js": "/js/i18n.bundle.85976a3b9d6b922a.js?id=62e1a930a6b89be0b6a72613ec578fb4",
"/js/changelog.bundle.efd3d17aee17020e.js": "/js/changelog.bundle.efd3d17aee17020e.js?id=777875be1b3bf4d1520aafc55e71c4c4",

@ -142,35 +142,7 @@
},
timeAgo(ts) {
let date = new Date(ts);
let now = new Date();
let seconds = Math.floor((now - date) / 1000);
let interval = Math.floor(seconds / 31536000);
if (interval >= 1) {
return new Intl.RelativeTimeFormat(this.$i18n.locale, { numeric: 'auto' }).format(-interval, 'year');
}
interval = Math.floor(seconds / 2592000);
if (interval >= 1) {
return new Intl.RelativeTimeFormat(this.$i18n.locale, { numeric: 'auto' }).format(-interval, 'month');
}
interval = Math.floor(seconds / 604800);
if (interval >= 1) {
return new Intl.RelativeTimeFormat(this.$i18n.locale, { numeric: 'auto' }).format(-interval, 'week');
}
interval = Math.floor(seconds / 86400);
if (interval >= 1) {
return new Intl.RelativeTimeFormat(this.$i18n.locale, { numeric: 'auto' }).format(-interval, 'day');
}
interval = Math.floor(seconds / 3600);
if (interval >= 1) {
return new Intl.RelativeTimeFormat(this.$i18n.locale, { numeric: 'auto' }).format(-interval, 'hour');
}
interval = Math.floor(seconds / 60);
if (interval >= 1) {
return new Intl.RelativeTimeFormat(this.$i18n.locale, { numeric: 'auto' }).format(-interval, 'minute');
}
return new Intl.RelativeTimeFormat(this.$i18n.locale, { numeric: 'auto' }).format(-seconds, 'second');
return App.util.format.timeAgo(ts);
},
mentionUrl(status) {

@ -151,7 +151,7 @@
</p>
</div>
</div>
<div class="small text-muted font-weight-bold" style="font-size: 0.575em;" st :title="n.created_at">{{timeAgo(n.created_at)}}</div>
<div class="small text-muted font-weight-bold" style="font-size: 12px;" :title="n.created_at">{{timeAgo(n.created_at)}}</div>
</div>
</div>

@ -96,36 +96,40 @@ window.App.util = {
}
return new Intl.NumberFormat(locale, { notation: notation , compactDisplay: "short" }).format(count);
}),
timeAgo: (function(ts) {
let date = new Date(ts);
let now = new Date();
let seconds = Math.floor((now - date) / 1000);
let interval = Math.floor(seconds / 31536000);
if (interval >= 1) {
return new Intl.RelativeTimeFormat('en', { numeric: 'auto', style: 'short' }).format(-interval, 'year');
}
interval = Math.floor(seconds / 2592000);
timeAgo: (function(ts) {
const date = new Date(ts);
const now = new Date();
const seconds = Math.floor((now - date) / 1000);
const secondsInYear = 60 * 60 * 24 * 365.25;
let interval = Math.floor(seconds / secondsInYear);
if (interval >= 1) {
return new Intl.RelativeTimeFormat('en', { numeric: 'auto', style: 'short' }).format(-interval, 'month');
return interval + "y";
}
interval = Math.floor(seconds / 604800);
interval = Math.floor(seconds / (60 * 60 * 24 * 7));
if (interval >= 1) {
return new Intl.RelativeTimeFormat('en', { numeric: 'auto', style: 'short' }).format(-interval, 'week');
return interval + "w";
}
interval = Math.floor(seconds / 86400);
interval = Math.floor(seconds / (60 * 60 * 24));
if (interval >= 1) {
return new Intl.RelativeTimeFormat('en', { numeric: 'auto', style: 'short' }).format(-interval, 'day');
return interval + "d";
}
interval = Math.floor(seconds / 3600);
interval = Math.floor(seconds / (60 * 60));
if (interval >= 1) {
return new Intl.RelativeTimeFormat('en', { numeric: 'auto', style: 'short' }).format(-interval, 'hour');
return interval + "h";
}
interval = Math.floor(seconds / 60);
if (interval >= 1) {
return new Intl.RelativeTimeFormat('en', { numeric: 'auto', style: 'short' }).format(-interval, 'minute');
return interval + "m";
}
return new Intl.RelativeTimeFormat('en', { numeric: 'auto', style: 'short' }).format(-seconds, 'second');
}),
return Math.floor(seconds) + "s";
}),
timeAhead: (function(ts, short = true) {
let date = Date.parse(ts);
let diff = date - Date.parse(new Date());

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save