From b9edb1de1529a028f6bbb0bc13ea039e9b8e44b7 Mon Sep 17 00:00:00 2001 From: Mark Nadal Date: Thu, 31 Jan 2019 04:46:34 -0800 Subject: [PATCH] party --- examples/party.html | 160 +++++++++++++++++++++++++++----------------- lib/upload.js | 3 +- 2 files changed, 99 insertions(+), 64 deletions(-) diff --git a/examples/party.html b/examples/party.html index 56573277..e466da70 100644 --- a/examples/party.html +++ b/examples/party.html @@ -38,10 +38,12 @@ ;(() => { function S(){}; window.S = S; + try{localStorage.clear();//sessionStorage.clear(); + }catch(e){} S.gun = Gun(location.host? location.origin+'/gun' : 'http://localhost:8765/gun'); //S.gun = Gun('http://localhost:8765/gun'); //S.gun = Gun(); - S.app = S.gun.get('examples/social/1'); + S.app = S.gun.get('examples/social/2'); S.user = S.gun.user(); S.tell = (what, n) => { var e = $('#tell').find('p'); @@ -530,7 +532,7 @@
  • -
    +
    • @@ -547,23 +549,33 @@ }); window.user = S.user; $('#speak').on('submit', (e) => { - /*var say = normalize($('#speak .draft')); - console.log(1, say.html()); - return;*/ - var say = $('#speak .draft').text(); + var say = $('#speak .draft').text(); //.text(); // NO NO NO NO NO if(!say){ return } - var ref = S.user.get('who').get('all').set({what: say}); - ref.get('by').put(S.user.get('who')); - S.user.get('who').get('said').time(ref); - S.gun.get('@').time(ref); + console.log('save!', say); + var ref = S.user.get('who').get('all').set({what: say, when: Gun.state()}); + //ref.get('by').put(S.user.get('who')); + //S.user.get('who').get('said').time(ref); + S.user.get('who').get('said').set(ref); + //S.gun.get('@').time(ref); $('#speak .draft').text(''); }); - S.gun.get('@').time(async (data, key, time) => { - var ref = S.gun.get(data), tmp; - var said = await ref.then(); + //S.gun.get('@').time(async (data, key, time) => { + S.user.get('who').get('said').map().once(async (data, key, time) => { + //var ref = S.gun.get(data), tmp; + //var said = await ref.then(); + key = key.replace(/[^A-Za-z]/ig,''); + var tmp, said = data, time = said.when; var $li = $($('#'+key)[0] || $('#draft .model .spoke').clone(true,true).attr('id', key)[(tmp = $.as.sort(time, $('#draft ul').children('li').first()))[0]?'insertBefore':'appendTo'](tmp[0] || '#draft ul')); - $li.find('.what').text(said.what); - var by = ref.get('by'); + tmp = said.what; + if(tmp && tmp.ct){ + tmp = JSON.stringify(tmp); + setTimeout(async function(){ + tmp = await SEA.decrypt(said.what, S.user._.sea); + $li.find('.what').text(tmp); + }, 750); + } + $li.find('.what').text(tmp); // NORMALIAZE!!! + var by = S.user.get('who');// ref.get('by'); by.get('face').get('small').on(data => { $li.find('.face').attr('src', data).removeClass('none'); }); @@ -579,7 +591,7 @@ if(face){ $li.find('.face').attr('src', face).removeClass('none'); } - }, 10); + }); $(document).on('click', '#speak .act.face', (eve) => { }); @@ -587,61 +599,80 @@ -
    +
    - + -
    - +

    Contacts

    +
      +
    +
    +
  • +
    + + +
    +
    + FB ID: +
    +
    • +
    +
    @@ -673,6 +704,7 @@

    Hello world!

    + - + + + \ No newline at end of file diff --git a/lib/upload.js b/lib/upload.js index 6cdadd21..aaacba29 100644 --- a/lib/upload.js +++ b/lib/upload.js @@ -25,9 +25,10 @@ if(!e){ return cb && cb({err: "No file!"}) } if(e.err){ return } var file = (((e.event || e).target || e).result || e), img = new Image(); + img.crossOrigin = "Anonymous"; img.src = file; img.onload = function(){ - if(img.width < w && img.height < (h||Infinity)){ + if(img.width < (w = w || 1000) && img.height < (h||Infinity) && "data:" == file.slice(0,5)){ e.base64 = file; return cb(e || file); }