Andromeda/jank-client-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed replies multi-lined

Browse source
This commit is contained in:
MathMan05 2024-06-28 14:47:07 -05:00
parent d01e3d57a2
commit f6bd7423d3
9 changed files with 97 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.dist/embed.js
View file

@ -178,14 +178,14 @@ class Embed {
const description = document.createElement("p"); const description = document.createElement("p");
description.textContent = this.json.description; description.textContent = this.json.description;
div.append(description); div.append(description);
{ if (this.json.thumbnail) {
const img = document.createElement("img"); const img = document.createElement("img");
img.classList.add("bigembedimg"); img.classList.add("bigembedimg");
img.onclick = function () { img.onclick = function () {
const full = new Fullscreen(["img", img.src, ["fit"]]); const full = new Fullscreen(["img", img.src, ["fit"]]);
full.show(); full.show();
}; };
img.src = this.json.thumbnail.proxy_url; img.src = this.json.thumbnail.proxy_url || this.json.thumbnail.url;
div.append(img); div.append(img);
} }
colordiv.append(div); colordiv.append(div);

2
.dist/localuser.js
View file

@ -221,7 +221,7 @@ class Localuser {
clearInterval(this.wsinterval); clearInterval(this.wsinterval);
console.log('WebSocket closed'); console.log('WebSocket closed');
console.warn(event); console.warn(event);
if (event.code !== 4000 && this === this) { if (event.code !== 4000) {
this.unload(); this.unload();
document.getElementById("loading").classList.remove("doneloading"); document.getElementById("loading").classList.remove("doneloading");
document.getElementById("loading").classList.add("loading"); document.getElementById("loading").classList.add("loading");

35
.dist/markdown.js
View file

@ -1,5 +1,5 @@
export { markdown }; export { markdown };
function markdown(text, keep = false) { function markdown(text, { keep = false, stdsize = false } = {}) {
let txt; let txt;
if ((typeof txt) === "string") { if ((typeof txt) === "string") {
txt = text.split(""); txt = text.split("");
@ -55,17 +55,20 @@ function markdown(text, keep = false) {
} }
if (keepys) { if (keepys) {
appendcurrent(); appendcurrent();
if (!first) { if (!first && !stdsize) {
span.appendChild(document.createElement("br")); span.appendChild(document.createElement("br"));
} }
const build = []; const build = [];
for (; txt[i] !== "\n" && txt[i] !== undefined; i++) { for (; txt[i] !== "\n" && txt[i] !== undefined; i++) {
build.push(txt[i]); build.push(txt[i]);
} }
if (stdsize) {
element = document.createElement("span");
}
if (keep) { if (keep) {
element.append(keepys); element.append(keepys);
} }
element.appendChild(markdown(build, keep)); element.appendChild(markdown(build, { keep: keep, stdsize: stdsize }));
span.append(element); span.append(element);
i--; i--;
continue; continue;
@ -76,7 +79,15 @@ function markdown(text, keep = false) {
} }
if (txt[i] === "\n") { if (txt[i] === "\n") {
appendcurrent(); appendcurrent();
if (!stdsize) {
span.append(document.createElement("br")); span.append(document.createElement("br"));
}
else {
const s = document.createElement("span");
s.textContent = "...";
span.append(s);
return span;
}
continue; continue;
} }
if (txt[i] === "`") { if (txt[i] === "`") {
@ -121,7 +132,7 @@ function markdown(text, keep = false) {
if (keep) { if (keep) {
build += "`".repeat(find); build += "`".repeat(find);
} }
if (count !== 3) { if (count !== 3 && !stdsize) {
const samp = document.createElement("samp"); const samp = document.createElement("samp");
samp.textContent = build; samp.textContent = build;
span.appendChild(samp); span.appendChild(samp);
@ -173,7 +184,7 @@ function markdown(text, keep = false) {
if (keep) { if (keep) {
i.append(stars); i.append(stars);
} }
i.appendChild(markdown(build, keep)); i.appendChild(markdown(build, { keep: keep, stdsize: stdsize }));
if (keep) { if (keep) {
i.append(stars); i.append(stars);
} }
@ -184,7 +195,7 @@ function markdown(text, keep = false) {
if (keep) { if (keep) {
b.append(stars); b.append(stars);
} }
b.appendChild(markdown(build, keep)); b.appendChild(markdown(build, { keep: keep, stdsize: stdsize }));
if (keep) { if (keep) {
b.append(stars); b.append(stars);
} }
@ -196,7 +207,7 @@ function markdown(text, keep = false) {
if (keep) { if (keep) {
b.append(stars); b.append(stars);
} }
b.appendChild(markdown(build, keep)); b.appendChild(markdown(build, { keep: keep, stdsize: stdsize }));
if (keep) { if (keep) {
b.append(stars); b.append(stars);
} }
@ -239,7 +250,7 @@ function markdown(text, keep = false) {
if (keep) { if (keep) {
i.append(underscores); i.append(underscores);
} }
i.appendChild(markdown(build, keep)); i.appendChild(markdown(build, { keep: keep, stdsize: stdsize }));
if (keep) { if (keep) {
i.append(underscores); i.append(underscores);
} }
@ -250,7 +261,7 @@ function markdown(text, keep = false) {
if (keep) { if (keep) {
u.append(underscores); u.append(underscores);
} }
u.appendChild(markdown(build, keep)); u.appendChild(markdown(build, { keep: keep, stdsize: stdsize }));
if (keep) { if (keep) {
u.append(underscores); u.append(underscores);
} }
@ -262,7 +273,7 @@ function markdown(text, keep = false) {
if (keep) { if (keep) {
i.append(underscores); i.append(underscores);
} }
i.appendChild(markdown(build, keep)); i.appendChild(markdown(build, { keep: keep, stdsize: stdsize }));
if (keep) { if (keep) {
i.append(underscores); i.append(underscores);
} }
@ -299,7 +310,7 @@ function markdown(text, keep = false) {
if (keep) { if (keep) {
s.append(underscores); s.append(underscores);
} }
s.appendChild(markdown(build, keep)); s.appendChild(markdown(build, { keep: keep, stdsize: stdsize }));
if (keep) { if (keep) {
s.append(underscores); s.append(underscores);
} }
@ -334,7 +345,7 @@ function markdown(text, keep = false) {
if (keep) { if (keep) {
j.append(underscores); j.append(underscores);
} }
j.appendChild(markdown(build, keep)); j.appendChild(markdown(build, { keep: keep, stdsize: stdsize }));
j.classList.add("spoiler"); j.classList.add("spoiler");
j.onclick = markdown.unspoil; j.onclick = markdown.unspoil;
if (keep) { if (keep) {

2
.dist/message.js
View file

@ -197,7 +197,7 @@ class Message {
replyline.classList.add("replyflex"); replyline.classList.add("replyflex");
fetch(this.info.api.toString() + "/v9/channels/" + this.message_reference.channel_id + "/messages?limit=1&around=" + this.message_reference.message_id, { headers: this.headers }).then(responce => responce.json()).then(responce => { fetch(this.info.api.toString() + "/v9/channels/" + this.message_reference.channel_id + "/messages?limit=1&around=" + this.message_reference.message_id, { headers: this.headers }).then(responce => responce.json()).then(responce => {
const author = new User(responce[0].author, this.localuser); const author = new User(responce[0].author, this.localuser);
reply.appendChild(markdown(responce[0].content)); reply.appendChild(markdown(responce[0].content, { stdsize: true }));
minipfp.src = author.getpfpsrc(); minipfp.src = author.getpfpsrc();
author.profileclick(minipfp); author.profileclick(minipfp);
username.textContent = author.username; username.textContent = author.username;

4
webpage/embed.ts
View file

@ -184,14 +184,14 @@ class Embed{
description.textContent=this.json.description; description.textContent=this.json.description;
div.append(description); div.append(description);
{ if(this.json.thumbnail){
const img=document.createElement("img"); const img=document.createElement("img");
img.classList.add("bigembedimg"); img.classList.add("bigembedimg");
img.onclick=function(){ img.onclick=function(){
const full=new Fullscreen(["img",img.src,["fit"]]); const full=new Fullscreen(["img",img.src,["fit"]]);
full.show(); full.show();
} }
img.src=this.json.thumbnail.proxy_url; img.src=this.json.thumbnail.proxy_url||this.json.thumbnail.url;
div.append(img); div.append(img);
} }
colordiv.append(div); colordiv.append(div);

2
webpage/localuser.ts
View file

@ -229,7 +229,7 @@ class Localuser{
clearInterval(this.wsinterval); clearInterval(this.wsinterval);
console.log('WebSocket closed'); console.log('WebSocket closed');
console.warn(event); console.warn(event);
if(event.code!==4000&&this===this){ if(event.code!==4000){
this.unload(); this.unload();
document.getElementById("loading").classList.remove("doneloading"); document.getElementById("loading").classList.remove("doneloading");
document.getElementById("loading").classList.add("loading"); document.getElementById("loading").classList.add("loading");

34
webpage/markdown.ts
View file

@ -1,5 +1,5 @@
export {markdown}; export {markdown};
function markdown(text : string|string[],keep=false){ function markdown(text : string|string[],{keep=false,stdsize=false} = {}){
let txt : string[]; let txt : string[];
if((typeof txt)==="string"){ if((typeof txt)==="string"){
txt=(text as string).split(""); txt=(text as string).split("");
@ -53,17 +53,20 @@ function markdown(text : string|string[],keep=false){
} }
if(keepys){ if(keepys){
appendcurrent(); appendcurrent();
if(!first){ if(!first&&!stdsize){
span.appendChild(document.createElement("br")); span.appendChild(document.createElement("br"));
} }
const build=[]; const build=[];
for(;txt[i]!=="\n"&&txt[i]!==undefined;i++){ for(;txt[i]!=="\n"&&txt[i]!==undefined;i++){
build.push(txt[i]); build.push(txt[i]);
} }
if(stdsize){
element=document.createElement("span");
}
if(keep){ if(keep){
element.append(keepys); element.append(keepys);
} }
element.appendChild(markdown(build,keep)); element.appendChild(markdown(build,{keep:keep,stdsize:stdsize}));
span.append(element); span.append(element);
i--; i--;
continue; continue;
@ -74,7 +77,14 @@ function markdown(text : string|string[],keep=false){
} }
if(txt[i]==="\n"){ if(txt[i]==="\n"){
appendcurrent(); appendcurrent();
if(!stdsize){
span.append(document.createElement("br")); span.append(document.createElement("br"));
}else{
const s=document.createElement("span");
s.textContent="...";
span.append(s);
return span;
}
continue; continue;
} }
if(txt[i]==="`"){ if(txt[i]==="`"){
@ -118,7 +128,7 @@ function markdown(text : string|string[],keep=false){
if(keep){ if(keep){
build+="`".repeat(find); build+="`".repeat(find);
} }
if(count!==3){ if(count!==3&&!stdsize){
const samp=document.createElement("samp"); const samp=document.createElement("samp");
samp.textContent=build; samp.textContent=build;
span.appendChild(samp); span.appendChild(samp);
@ -169,20 +179,20 @@ function markdown(text : string|string[],keep=false){
if(count===1){ if(count===1){
const i=document.createElement("i"); const i=document.createElement("i");
if(keep){i.append(stars)} if(keep){i.append(stars)}
i.appendChild(markdown(build,keep)); i.appendChild(markdown(build,{keep:keep,stdsize:stdsize}));
if(keep){i.append(stars)} if(keep){i.append(stars)}
span.appendChild(i); span.appendChild(i);
}else if(count===2){ }else if(count===2){
const b=document.createElement("b"); const b=document.createElement("b");
if(keep){b.append(stars)} if(keep){b.append(stars)}
b.appendChild(markdown(build,keep)); b.appendChild(markdown(build,{keep:keep,stdsize:stdsize}));
if(keep){b.append(stars)} if(keep){b.append(stars)}
span.appendChild(b); span.appendChild(b);
}else{ }else{
const b=document.createElement("b"); const b=document.createElement("b");
const i=document.createElement("i"); const i=document.createElement("i");
if(keep){b.append(stars)} if(keep){b.append(stars)}
b.appendChild(markdown(build,keep)); b.appendChild(markdown(build,{keep:keep,stdsize:stdsize}));
if(keep){b.append(stars)} if(keep){b.append(stars)}
i.appendChild(b); i.appendChild(b);
span.appendChild(i); span.appendChild(i);
@ -222,20 +232,20 @@ function markdown(text : string|string[],keep=false){
if(count===1){ if(count===1){
const i=document.createElement("i"); const i=document.createElement("i");
if(keep){i.append(underscores)} if(keep){i.append(underscores)}
i.appendChild(markdown(build,keep)); i.appendChild(markdown(build,{keep:keep,stdsize:stdsize}));
if(keep){i.append(underscores)} if(keep){i.append(underscores)}
span.appendChild(i); span.appendChild(i);
}else if(count===2){ }else if(count===2){
const u=document.createElement("u"); const u=document.createElement("u");
if(keep){u.append(underscores)} if(keep){u.append(underscores)}
u.appendChild(markdown(build,keep)); u.appendChild(markdown(build,{keep:keep,stdsize:stdsize}));
if(keep){u.append(underscores)} if(keep){u.append(underscores)}
span.appendChild(u); span.appendChild(u);
}else{ }else{
const u=document.createElement("u"); const u=document.createElement("u");
const i=document.createElement("i"); const i=document.createElement("i");
if(keep){i.append(underscores)} if(keep){i.append(underscores)}
i.appendChild(markdown(build,keep)); i.appendChild(markdown(build,{keep:keep,stdsize:stdsize}));
if(keep){i.append(underscores)} if(keep){i.append(underscores)}
u.appendChild(i) u.appendChild(i)
span.appendChild(u); span.appendChild(u);
@ -268,7 +278,7 @@ function markdown(text : string|string[],keep=false){
if(count===2){ if(count===2){
const s=document.createElement("s"); const s=document.createElement("s");
if(keep){s.append(underscores)} if(keep){s.append(underscores)}
s.appendChild(markdown(build,keep)); s.appendChild(markdown(build,{keep:keep,stdsize:stdsize}));
if(keep){s.append(underscores)} if(keep){s.append(underscores)}
span.appendChild(s); span.appendChild(s);
} }
@ -298,7 +308,7 @@ function markdown(text : string|string[],keep=false){
if(count===2){ if(count===2){
const j=document.createElement("j"); const j=document.createElement("j");
if(keep){j.append(underscores)} if(keep){j.append(underscores)}
j.appendChild(markdown(build,keep)); j.appendChild(markdown(build,{keep:keep,stdsize:stdsize}));
j.classList.add("spoiler"); j.classList.add("spoiler");
j.onclick=markdown.unspoil; j.onclick=markdown.unspoil;
if(keep){j.append(underscores)} if(keep){j.append(underscores)}

2
webpage/message.ts
View file

@ -202,7 +202,7 @@ class Message{
fetch(this.info.api.toString()+"/v9/channels/"+this.message_reference.channel_id+"/messages?limit=1&around="+this.message_reference.message_id,{headers:this.headers}).then(responce=>responce.json()).then(responce=>{ fetch(this.info.api.toString()+"/v9/channels/"+this.message_reference.channel_id+"/messages?limit=1&around="+this.message_reference.message_id,{headers:this.headers}).then(responce=>responce.json()).then(responce=>{
const author=new User(responce[0].author,this.localuser); const author=new User(responce[0].author,this.localuser);
reply.appendChild(markdown(responce[0].content)); reply.appendChild(markdown(responce[0].content,{stdsize:true}));
minipfp.src=author.getpfpsrc() minipfp.src=author.getpfpsrc()
author.profileclick(minipfp) author.profileclick(minipfp)

45
webpage/style.css
View file

@ -57,7 +57,12 @@ th {
.messagediv:hover { .messagediv:hover {
background-color: var(--message-bg-hover); background-color: var(--message-bg-hover);
} }
.messagediv{
overflow: hidden;
max-width:100%;
/* width: 9%; */
/* display: inline-block; */
}
pre { pre {
background-color: var(--code-bg); background-color: var(--code-bg);
width: 100%; width: 100%;
@ -225,10 +230,11 @@ img {
height: 100%; height: 100%;
width: 100%; width: 100%;
display: inline-block; display: inline-block;
max-width: 100%;
} }
#messages { #messages {
width: 100%; max-width: 100%;
} }
p { p {
@ -448,15 +454,25 @@ p {
} }
.replyflex { .replyflex {
overflow: hidden;
display: flex; display: flex;
align-items: center; align-items: center;
max-width: 100%;
flex-direction: row;
/* width: 00; */
flex-wrap: nowrap;
justify-content: space-between;
} }
.reply { .reply {
display: inline-block; display: inline;
vertical-align: middle; vertical-align: middle;
flex-grow: 1; flex-grow: 1;
border-color: var(--reply-border); border-color: var(--reply-border);
/* flex: 1; */
min-width: 0px;
/* max-width: 0px; */
/* grid-column-end: 1; */
} }
.startreply { .startreply {
@ -477,8 +493,20 @@ p {
} }
.replytext { .replytext {
padding: .05in; padding: 0 .05in;
color: var(--reply-text); color: var(--reply-text);
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
max-width: fit-content;
/* display: block; */
/* flex-grow: 1; */
flex: 1 1 auto;
width: fit-content;
min-width: 0;
/* display: inline-block !important; */
width: 25vw;
grid-column: 2;
} }
::-webkit-scrollbar { ::-webkit-scrollbar {
@ -765,6 +793,9 @@ input[type="checkbox"] {
span { span {
word-wrap: break-word; word-wrap: break-word;
word-break: break-word; word-break: break-word;
/* overflow: clip; */
/* width: 2in; */
/* max-width: 100%; */
} }
#loading { #loading {
@ -988,3 +1019,9 @@ span {
border:solid black .03in; border:solid black .03in;
margin-left:.025in; margin-left:.025in;
} }
.replyflex span{
/* display: inline-block; */
text-overflow:ellipsis;
overflow: hidden;
max-width: 100%;
}