Infra-Mirrors/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2025-05-02 06:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixing async comment nicknames

Browse source
This commit is contained in:
El RIDO 2018-10-20 13:54:17 +02:00
parent a08fed1add
commit 2929d5c17a
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
js/privatebin.js
View file

@ -4251,19 +4251,25 @@ jQuery.PrivateBin = (function($, sjcl, RawDeflate) {
// iterate over comments
for (var i = 0; i < paste.comments.length; ++i) {
commentDecryptionPromises.push(
CryptTool.decipher(key, password, paste.comments[i].data)
Promise.all([
CryptTool.decipher(key, password, paste.comments[i].data),
paste.comments[i].meta.nickname ?
CryptTool.decipher(key, password, paste.comments[i].meta.nickname) :
Promise.resolve('')
])
);
}
return Promise.all(commentDecryptionPromises).then((plaintexts) => {
for (var i = 0; i < paste.comments.length; ++i) {
if (plaintexts[i] === false) {
if (plaintexts[i][0].length === 0) {
continue;
}
var comment = paste.comments[i];
console.log(plaintexts);
DiscussionViewer.addComment(
comment,
plaintexts[i],
comment.meta.nickname ? CryptTool.decipher(key, password, comment.meta.nickname) : ''
plaintexts[i][0],
plaintexts[i][1]
);
}
DiscussionViewer.finishDiscussion();
@ -4334,14 +4340,14 @@ jQuery.PrivateBin = (function($, sjcl, RawDeflate) {
decrytionPromises.push(decryptPaste(paste, key, password))
}
// shows the remaining time (until) deletion
PasteStatus.showRemainingTime(paste.meta);
// if the discussion is opened on this paste, display it
if (paste.meta.opendiscussion) {
decrytionPromises.push(decryptComments(paste, key, password));
}
// shows the remaining time (until) deletion
PasteStatus.showRemainingTime(paste.meta);
Promise.all(decrytionPromises).then(() => {
Alert.hideLoading();
TopNav.showViewButtons();