From 03fd7301393bb5a4ee4ee3f105af36a87cc5f201 Mon Sep 17 00:00:00 2001 From: chylex Date: Sat, 12 Feb 2022 18:37:39 +0100 Subject: [PATCH] Release v.31a (browser script) --- bld/track.js | 2 +- bld/track.user.js | 326 +++++++++++++++++++++++++--------------------- bld/viewer.html | 10 +- build.py | 4 +- 4 files changed, 193 insertions(+), 149 deletions(-) diff --git a/bld/track.js b/bld/track.js index 3a9bcf1..5b31a0f 100644 --- a/bld/track.js +++ b/bld/track.js @@ -1 +1 @@ -javascript:(function(){var e=function(){var n=function(){return t.i("messagesWrapper")},i=function(){return n().querySelector("[class*='scroller-']")},s=0,r=0;return{s:function(e){var a=function(){if(n()){let s=n().querySelector("[class*='message-']"),a=s?s.parentElement.children.length:0;a<100&&(r=0),r>0?(--r,o(750)):(a>300&&(r=6,t.o(()=>{let e=i();e.scrollTop=e.scrollHeight/2},1)),e(),o(200))}else o(500)},o=function(e){s=t.o(a,e)};a(),window.l.push(()=>window.clearInterval(s))},h:function(e){var t=Object.keys(e||{}),n=t.find(e=>e.startsWith("__reactInternalInstance"));return n?e[n].memoizedProps:(n=t.find(e=>e.startsWith("__reactProps$")),n?e[n]:null)},g:function(){try{var n,i=t.i("privateChannels");if(i){if(!((u=t.i("selected",i))&&"href"in u&&u.href.includes("/@me/")))return null;var s=u.href.split("/"),r=s[s.length-1];if(!/^\d+$/.test(r))return null;var a;for(let e of u.querySelectorAll("[class^='name-'] *")){let t=Array.prototype.find.call(e.childNodes,e=>e.nodeType===Node.TEXT_NODE);if(t){a=t.nodeValue;break}}if(!a)return null;var o=u.querySelector("img[class*='avatar']"),l=o&&o.closest("foreignObject"),c=l&&l.getAttribute("mask");n={server:a,channel:a,id:r,type:c&&c.includes("#svg-mask-avatar-default")?"GROUP":"DM",extra:{}}}else{var u=(i=document.getElementById("channels")).querySelector("[class*='modeSelected']").parentElement,d=e.h(u).children.props;if(!d)return null;var f=d.channel||d.children().props.channel;if(!f)return null;n={server:document.querySelector("nav header > h1").innerText,channel:f.name,id:f.id,type:"SERVER",extra:{position:f.position,topic:f.topic,nsfw:f.nsfw}}}return 0===n.channel.length?null:n}catch(e){return console.error(e),null}},p:function(){try{var t,n=i(),s=e.h(n);try{t=s.children.props.children.props.children.props.children.find(e=>Array.isArray(e))}catch(e){t=s.children.find(e=>Array.isArray(e))}var r=[];for(let e of t){let t=e.props;t&&t.message&&r.push(t.message)}return r}catch(e){return console.error(e),null}},v:()=>!!n(),S:function(){return null===document.querySelector("#messagesNavigationDescription + [class^=container]")},C:function(){let e=i();e.scrollTop>0&&(e.scrollTop=0)},T:function(){var e=t.i("privateChannels");if(e){var n=t.i("selected",e);return!!((l=n&&n.nextElementSibling)&&l.getAttribute("class").includes("channel-")&&"href"in l&&l.href.includes("/@me/"))&&(l.click(),l.scrollIntoView(!0),!0)}var i=e=>e.includes("wrapper-")&&!e.includes("clickable-"),s=e=>!!e.querySelector('path[d="M5.88657 21C5.57547 21 5.3399 20.7189 5.39427 20.4126L6.00001 17H2.59511C2.28449 17 2.04905 16.7198 2.10259 16.4138L2.27759 15.4138C2.31946 15.1746 2.52722 15 2.77011 15H6.35001L7.41001 9H4.00511C3.69449 9 3.45905 8.71977 3.51259 8.41381L3.68759 7.41381C3.72946 7.17456 3.93722 7 4.18011 7H7.76001L8.39677 3.41262C8.43914 3.17391 8.64664 3 8.88907 3H9.87344C10.1845 3 10.4201 3.28107 10.3657 3.58738L9.76001 7H15.76L16.3968 3.41262C16.4391 3.17391 16.6466 3 16.8891 3H17.8734C18.1845 3 18.4201 3.28107 18.3657 3.58738L17.76 7H21.1649C21.4755 7 21.711 7.28023 21.6574 7.58619L21.4824 8.58619C21.4406 8.82544 21.2328 9 20.9899 9H17.41L16.35 15H19.7549C20.0655 15 20.301 15.2802 20.2474 15.5862L20.0724 16.5862C20.0306 16.8254 19.8228 17 19.5799 17H16L15.3632 20.5874C15.3209 20.8261 15.1134 21 14.8709 21H13.8866C13.5755 21 13.3399 20.7189 13.3943 20.4126L14 17H8.00001L7.36325 20.5874C7.32088 20.8261 7.11337 21 6.87094 21H5.88657ZM9.41045 9L8.35045 15H14.3504L15.4104 9H9.41045Z"]')||!!e.querySelector('path[d="M14 8C14 7.44772 13.5523 7 13 7H9.76001L10.3657 3.58738C10.4201 3.28107 10.1845 3 9.87344 3H8.88907C8.64664 3 8.43914 3.17391 8.39677 3.41262L7.76001 7H4.18011C3.93722 7 3.72946 7.17456 3.68759 7.41381L3.51259 8.41381C3.45905 8.71977 3.69449 9 4.00511 9H7.41001L6.35001 15H2.77011C2.52722 15 2.31946 15.1746 2.27759 15.4138L2.10259 16.4138C2.04905 16.7198 2.28449 17 2.59511 17H6.00001L5.39427 20.4126C5.3399 20.7189 5.57547 21 5.88657 21H6.87094C7.11337 21 7.32088 20.8261 7.36325 20.5874L8.00001 17H14L13.3943 20.4126C13.3399 20.7189 13.5755 21 13.8866 21H14.8709C15.1134 21 15.3209 20.8261 15.3632 20.5874L16 17H19.5799C19.8228 17 20.0306 16.8254 20.0724 16.5862L20.2474 15.5862C20.301 15.2802 20.0655 15 19.7549 15H16.35L16.6758 13.1558C16.7823 12.5529 16.3186 12 15.7063 12C15.2286 12 14.8199 12.3429 14.7368 12.8133L14.3504 15H8.35045L9.41045 9H13C13.5523 9 14 8.55228 14 8Z"]'),r=e=>e.childElementCount>0&&i(e.children[0].className)&&s(e),a=document.querySelector("div[class*='sidebar'] > nav[class*='container'] > div[class*='scroller']");if(!a)return!1;for(var o=Array.prototype.filter.call(a.querySelectorAll("[class*='containerDefault']"),r),l=null,c=0;c{var s=document.createElement(e);s.id=n||"";s.innerHTML=i||"";t.appendChild(s);return s};return{id:(e,t)=>(t||document).getElementById(e),i:(e,t)=>(t||document).querySelector(`[class*="${e}-"]`),createElement:(t,n,i,s)=>e(t,n,i,s),O:e=>e.parentNode.removeChild(e),A:t=>e("style",document.head,"",t),o:(e,t)=>window.setTimeout(e,t),L:(e,t,n)=>e.addEventListener(t,n),k:(e,t,n)=>{var i=new Date(Date.now()+1e3*n).toUTCString();document.cookie=e+"="+encodeURIComponent(JSON.stringify(t))+";path=/;expires="+i},M:e=>{var t=document.cookie.replace(new RegExp("(?:(?:^|.*;\\s*)"+e+"\\s*\\=\\s*([^;]*).*$)|^.*$"),"$1");return t.length?JSON.parse(decodeURIComponent(t)):null},_:(t,n)=>{var i=new Blob([n],{type:"octet/stream"});if("msSaveBlob"in window.navigator)return window.navigator.msSaveBlob(i,t);var s=window.URL.createObjectURL(i);var r=e("a",document.body);r.href=s;r.download=t;r.style.display="none";r.click();document.body.removeChild(r);window.URL.revokeObjectURL(s)}}}(),n=function(){var e,n,r=()=>{o.N()?(e.H.U.disabled=!0,e.H.R.disabled=!0,e.H.D.disabled=!0):(e.H.U.disabled=!1,e.H.R.disabled=!1,e.H.I.disabled=e.H.D.disabled=!o.F())},l=(t,i)=>{if(e){var s="gui"===t&&"controller"===i;if(("data"===t||s)&&r(),("tracking"===t||s)&&(r(),e.H.q.innerHTML=o.N()?"Pause Tracking":"Start Tracking"),"data"===t||s){var l=0,c=0;o.F()&&(l=o.j().P(),c=o.j().W()),e.H.V.innerHTML=[l," message",1===l?"":"s"," from ",c," channel",1===c?"":"s"].join("")}}if(n&&((s="gui"===t&&"settings"===i)&&(n.H.G.checked=a.autoscroll,n.H.B[a.afterFirstMsg].checked=!0,n.H.J[a.afterSavedMsg].checked=!0),"setting"===t||s)){var u=!a.autoscroll;Object.values(n.H.B).forEach(e=>e.disabled=u),Object.values(n.H.J).forEach(e=>e.disabled=u)}},c=!1,u=function(e){c||(o.$(l),a.Z(l),c=!0),l("gui",e)},d={X:function(){(e={}).K=t.A(`\r\n#app-mount > div[class*="app-"] { margin-bottom: 48px !important; }\r\n#dht-ctrl { position: absolute; bottom: 0; width: 100%; height: 48px; background-color: #FFF; }\r\n#dht-ctrl button { height: 32px; margin: 8px 0 8px 8px; font-size: 16px; padding: 0 12px; background-color: #7289DA; color: #FFF; text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.75); }\r\n#dht-ctrl button:disabled { background-color: #7A7A7A; cursor: default; }\r\n#dht-ctrl-close { margin: 8px 8px 8px 0 !important; float: right; }\r\n#dht-ctrl p { display: inline-block; margin: 14px 12px; }\r\n#dht-ctrl input { display: none; }`);var n=(e,t)=>"";e.Y=t.createElement("div",document.body,"dht-ctrl",`\r\n${n("upload","Upload & Combine")}\r\n${n("settings","Settings")}\r\n${n("track","")}\r\n${n("download","Download")}\r\n${n("reset","Reset")}\r\n

\r\n\r\n${n("close","X")}`),e.H={U:t.id("dht-ctrl-upload"),R:t.id("dht-ctrl-settings"),q:t.id("dht-ctrl-track"),I:t.id("dht-ctrl-download"),D:t.id("dht-ctrl-reset"),ee:t.id("dht-ctrl-close"),V:t.id("dht-ctrl-status"),ne:t.id("dht-ctrl-upload-input")},t.L(e.H.U,"click",()=>{e.H.ne.click()}),t.L(e.H.R,"click",()=>{d.ie()}),t.L(e.H.q,"click",()=>{o.se(!o.N())}),t.L(e.H.I,"click",()=>{o.ae()}),t.L(e.H.D,"click",()=>{o.oe()}),t.L(e.H.ee,"click",()=>{d.le();window.l.forEach(e=>e());window.DHT_LOADED=!1}),t.L(e.H.ne,"change",()=>{Array.prototype.forEach.call(e.H.ne.files,e=>{var t=new FileReader;t.onload=function(){var n={};try{n=JSON.parse(t.result)}catch(t){return alert("Could not parse '"+e.name+"', see console for details."),void console.error(t)}i.ce(n)?o.ue(e.name,new i(n)):alert("File '"+e.name+"' has an invalid format.")};t.readAsText(e,"UTF-8")});e.H.ne.value=null}),u("controller")},le:function(){e&&(t.O(e.Y),t.O(e.K),e=null)},ie:function(){(n={}).K=t.A(`\r\n#dht-cfg-overlay { position: absolute; left: 0; top: 0; width: 100%; height: 100%; background-color: #000; opacity: 0.5; display: block; z-index: 1000; }\r\n#dht-cfg { position: absolute; left: 50%; top: 50%; width: 800px; height: 262px; margin-left: -400px; margin-top: -131px; padding: 8px; background-color: #fff; z-index: 1001; }\r\n#dht-cfg-note { margin-top: 22px; }\r\n#dht-cfg sub { color: #666; font-size: 13px; }`),n.de=t.createElement("div",document.body,"dht-cfg-overlay"),t.L(n.de,"click",()=>{d.fe()});var e=(e,t,n)=>"
";n.Y=t.createElement("div",document.body,"dht-cfg",`\r\n
\r\n
\r\n
\r\n${e("afm","nothing","Do Nothing")}\r\n${e("afm","pause","Pause Tracking")}\r\n${e("afm","switch","Switch to Next Channel")}\r\n
\r\n
\r\n${e("asm","nothing","Do Nothing")}\r\n${e("asm","pause","Pause Tracking")}\r\n${e("asm","switch","Switch to Next Channel")}\r\n

\r\nIt is recommended to disable link and image previews to avoid putting unnecessary strain on your browser.

\r\nv.31, released 3 April 2021\r\n

`),n.H={G:t.id("dht-cfg-autoscroll"),B:{},J:{}},n.H.B[s.he]=t.id("dht-cfg-afm-nothing"),n.H.B[s.ge]=t.id("dht-cfg-afm-pause"),n.H.B[s.me]=t.id("dht-cfg-afm-switch"),n.H.J[s.he]=t.id("dht-cfg-asm-nothing"),n.H.J[s.ge]=t.id("dht-cfg-asm-pause"),n.H.J[s.me]=t.id("dht-cfg-asm-switch"),n.H.G.addEventListener("change",()=>{a.autoscroll=n.H.G.checked}),Object.keys(n.H.B).forEach(e=>{t.L(n.H.B[e],"click",()=>{a.afterFirstMsg=e})}),Object.keys(n.H.J).forEach(e=>{t.L(n.H.J[e],"click",()=>{a.afterSavedMsg=e})}),u("settings")},fe:function(){n&&(t.O(n.de),t.O(n.Y),t.O(n.K),n=null)}};return d}();class i{constructor(e){var t=this;i.ce(e)||(e={meta:{},data:{}}),t.meta=e.meta,t.data=e.data,t.meta.users=t.meta.users||{},t.meta.userindex=t.meta.userindex||[],t.meta.servers=t.meta.servers||[],t.meta.channels=t.meta.channels||{},t.pe={ve:{},Se:new Set,Ce:new Set,Te:new Set}}static ce(e){return e&&"object"==typeof e.meta&&"object"==typeof e.data}ye(e,t,n,i){var s=e in this.meta.users,r=s?this.meta.users[e]:{};return r.name=t,n&&(r.tag=n),i&&(r.avatar=i),s?e in this.pe.ve?this.pe.ve[e]:this.pe.ve[e]=this.meta.userindex.findIndex(t=>t==e):(this.meta.users[e]=r,this.meta.userindex.push(e),this.pe.ve[e]=this.meta.userindex.length-1)}Oe(e,t){var n=this.meta.servers.findIndex(n=>n.name===e&&n.type===t);return-1===n?(this.meta.servers.push({name:e,type:t}),this.meta.servers.length-1):n}Ae(e,t,n,i){if(this.meta.servers[e]){var s=t in this.meta.channels,r=s?this.meta.channels[t]:{server:e};return r.name=n,i.position&&(r.position=i.position),i.topic&&(r.topic=i.topic),i.nsfw&&(r.nsfw=i.nsfw),!s&&(this.meta.channels[t]=r,this.pe.Se.add(t),!0)}}we(e,t,n){var i=this.data[e]||(this.data[e]={}),s=t in i;return i[t]=n,this.pe.Ce.add(t),!s}be(e){var t=e.author,n={u:this.ye(t.id,t.username,t.bot?null:t.discriminator,t.avatar),t:e.timestamp.toDate().getTime()};return e.content.length>0&&(n.m=e.content),null!==e.editedTimestamp&&(n.te=e.editedTimestamp.toDate().getTime()),e.embeds.length>0&&(n.e=e.embeds.map(e=>{let t={url:e.url,type:e.type};"rich"===e.type&&Array.isArray(e.title)&&1===e.title.length&&"string"==typeof e.title[0]&&(t.t=e.title[0],Array.isArray(e.description)&&1===e.description.length&&"string"==typeof e.description[0]&&(t.d=e.description[0]));return t})),e.attachments.length>0&&(n.a=e.attachments.map(e=>({url:e.url}))),null!==e.messageReference&&(n.r=e.messageReference.message_id),e.reactions.length>0&&(n.re=e.reactions.map(e=>{let t={c:e.count,n:e.emoji.name};null!==e.emoji.id&&(t.id=e.emoji.id);e.emoji.animated&&(t.an=!0);return t})),n}Le(e){return this.pe.Te.has(e)}ke(e,t){var n=!1;for(var i of t){var s=i.type;0!==s&&19!==s||"SENT"!==i.state||!this.we(e,i.id,this.be(i))||(this.pe.Te.add(i.id),n=!0)}return n}W(){return this.pe.Se.size}P(){return this.pe.Ce.size}Me(e){var t={},n=!1;for(var i in e.meta.users){var s=e.meta.users[i];t[e.meta.userindex.findIndex(e=>e==i)]=this.ye(i,s.name,s.tag,s.avatar)}for(var r in e.meta.channels){var a=e.meta.servers[e.meta.channels[r].server],o=e.meta.channels[r];this.Ae(this.Oe(a.name,a.type),r,o.name,o)}for(var r in e.data){o=e.data[r];for(var l in o){var c=o[l];(s=c.u)in t?(c.u=t[s],this.we(r,l,c)):(n||(n=!0,alert("The uploaded archive appears to be corrupted, some messages will be skipped. See console for details."),console.error("User list:",e.meta.users),console.error("User index:",e.meta.userindex),console.error("Generated mapping:",t),console.error("Missing user for the following messages:")),console.error(c))}}}_e(){return JSON.stringify({meta:this.meta,data:this.data})}}var s={he:"optNothing",ge:"optPause",me:"optSwitch"},r=!1,a=function(){var e={},n=[],i=function(){t.k("DHT_SETTINGS",e,15768e4)},a=function(e,t){for(var s of n)s(e,t);i()},o=function(e,t,n){var i="_"+t;Object.defineProperty(e,t,{get:()=>e[i],set:n=>{e[i]=n;a("setting",t)}}),e[i]=n},l=t.M("DHT_SETTINGS");return l||(l={_autoscroll:!0,_afterFirstMsg:s.ge,_afterSavedMsg:s.ge},r=!0),o(e,"autoscroll",l._autoscroll),o(e,"afterFirstMsg",l._afterFirstMsg),o(e,"afterSavedMsg",l._afterSavedMsg),e.Z=function(e){n.push(e)},r&&i(),e}(),o=function(){var e=[],n=function(t,n){for(var i of e)i(t,n)};class s{constructor(){this.oe()}oe(){this.Ne=null,this.Ue=!1,this.He=null,n("data","reset")}j(){return this.Ne||(this.Ne=new i),this.Ne}F(){return null!=this.Ne}N(){return this.Ue}se(e){this.Ue=e,n("tracking",e)}ue(e,t){this.He=e,this.j().Me(t),n("data","upload")}ae(){this.F()&&t._(this.He||"dht.txt",this.Ne._e())}Re(e,t,i,s,r){var a=this.j().Oe(e,t);!0===this.j().Ae(a,i,s,r)&&n("data","channel")}Ee(e,t){return!!this.j().ke(e,t)&&(n("data","messages"),!0)}Le(e){return this.j().Le(e)}$(t){e.push(t)}}return new s}();const l=window.location.href;if(!l.includes("discord.com/")&&!l.includes("discordapp.com/")&&!confirm("Could not detect Discord in the URL, do you want to run the script anyway?"))return;if(window.DHT_LOADED)return void alert("Discord History Tracker is already loaded.");window.DHT_LOADED=!0,window.l=[];let c=new Set,u=null,d=function(e){c.add("stopping"),t.o(()=>{o.se(!1);c.delete("stopping");e&&e()},200)};e.s(()=>{if(o.N()&&0===c.size){let n=e.g();if(!n)return void d();o.Re(n.server,n.type,n.id,n.channel,n.extra);let i=e.p();if(null==i)return void d();if(!i.length)return void e.C();let r=o.Ee(n.id,i);if(a.autoscroll){let l=null;r||o.Le(i[0].id)?e.S()||(l=a.afterFirstMsg):l=a.afterSavedMsg,null===l?r?(e.C(),window.clearTimeout(u),u=null):u=window.setTimeout(e.C,2500):(c.add("stalling"),t.o(()=>{c.delete("stalling");let t=e.g();if(t&&t.id===n.id){let t=e.p();null!=t&&o.Ee(n.id,t)}(l===s.me&&!e.T()||l===s.ge)&&o.se(!1)},250))}}}),o.$((t,n)=>{if("tracking"===t&&n){let t=e.g();if(!t)return void d(()=>alert("The selected channel is not visible in the channel list."));{let n=e.p();if(null==n)return void d(()=>alert("Cannot see any messages."));o.Re(t.server,t.type,t.id,t.channel,t.extra),o.Ee(t.id,n)}if(a.autoscroll&&e.v())if(e.S())e.C();else{let t=a.afterFirstMsg;(t===s.me&&!e.T()||t===s.ge)&&d()}}}),n.X(),r&&n.ie();})() \ No newline at end of file +javascript:(function(){var s=function(){function c(){return f.i("messagesWrapper")}function d(){return c().querySelector("[class*='scroller-']")}function i(){return c().querySelectorAll("[class*='message-']")}function e(t){var e=Object.keys(t||{}),n=e.find(t=>t.startsWith("__reactInternalInstance"));return n?t[n].memoizedProps:(n=e.find(t=>t.startsWith("__reactProps$")))?t[n]:null}function o(t){if((t=e(t)).children&&4<=t.children.length){t=t.children[3].props;if("message"in t&&"channel"in t)return t}return null}function u(){return null===document.querySelector("#messagesNavigationDescription + [class^=container]")}function h(){try{const e=[];for(const n of i()){var t=o(n);null!=t&&e.push(t.message)}return e}catch(t){return console.error(t),[]}}return{o:function(s){let a=0,i=!1,o=!1;const l=new Set,t=window.setInterval(()=>{if(0{const t=d();t.scrollTop=t.scrollHeight/2},1)}else i=!1;e=h();let t=!1;for(const n of e)if(!l.has(n.id)){t=!0;break}if(t){l.clear();for(const r of e)l.add(r.id);o=!1,s(e)}else o||u()||(o=!0,s(!1))}else a=2},200);window.l.push(()=>window.clearInterval(t))},h:e,g:function(){try{let n;for(const e of i()){var t=o(e);if(null!=t){n=t.channel;break}}if(!n)return null;var r=f.i("privateChannels");if(r){let t;for(const a of r.querySelectorAll("[class*='channel-'] [class*='selected-'] [class^='name-'] *, [class*='channel-'][class*='selected-'] [class^='name-'] *")){var s=Array.prototype.find.call(a.childNodes,t=>t.nodeType===Node.TEXT_NODE);if(s){t=s.nodeValue;break}}if(!t)return null;let e;switch(n.type){case 1:e="DM";break;case 3:e="GROUP";break;default:return null}return{server:t,channel:t,id:n.id,type:e,extra:{}}}return n.guild_id?{server:document.querySelector("nav header > h1").innerText,channel:n.name,id:n.id,type:"SERVER",extra:{position:n.position,topic:n.topic,nsfw:n.nsfw}}:null}catch(t){return console.error(t),null}},p:h,v:()=>!!c(),C:u,k:function(){let t=d();0 nav[class*='container'] > div[class*='scroller']");if(!e)return!1;for(var n=Array.prototype.filter.call(e.querySelectorAll("[class*='containerDefault']"),t=>0t.includes("wrapper-")&&!t.includes("clickable-"))(t.children[0].className)&&(t=>!!t.querySelector('path[d="M5.88657 21C5.57547 21 5.3399 20.7189 5.39427 20.4126L6.00001 17H2.59511C2.28449 17 2.04905 16.7198 2.10259 16.4138L2.27759 15.4138C2.31946 15.1746 2.52722 15 2.77011 15H6.35001L7.41001 9H4.00511C3.69449 9 3.45905 8.71977 3.51259 8.41381L3.68759 7.41381C3.72946 7.17456 3.93722 7 4.18011 7H7.76001L8.39677 3.41262C8.43914 3.17391 8.64664 3 8.88907 3H9.87344C10.1845 3 10.4201 3.28107 10.3657 3.58738L9.76001 7H15.76L16.3968 3.41262C16.4391 3.17391 16.6466 3 16.8891 3H17.8734C18.1845 3 18.4201 3.28107 18.3657 3.58738L17.76 7H21.1649C21.4755 7 21.711 7.28023 21.6574 7.58619L21.4824 8.58619C21.4406 8.82544 21.2328 9 20.9899 9H17.41L16.35 15H19.7549C20.0655 15 20.301 15.2802 20.2474 15.5862L20.0724 16.5862C20.0306 16.8254 19.8228 17 19.5799 17H16L15.3632 20.5874C15.3209 20.8261 15.1134 21 14.8709 21H13.8866C13.5755 21 13.3399 20.7189 13.3943 20.4126L14 17H8.00001L7.36325 20.5874C7.32088 20.8261 7.11337 21 6.87094 21H5.88657ZM9.41045 9L8.35045 15H14.3504L15.4104 9H9.41045Z"]')||!!t.querySelector('path[d="M14 8C14 7.44772 13.5523 7 13 7H9.76001L10.3657 3.58738C10.4201 3.28107 10.1845 3 9.87344 3H8.88907C8.64664 3 8.43914 3.17391 8.39677 3.41262L7.76001 7H4.18011C3.93722 7 3.72946 7.17456 3.68759 7.41381L3.51259 8.41381C3.45905 8.71977 3.69449 9 4.00511 9H7.41001L6.35001 15H2.77011C2.52722 15 2.31946 15.1746 2.27759 15.4138L2.10259 16.4138C2.04905 16.7198 2.28449 17 2.59511 17H6.00001L5.39427 20.4126C5.3399 20.7189 5.57547 21 5.88657 21H6.87094C7.11337 21 7.32088 20.8261 7.36325 20.5874L8.00001 17H14L13.3943 20.4126C13.3399 20.7189 13.5755 21 13.8866 21H14.8709C15.1134 21 15.3209 20.8261 15.3632 20.5874L16 17H19.5799C19.8228 17 20.0306 16.8254 20.0724 16.5862L20.2474 15.5862C20.301 15.2802 20.0655 15 19.7549 15H16.35L16.6758 13.1558C16.7823 12.5529 16.3186 12 15.7063 12C15.2286 12 14.8199 12.3429 14.7368 12.8133L14.3504 15H8.35045L9.41045 9H13C13.5523 9 14 8.55228 14 8Z"]'))(t)),r=null,s=0;s{t=document.createElement(t);return t.id=n||"",t.innerHTML=r||"",e.appendChild(t),t};return{id:(t,e)=>(e||document).getElementById(t),i:(t,e)=>(e||document).querySelector(`[class*="${t}-"]`),createElement:(t,e,n,r)=>s(t,e,n,r),L:t=>t.parentNode.removeChild(t),H:t=>s("style",document.head,"",t),T:(t,e)=>window.setTimeout(t,e),O:(t,e,n)=>t.addEventListener(e,n),M:(t,e,n)=>{n=new Date(Date.now()+1e3*n).toUTCString();document.cookie=t+"="+encodeURIComponent(JSON.stringify(e))+";path=/;expires="+n},A:t=>{t=document.cookie.replace(new RegExp("(?:(?:^|.*;\\s*)"+t+"\\s*\\=\\s*([^;]*).*$)|^.*$"),"$1");return t.length?JSON.parse(decodeURIComponent(t)):null},N:(t,e)=>{var n=new Blob([e],{type:"octet/stream"});if("msSaveBlob"in window.navigator)return window.navigator.msSaveBlob(n,t);e=window.URL.createObjectURL(n),n=s("a",document.body);n.href=e,n.download=t,n.style.display="none",n.click(),document.body.removeChild(n),window.URL.revokeObjectURL(e)}}}(),t=function(){function e(t){r||(h.D(n),u.F(n),r=!0),n("gui",t)}var i,o,l=()=>{h.R()?(i._.$.disabled=!0,i._.U.disabled=!0,i._.I.disabled=!0):(i._.$.disabled=!1,i._.U.disabled=!1,i._.j.disabled=i._.I.disabled=!h.P())},n=(t,e)=>{var n,r,s,a;i&&(s="gui"===t&&"controller"===e,"data"!==t&&!s||l(),"tracking"!==t&&!s||(l(),i._.G.innerHTML=h.R()?"Pause Tracking":"Start Tracking"),"data"!==t&&!s||(r=n=0,h.P()&&(n=h.V().J(),r=h.V().W()),i._.Z.innerHTML=[n," message",1===n?"":"s"," from ",r," channel",1===r?"":"s"].join(""))),o&&((s="gui"===t&&"settings"===e)&&(o._.B.checked=u.autoscroll,o._.q[u.afterFirstMsg].checked=!0,o._.X[u.afterSavedMsg].checked=!0),"setting"!==t&&!s||(a=!u.autoscroll,Object.values(o._.q).forEach(t=>t.disabled=a),Object.values(o._.X).forEach(t=>t.disabled=a)))},r=!1,s={K:function(){(i={}).Y=f.H(` #app-mount > div[class*="app-"] { margin-bottom: 48px !important; } #dht-ctrl { position: absolute; bottom: 0; width: 100%; height: 48px; background-color: #FFF; } #dht-ctrl button { height: 32px; margin: 8px 0 8px 8px; font-size: 16px; padding: 0 12px; background-color: #7289DA; color: #FFF; text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.75); } #dht-ctrl button:disabled { background-color: #7A7A7A; cursor: default; } #dht-ctrl-close { margin: 8px 8px 8px 0 !important; float: right; } #dht-ctrl p { display: inline-block; margin: 14px 12px; } #dht-ctrl input { display: none; }`);var t=(t,e)=>"";i.tt=f.createElement("div",document.body,"dht-ctrl",` ${t("upload","Upload & Combine")} ${t("settings","Settings")} ${t("track","")} ${t("download","Download")} ${t("reset","Reset")}

${t("close","X")}`),i._={$:f.id("dht-ctrl-upload"),U:f.id("dht-ctrl-settings"),G:f.id("dht-ctrl-track"),j:f.id("dht-ctrl-download"),I:f.id("dht-ctrl-reset"),et:f.id("dht-ctrl-close"),Z:f.id("dht-ctrl-status"),nt:f.id("dht-ctrl-upload-input")},f.O(i._.$,"click",()=>{i._.nt.click()}),f.O(i._.U,"click",()=>{s.rt()}),f.O(i._.G,"click",()=>{h.st(!h.R())}),f.O(i._.j,"click",()=>{h.at()}),f.O(i._.I,"click",()=>{h.it()}),f.O(i._.et,"click",()=>{s.ot(),window.l.forEach(t=>t()),window.DHT_LOADED=!1}),f.O(i._.nt,"change",()=>{Array.prototype.forEach.call(i._.nt.files,e=>{var n=new FileReader;n.onload=function(){var t={};try{t=JSON.parse(n.result)}catch(t){return alert("Could not parse '"+e.name+"', see console for details."),void console.error(t)}c.lt(t)?h.ct(e.name,new c(t)):alert("File '"+e.name+"' has an invalid format.")},n.readAsText(e,"UTF-8")}),i._.nt.value=null}),e("controller")},ot:function(){i&&(f.L(i.tt),f.L(i.Y),i=null)},rt:function(){(o={}).Y=f.H(` #dht-cfg-overlay { position: absolute; left: 0; top: 0; width: 100%; height: 100%; background-color: #000; opacity: 0.5; display: block; z-index: 1000; } #dht-cfg { position: absolute; left: 50%; top: 50%; width: 800px; height: 262px; margin-left: -400px; margin-top: -131px; padding: 8px; background-color: #fff; z-index: 1001; } #dht-cfg-note { margin-top: 22px; } #dht-cfg sub { color: #666; font-size: 13px; }`),o.dt=f.createElement("div",document.body,"dht-cfg-overlay"),f.O(o.dt,"click",()=>{s.ut()});var t=(t,e,n)=>"
";o.tt=f.createElement("div",document.body,"dht-cfg",`


${t("afm","nothing","Do Nothing")} ${t("afm","pause","Pause Tracking")} ${t("afm","switch","Switch to Next Channel")}

${t("asm","nothing","Do Nothing")} ${t("asm","pause","Pause Tracking")} ${t("asm","switch","Switch to Next Channel")}

It is recommended to disable link and image previews to avoid putting unnecessary strain on your browser.

v.31a, released 12 Feb 2022

`),o._={B:f.id("dht-cfg-autoscroll"),q:{},X:{}},o._.q[d.ht]=f.id("dht-cfg-afm-nothing"),o._.q[d.ft]=f.id("dht-cfg-afm-pause"),o._.q[d.gt]=f.id("dht-cfg-afm-switch"),o._.X[d.ht]=f.id("dht-cfg-asm-nothing"),o._.X[d.ft]=f.id("dht-cfg-asm-pause"),o._.X[d.gt]=f.id("dht-cfg-asm-switch"),o._.B.addEventListener("change",()=>{u.autoscroll=o._.B.checked}),Object.keys(o._.q).forEach(t=>{f.O(o._.q[t],"click",()=>{u.afterFirstMsg=t})}),Object.keys(o._.X).forEach(t=>{f.O(o._.X[t],"click",()=>{u.afterSavedMsg=t})}),e("settings")},ut:function(){o&&(f.L(o.dt),f.L(o.tt),f.L(o.Y),o=null)}};return s}();class c{constructor(t){var e=this;c.lt(t)||(t={meta:{},data:{}}),e.meta=t.meta,e.data=t.data,e.meta.users=e.meta.users||{},e.meta.userindex=e.meta.userindex||[],e.meta.servers=e.meta.servers||[],e.meta.channels=e.meta.channels||{},e.vt={wt:{},bt:new Set,Ct:new Set,kt:new Set}}static lt(t){return t&&"object"==typeof t.meta&&"object"==typeof t.data}St(e,t,n,r){var s=e in this.meta.users,a=s?this.meta.users[e]:{};return a.name=t,n&&(a.tag=n),r&&(a.avatar=r),s?e in this.vt.wt?this.vt.wt[e]:this.vt.wt[e]=this.meta.userindex.findIndex(t=>t==e):(this.meta.users[e]=a,this.meta.userindex.push(e),this.vt.wt[e]=this.meta.userindex.length-1)}yt(e,n){var t=this.meta.servers.findIndex(t=>t.name===e&&t.type===n);return-1===t?(this.meta.servers.push({name:e,type:n}),this.meta.servers.length-1):t}xt(t,e,n,r){if(this.meta.servers[t]){var s=e in this.meta.channels,t=s?this.meta.channels[e]:{server:t};return t.name=n,r.position&&(t.position=r.position),r.topic&&(t.topic=r.topic),r.nsfw&&(t.nsfw=r.nsfw),!s&&(this.meta.channels[e]=t,this.vt.bt.add(e),!0)}}Lt(t,e,n){var r=this.data[t]||(this.data[t]={}),t=e in r;return r[e]=n,this.vt.Ct.add(e),!t}Ht(t){var e=t.author,e={u:this.St(e.id,e.username,e.bot?null:e.discriminator,e.avatar),t:t.timestamp.toDate().getTime()};return 0{let e={url:t.url,type:t.type};return"rich"===t.type&&Array.isArray(t.title)&&1===t.title.length&&"string"==typeof t.title[0]&&(e.t=t.title[0],Array.isArray(t.description)&&1===t.description.length&&"string"==typeof t.description[0]&&(e.d=t.description[0])),e})),0({url:t.url}))),null!==t.messageReference&&(e.r=t.messageReference.message_id),0{let e={c:t.count,n:t.emoji.name};return null!==t.emoji.id&&(e.id=t.emoji.id),t.emoji.animated&&(e.an=!0),e})),e}Tt(t){return this.vt.kt.has(t)}Ot(t,e){var n,r=!1;for(n of e){var s=n.type;0!==s&&19!==s||"SENT"!==n.state||!this.Lt(t,n.id,this.Ht(n))||(this.vt.kt.add(n.id),r=!0)}return r}W(){return this.vt.bt.size}J(){return this.vt.Ct.size}Mt(t){var e,n,r,s={},a=!1;for(e in t.meta.users){var i=t.meta.users[e];s[t.meta.userindex.findIndex(t=>t==e)]=this.St(e,i.name,i.tag,i.avatar)}for(n in t.meta.channels){var o=t.meta.servers[t.meta.channels[n].server],l=t.meta.channels[n];this.xt(this.yt(o.name,o.type),n,l.name,l)}for(n in t.data)for(r in l=t.data[n]){var c=l[r];(i=c.u)in s?(c.u=s[i],this.Lt(n,r,c)):(a||(a=!0,alert("The uploaded archive appears to be corrupted, some messages will be skipped. See console for details."),console.error("User list:",t.meta.users),console.error("User index:",t.meta.userindex),console.error("Generated mapping:",s),console.error("Missing user for the following messages:")),console.error(c))}}At(){return JSON.stringify({meta:this.meta,data:this.data})}}var d={ht:"optNothing",ft:"optPause",gt:"optSwitch"},r=!1,u=function(){function s(){f.M("DHT_SETTINGS",e,15768e4)}function t(e,n,t){var r="_"+n;Object.defineProperty(e,n,{get:()=>e[r],set:t=>{e[r]=t,function(t,e){for(var n of a)n(t,e);s()}("setting",n)}}),e[r]=t}var e={},a=[],n=f.A("DHT_SETTINGS");return n||(n={_autoscroll:!0,_afterFirstMsg:d.ft,_afterSavedMsg:d.ft},r=!0),t(e,"autoscroll",n._autoscroll),t(e,"afterFirstMsg",n._afterFirstMsg),t(e,"afterSavedMsg",n._afterSavedMsg),e.F=function(t){a.push(t)},r&&s(),e}(),h=function(){function a(t,e){for(var n of r)n(t,e)}var r=[];return new class{constructor(){this.it()}it(){this.Nt=null,this.Dt=!1,this.Ft=null,a("data","reset")}V(){return this.Nt||(this.Nt=new c),this.Nt}P(){return null!=this.Nt}R(){return this.Dt}st(t){this.Dt=t,a("tracking",t)}ct(t,e){this.Ft=t,this.V().Mt(e),a("data","upload")}at(){this.P()&&f.N(this.Ft||"dht.txt",this.Nt.At())}Rt(t,e,n,r,s){e=this.V().yt(t,e);!0===this.V().xt(e,n,r,s)&&a("data","channel")}$t(t,e){return!!this.V().Ot(t,e)&&(a("data","messages"),!0)}Tt(t){return this.V().Tt(t)}D(t){r.push(t)}}}();const e=window.location.href;if(!e.includes("discord.com/")&&!e.includes("discordapp.com/")&&!confirm("Could not detect Discord in the URL, do you want to run the script anyway?"))return;if(window.DHT_LOADED)return void alert("Discord History Tracker is already loaded.");window.DHT_LOADED=!0,window.l=[];let a=new Set,i=null,o=function(t){a.add("stopping"),f.T(()=>{h.st(!1),a.delete("stopping"),t&&t()},200)};s.o(t=>{if(h.R()&&0===a.size){let n=s.g();if(n)if(h.Rt(n.server,n.type,n.id,n.channel,n.extra),!1===t||t.length){var r=!1!==t&&h.$t(n.id,t);if(u.autoscroll){let e=null;!1===t?e=u.afterFirstMsg:r||h.Tt(t[0].id)||(e=u.afterSavedMsg),null===e?i=r?(s.k(),window.clearTimeout(i),null):window.setTimeout(s.k,2500):(a.add("stalling"),f.T(()=>{a.delete("stalling");var t=s.g();!t||t.id!==n.id||null!=(t=s.p())&&h.$t(n.id,t),(e!==d.gt||s.S())&&e!==d.ft||h.st(!1)},250))}}else s.k();else o()}}),h.D((t,e)=>{"tracking"===t&&e&&((t=s.g())?null!=(e=s.p())?(h.Rt(t.server,t.type,t.id,t.channel,t.extra),h.$t(t.id,e),u.autoscroll&&s.v()&&(s.C()?s.k():((e=u.afterFirstMsg)!==d.gt||s.S())&&e!==d.ft||o())):o(()=>alert("Cannot see any messages.")):o(()=>alert("The selected channel is not visible in the channel list.")))}),t.K(),r&&t.rt();})() \ No newline at end of file diff --git a/bld/track.user.js b/bld/track.user.js index 90e0488..bebe3a6 100644 --- a/bld/track.user.js +++ b/bld/track.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Discord History Tracker -// @version v.31 +// @version v.31a // @license MIT // @namespace https://chylex.com // @homepageURL https://dht.chylex.com/ @@ -21,68 +21,139 @@ var DISCORD = (function(){ return getMessageOuterElement().querySelector("[class*='scroller-']"); }; - var observerTimer = 0, waitingForCleanup = 0; + var getMessageElements = function() { + return getMessageOuterElement().querySelectorAll("[class*='message-']"); + }; + + var getReactProps = function(ele) { + var keys = Object.keys(ele || {}); + var key = keys.find(key => key.startsWith("__reactInternalInstance")); + + if (key){ + return ele[key].memoizedProps; + } + + key = keys.find(key => key.startsWith("__reactProps$")); + return key ? ele[key] : null; + }; + + var getMessageElementProps = function(ele) { + const props = getReactProps(ele); + + if (props.children && props.children.length >= 4) { + const childProps = props.children[3].props; + + if ("message" in childProps && "channel" in childProps) { + return childProps; + } + } + + return null; + }; + + var hasMoreMessages = function() { + return document.querySelector("#messagesNavigationDescription + [class^=container]") === null; + }; + + var getMessages = function() { + try { + const messages = []; + + for (const ele of getMessageElements()) { + const props = getMessageElementProps(ele); + + if (props != null) { + messages.push(props.message); + } + } + + return messages; + } catch (e) { + console.error(e); + return []; + } + }; return { - /* - * Sets up a callback hook to trigger whenever the list of messages is updated. The callback is given a boolean value that is true if there are more messages to load. + /** + * Calls the provided function with a list of messages whenever the currently loaded messages change, + * or with `false` if there are no more messages. */ - setupMessageUpdateCallback: function(callback){ - var onTimerFinished = function(){ - let view = getMessageOuterElement(); + setupMessageCallback: function(callback) { + let skipsLeft = 0; + let waitForCleanup = false; + let hasReachedStart = false; + const previousMessages = new Set(); + + const intervalId = window.setInterval(() => { + if (skipsLeft > 0) { + --skipsLeft; + return; + } + + const view = getMessageOuterElement(); + + if (!view) { + skipsLeft = 2; + return; + } + + const anyMessage = DOM.queryReactClass("message", getMessageOuterElement()); + const messageCount = anyMessage ? anyMessage.parentElement.children.length : 0; + + if (messageCount > 300) { + if (waitForCleanup) { + return; + } - if (!view){ - restartTimer(500); + skipsLeft = 3; + waitForCleanup = true; + + window.setTimeout(() => { + const view = getMessageScrollerElement(); + view.scrollTop = view.scrollHeight / 2; + }, 1); } - else{ - let anyMessage = getMessageOuterElement().querySelector("[class*='message-']"); - let messages = anyMessage ? anyMessage.parentElement.children.length : 0; - - if (messages < 100){ - waitingForCleanup = 0; - } - - if (waitingForCleanup > 0){ - --waitingForCleanup; - restartTimer(750); - } - else{ - if (messages > 300){ - waitingForCleanup = 6; - - DOM.setTimer(() => { - let view = getMessageScrollerElement(); - view.scrollTop = view.scrollHeight/2; - }, 1); - } - - callback(); - restartTimer(200); + else { + waitForCleanup = false; + } + + const messages = getMessages(); + let hasChanged = false; + + for (const message of messages) { + if (!previousMessages.has(message.id)) { + hasChanged = true; + break; } } - }; - var restartTimer = function(delay){ - observerTimer = DOM.setTimer(onTimerFinished, delay); - }; + if (!hasChanged) { + if (!hasReachedStart && !hasMoreMessages()) { + hasReachedStart = true; + callback(false); + } + + return; + } - onTimerFinished(); - window.DHT_ON_UNLOAD.push(() => window.clearInterval(observerTimer)); + previousMessages.clear(); + for (const message of messages) { + previousMessages.add(message.id); + } + + hasReachedStart = false; + callback(messages); + }, 200); + + window.DHT_ON_UNLOAD.push(() => window.clearInterval(intervalId)); }, /* * Returns internal React state object of an element. */ getReactProps: function(ele){ - var keys = Object.keys(ele || {}); - var key = keys.find(key => key.startsWith("__reactInternalInstance")); - - if (key){ - return ele[key].memoizedProps; - } - - key = keys.find(key => key.startsWith("__reactProps$")); - return key ? ele[key] : null; + return getReactProps(ele); }, /* @@ -90,83 +161,75 @@ var DISCORD = (function(){ * For types DM and GROUP, the server and channel names are identical. * For SERVER type, the channel has to be in view, otherwise Discord unloads it. */ - getSelectedChannel: function(){ - try{ - var obj; - var channelListEle = DOM.queryReactClass("privateChannels"); + getSelectedChannel: function() { + try { + let obj; - if (channelListEle){ - var channel = DOM.queryReactClass("selected", channelListEle); + for (const ele of getMessageElements()) { + const props = getMessageElementProps(ele); - if (!channel || !("href" in channel) || !channel.href.includes("/@me/")){ - return null; + if (props != null) { + obj = props.channel; + break; } + } + + if (!obj) { + return null; + } + + var dms = DOM.queryReactClass("privateChannels"); + + if (dms){ + let name; - var linkSplit = channel.href.split("/"); - var link = linkSplit[linkSplit.length-1]; - - if (!(/^\d+$/.test(link))){ - return null; - } - - var name; - - for(let ele of channel.querySelectorAll("[class^='name-'] *")){ - let node = Array.prototype.find.call(ele.childNodes, node => node.nodeType === Node.TEXT_NODE); + for (const ele of dms.querySelectorAll("[class*='channel-'] [class*='selected-'] [class^='name-'] *, [class*='channel-'][class*='selected-'] [class^='name-'] *")) { + const node = Array.prototype.find.call(ele.childNodes, node => node.nodeType === Node.TEXT_NODE); - if (node){ + if (node) { name = node.nodeValue; break; } } - if (!name){ + if (!name) { return null; } - var icon = channel.querySelector("img[class*='avatar']"); - var iconParent = icon && icon.closest("foreignObject"); - var iconMask = iconParent && iconParent.getAttribute("mask"); + let type; - obj = { + // https://discord.com/developers/docs/resources/channel#channel-object-channel-types + switch (obj.type) { + case 1: type = "DM"; break; + case 3: type = "GROUP"; break; + default: return null; + } + + return { "server": name, "channel": name, - "id": link, - "type": (iconMask && iconMask.includes("#svg-mask-avatar-default")) ? "GROUP" : "DM", + "id": obj.id, + "type": type, "extra": {} }; } - else{ - channelListEle = document.getElementById("channels"); - - var channel = channelListEle.querySelector("[class*='modeSelected']").parentElement; - var props = DISCORD.getReactProps(channel).children.props; - - if (!props){ - return null; - } - - var channelObj = props.channel || props.children().props.channel; - - if (!channelObj){ - return null; - } - - obj = { + else if (obj.guild_id) { + return { "server": document.querySelector("nav header > h1").innerText, - "channel": channelObj.name, - "id": channelObj.id, + "channel": obj.name, + "id": obj.id, "type": "SERVER", "extra": { - "position": channelObj.position, - "topic": channelObj.topic, - "nsfw": channelObj.nsfw + "position": obj.position, + "topic": obj.topic, + "nsfw": obj.nsfw } }; } - - return obj.channel.length === 0 ? null : obj; - }catch(e){ + else { + return null; + } + } catch(e) { console.error(e); return null; } @@ -176,32 +239,7 @@ var DISCORD = (function(){ * Returns an array containing currently loaded messages. */ getMessages: function(){ - try{ - var scroller = getMessageScrollerElement(); - var props = DISCORD.getReactProps(scroller); - var wrappers; - - try{ - wrappers = props.children.props.children.props.children.props.children.find(ele => Array.isArray(ele)); - }catch(e){ // old version compatibility - wrappers = props.children.find(ele => Array.isArray(ele)); - } - - var messages = []; - - for(let obj of wrappers){ - let nested = obj.props; - - if (nested && nested.message){ - messages.push(nested.message); - } - } - - return messages; - }catch(e){ - console.error(e); - return null; - } + return getMessages(); }, /* @@ -213,7 +251,7 @@ var DISCORD = (function(){ * Returns true if there are more messages available or if they're still loading. */ hasMoreMessages: function(){ - return document.querySelector("#messagesNavigationDescription + [class^=container]") === null; + return hasMoreMessages(); }, /* @@ -273,11 +311,15 @@ var DISCORD = (function(){ if (nextChannel === null){ return false; } - else{ - nextChannel.children[0].click(); - nextChannel.scrollIntoView(true); - return true; + + const nextChannelLink = nextChannel.querySelector("a[href^='/channels/']"); + if (!nextChannelLink) { + return false; } + + nextChannelLink.click(); + nextChannel.scrollIntoView(true); + return true; } } }; @@ -594,7 +636,7 @@ ${radio("asm", "pause", "Pause Tracking")} ${radio("asm", "switch", "Switch to Next Channel")}

It is recommended to disable link and image previews to avoid putting unnecessary strain on your browser.

-v.31, released 3 April 2021 +v.31a, released 12 Feb 2022

`); // elements @@ -1214,7 +1256,7 @@ let stopTrackingDelayed = function(callback){ }, 200); // give the user visual feedback after clicking the button before switching off }; -DISCORD.setupMessageUpdateCallback(() => { +DISCORD.setupMessageCallback(messages => { if (STATE.isTracking() && ignoreMessageCallback.size === 0){ let info = DISCORD.getSelectedChannel(); @@ -1225,28 +1267,22 @@ DISCORD.setupMessageUpdateCallback(() => { STATE.addDiscordChannel(info.server, info.type, info.id, info.channel, info.extra); - let messages = DISCORD.getMessages(); - - if (messages == null){ - stopTrackingDelayed(); - return; - } - else if (!messages.length){ + if (messages !== false && !messages.length){ DISCORD.loadOlderMessages(); return; } - let hasUpdatedFile = STATE.addDiscordMessages(info.id, messages); + let hasUpdatedFile = messages !== false && STATE.addDiscordMessages(info.id, messages); if (SETTINGS.autoscroll){ let action = null; - if (!hasUpdatedFile && !STATE.isMessageFresh(messages[0].id)){ - action = SETTINGS.afterSavedMsg; - } - else if (!DISCORD.hasMoreMessages()){ + if (messages === false) { action = SETTINGS.afterFirstMsg; } + else if (!hasUpdatedFile && !STATE.isMessageFresh(messages[0].id)){ + action = SETTINGS.afterSavedMsg; + } if (action === null){ if (hasUpdatedFile){ diff --git a/bld/viewer.html b/bld/viewer.html index 0f05b97..9e9a651 100644 --- a/bld/viewer.html +++ b/bld/viewer.html @@ -5,7 +5,15 @@ Discord Offline History +var u=function(){function s(e){var t=e.url.lastIndexOf(".");return".png"===(t=-1===t?"":e.url.substring(t).toLowerCase())||".gif"===t||".jpg"===t||".jpeg"===t}function r(e){return(e=new Date(e)).toLocaleDateString()+", "+e.toLocaleTimeString()}function i(e){var a,t=C.i(e.replace(k,"$1"));return _.o.enableFormatting&&(a=(e,t)=>"&#"+t.charCodeAt(0)+";",t=t.replace(j,"`").replace(w,(e,t,n)=>""+n.replace(M,a)+"").replace(b,(e,t,n)=>""+n.replace(M,a)+"").replace(E,a).replace(S,e=>e.replace(/\\/g,"").replace(/(.)/g,a)).replace(f,"$1").replace(v,(e,t,n)=>"\\"===t?e:(t||"")+""+n+"").replace(g,"$1").replace(h,"$1")),e=_.o.enableAnimatedEmoji?"gif":"png","

"+(t=t.replace(y,"$1").replace(R,(e,t)=>"#"+_.l(t)+"").replace(O,(e,t)=>"@"+_.v(t)+"").replace(x,":$1:").replace(T,":$1:"))+"

"}var t,n,a,o,c,l,u,d,p,m,f=/\*\*([\s\S]+?)\*\*(?!\*)/g,v=/(.)?\*([\s\S]+?)\*(?!\*)/g,g=/__([\s\S]+?)__(?!_)/g,h=/~~([\s\S]+?)~~(?!~)/g,b=/(`+)\s*([\s\S]*?[^`])\s*\1(?!`)/g,w=/```(?:([A-z0-9\-]+?)\n+)?\n*([^]+?)\n*```/g,y=/(\b(?:https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi,k=/<(\b(?:https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])>/gi,j=/\\`/g,E=/\\([*\\])/g,S=/\\__|_\\_|\\_\\_|\\~~|~\\~|\\~\\~/g,M=/([*_~\\])/g,O=/<@!?(\d+?)>/g,R=/<#(\d+?)>/g,x=/<:([^:]+):(\d+?)>/g,T=/<a:([^:]+):(\d+?)>/g;return{g:function(){t=new A(["
","
#{name}{nsfw}{msgcount}
","{server.name} ({server.type})","
"].join("")),n=new A(["
","
{name}{msgcount}
","({server.type})","
"].join("")),a=new A(["
","
{reply}
","

{user.name}{timestamp}{edit}{jump}

","
{contents}{embeds}{attachments}
","
{reactions}
","
"].join("")),o=new A(["
","
{reply}
","
","
{avatar}
","
","

{user.name}{timestamp}{edit}{jump}

","
{contents}{embeds}{attachments}
","
{reactions}
","
","
","
"].join("")),c=new A([""].join("")),l=new A(["(image attachment not found)
"].join("")),u=new A(["
{t}

{d}

"].join("")),d=new A(["
{t}
"].join("")),p=new A(["

(Formatted embeds are currently not supported)

"].join("")),m=new A(["Download {filename}"].join("")),templateReaction=new A(["{n}{c}"].join("")),templateReactionCustom=new A([":{n}:{c}"].join(""))},h:s,k:function(e){return("SERVER"===e.server.type?t:n).apply(e,(e,t)=>{if("server.type"===e)switch(t){case"SERVER":return"server";case"GROUP":return"group";case"DM":return"user"}else if("nsfw"===e)return t?"NSFW":""})},j:function(e){return(_.o.enableUserAvatars?o:a).apply(e,(e,t)=>{if("avatar"===e)return t?c.apply(t):"";if("user.tag"===e)return t||"????";if("timestamp"===e)return r(t);if("contents"===e)return null==t||0===t.length?"":i(t);if("embeds"===e)return t?t.map(e=>{switch(e.type){case"image":return _.o.enableImagePreviews?l.apply(e):"";case"rich":return(e.t?e.d?u:d:p).apply(e)}}).join(""):"";if("attachments"===e)return t?t.map(e=>{if(s(e)&&_.o.enableImagePreviews)return l.apply(e);var t=e.url.split("/");return m.apply({url:e.url,filename:t[t.length-1]})}).join(""):"";if("edit"===e)return t?"Edited"+(1":"";if("jump"===e)return _.S?"Jump to message":"";if("reply"!==e)return"reactions"===e?null===t?"":t.map(e=>"id"in e?(e.ext=e.an&&_.o.enableAnimatedEmoji?"gif":"png",templateReactionCustom.apply(e)):templateReaction.apply(e)).join(""):void 0;if(null===t)return"";var n=""+t.user.name+"",a=_.o.enableUserAvatars&&t.avatar?""+c.apply(t.avatar)+"":"",e=t.contents?""+i(t.contents)+"":"";return"Jump to reply"+a+n+""+e})}}}(),C=function(){var a=(e,t)=>{e=document.createElement(e);return t.appendChild(e),e},t={"&":"&","<":"<",">":">",'"':""","'":"'"},n=/[&<>"']/g;return{id:(e,t)=>(t||document).getElementById(e),M:(e,t)=>Array.prototype.slice.call((t||document).getElementsByClassName(e)),tag:(e,t)=>Array.prototype.slice.call((t||document).getElementsByTagName(e)),O:(e,t)=>(t||document).getElementsByClassName(e)[0],createElement:(e,t)=>a(e,t),R:e=>e.parentNode.removeChild(e),i:e=>String(e).replace(n,e=>t[e]),T:(e,t)=>{var n=new Blob([t],{type:"octet/stream"});if("msSaveBlob"in window.navigator)return window.navigator.msSaveBlob(n,e);t=window.URL.createObjectURL(n),n=a("a",document.body);n.href=t,n.download=e,n.style.display="none",n.click(),document.body.removeChild(n),window.URL.revokeObjectURL(t)}}}(),s=function(){var t,n,a=!1;return{g:function(){a=!0,t="\n"+document.documentElement.outerHTML,C.id("btn-upload-file").insertAdjacentHTML("afterend",''),C.id("btn-embed-file").addEventListener("click",()=>function(e,t){var n=new Blob([t],{type:"octet/stream"});if("msSaveBlob"in window.navigator)return window.navigator.msSaveBlob(n,e);t=window.URL.createObjectURL(n),n=C.createElement("a",document.body);n.href=t,n.download=e,n.style.display="none",n.click(),document.body.removeChild(n),window.URL.revokeObjectURL(t)}("embed.html",n))},C:function(e){a&&(C.id("btn-embed-file").disabled=!1,n=t.replace("",`\n