diff --git a/source-linux/js/news.js b/source-linux/js/news.js index fd3524c..c4489f4 100644 --- a/source-linux/js/news.js +++ b/source-linux/js/news.js @@ -401,22 +401,22 @@ function requestConversation(login,database,newsid,contacts,rootwindow,callback) callback(news,newContacts) })} -function conversationfromdb(database,user,conversationId,callback){ - var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]); - db.transaction( function(tx) { - var newsrs=tx.executeSql('select * from news WHERE username="'+user+'" AND statusnet_conversation_id="'+conversationId+'" ORDER BY created_at ASC'); - var newsArray=[]; - var allcontacts=getAllContacts(database,user); - for(var i = 0; i < newsrs.rows.length; i++) { - newsArray.push(newsrs.rows.item(i)); - newsArray[i].statusnet_html=Qt.atob(newsArray[i].statusnet_html); - newsArray[i].text=Qt.atob(newsArray[i].text); - newsArray[i].id=newsArray[i].status_id; - newsArray[i]=fetchUsersForNews(database,user,newsArray[i],allcontacts); - if (helpernews.attachments!="" && newsArray[i].attachments!==null){newsArray[i].attachments=JSON.parse(Qt.atob(newsArray[i].attachments))}; - } - callback(newsArray)}) -} +//function conversationfromdb(database,user,conversationId,callback){ +// var db=Sql.LocalStorage.openDatabaseSync(database[0],database[1],database[2],database[3]); +// db.transaction( function(tx) { +// var newsrs=tx.executeSql('select * from news WHERE username="'+user+'" AND statusnet_conversation_id="'+conversationId+'" ORDER BY created_at ASC'); +// var newsArray=[]; +// var allcontacts=getAllContacts(database,user); +// for(var i = 0; i < newsrs.rows.length; i++) { +// newsArray.push(newsrs.rows.item(i)); +// newsArray[i].statusnet_html=Qt.atob(newsArray[i].statusnet_html); +// newsArray[i].text=Qt.atob(newsArray[i].text); +// newsArray[i].id=newsArray[i].status_id; +// newsArray[i]=fetchUsersForNews(database,user,newsArray[i],allcontacts); +// if (helpernews.attachments!="" && newsArray[i].attachments!==null){newsArray[i].attachments=JSON.parse(Qt.atob(newsArray[i].attachments))}; +// } +// callback(newsArray)}) +//} function requestFavorites(login,database,contacts,rootwindow,callback){ Helperjs.friendicaRequest(login,"/api/favorites",rootwindow, function (obj){ @@ -451,27 +451,18 @@ function chatsfromdb(database,login,messagetype,callback,stop_time){ var newsrs=tx.executeSql('select * from news WHERE username="'+login.username+'" AND statusnet_conversation_id="'+conversations[j] +'" AND messagetype="'+messagetype+'" ORDER BY created_at ASC'); //print(JSON.stringify(newsrs.rows.item(0))+JSON.stringify(newsrs.rows.item(1))) var helpernews=newsrs.rows.item(0); - helpernews.newscount=newsrs.rows.length; - helpernews=fetchUsersForNews(database,login.username,helpernews,allcontacts); - helpernews.statusnet_html=Qt.atob(helpernews.statusnet_html); - helpernews.text=Qt.atob(helpernews.text); - helpernews.id=helpernews.status_id; - helpernews.friendica_author=objFromArray(allcontacts,"url",helpernews.friendica_owner); - if (helpernews.attachments!="" && helpernews.attachments!==null){helpernews.attachments=JSON.parse(Qt.atob(helpernews.attachments))}; + helpernews=cleanhelpernews(database,login.username,helpernews,allcontacts) helpernews.currentconversation=[]; for (var h = 0;h0){var helpernews=newsrs.rows.item(0); + if(newsrs.rows.length>0){ + var helpernews=newsrs.rows.item(0); + var helpernews=cleanhelpernews(database,user,helpernews,allcontacts) + helpernews.currentconversation=[]; + for (var h = 0;h