|
1 | 1 | // noinspection DuplicatedCode |
2 | 2 |
|
3 | 3 | /** |
4 | | - * NodeJS SSB |
| 4 | + * NodeJS DB1 SSB |
5 | 5 | * |
6 | 6 | * Things I don't currently like here: |
7 | 7 | * - usage of getPref and abuse prevention. This should be pluggable! |
@@ -38,7 +38,7 @@ let isMessageHidden = () => false |
38 | 38 | /** |
39 | 39 | * NodeJS SSB Server compatible implementation of high-level SSB API for Patchfox. |
40 | 40 | */ |
41 | | -class NodeJsSSB { |
| 41 | +class NodeJsDB1 { |
42 | 42 | constructor() { |
43 | 43 | this.platform = "nodejs-db1" |
44 | 44 |
|
@@ -437,38 +437,19 @@ class NodeJsSSB { |
437 | 437 | }) |
438 | 438 | } |
439 | 439 |
|
440 | | - async avatar(feed) { |
441 | | - const avatarPromise = key => { |
442 | | - return new Promise((resolve, reject) => { |
443 | | - ssbAvatar(sbot, sbot.id, key, function (err, data) { |
444 | | - if (err) { |
445 | | - reject(err) |
446 | | - } else if (data) { |
447 | | - resolve(data) |
448 | | - } else { |
449 | | - reject("unknown error") |
450 | | - } |
451 | | - }) |
| 440 | + avatar(feed) { |
| 441 | + return new Promise((resolve, reject) => { |
| 442 | + ssbAvatar(sbot, sbot.id, feed, function (err, data) { |
| 443 | + if (err) { |
| 444 | + reject(err) |
| 445 | + } else if (data) { |
| 446 | + setAvatarCache(feed, data) |
| 447 | + resolve(data) |
| 448 | + } else { |
| 449 | + reject("unknown error") |
| 450 | + } |
452 | 451 | }) |
453 | | - } |
454 | | - |
455 | | - const getAvatarAux = async feed => { |
456 | | - let avatar = await avatarPromise(feed) |
457 | | - // await this.setAvatarCache(feed, avatar) |
458 | | - setAvatarCache(feed, avatar) |
459 | | - localStorage.setItem(`profile-${feed}`, JSON.stringify(avatar)) |
460 | | - return avatar |
461 | | - } |
462 | | - |
463 | | - if (getCachedAvatar(feed)) { |
464 | | - setTimeout(() => { |
465 | | - getAvatarAux(feed) |
466 | | - m.redraw() |
467 | | - }, 300) // update cache... |
468 | | - return getCachedAvatar(feed) |
469 | | - } |
470 | | - |
471 | | - return getAvatarAux(feed) |
| 452 | + }) |
472 | 453 | } |
473 | 454 |
|
474 | 455 | async blurbFromMsg(msgid, howManyChars) { |
@@ -1645,4 +1626,4 @@ class NodeJsSSB { |
1645 | 1626 | } |
1646 | 1627 | } |
1647 | 1628 |
|
1648 | | -module.exports.NodeJsSSB = NodeJsSSB |
| 1629 | +module.exports.NodeJsDB1 = NodeJsDB1 |
0 commit comments