Merge branch 'clearnet' into multi-device

* clearnet:
  set active_at to now() for public channels
pull/541/head
sachaaaaa 6 years ago
commit 8df692901a

@ -815,12 +815,13 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
); );
const initConversation = async data => { const initConversation = async data => {
const { id, type, name, friendRequestStatus } = data; // eslint-disable-next-line camelcase
const { id, active_at, type, name, friendRequestStatus } = data;
await instance.run( await instance.run(
`INSERT INTO conversations ( `INSERT INTO conversations (
id, id,
json, json,
active_at,
type, type,
members, members,
name, name,
@ -828,7 +829,7 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
) values ( ) values (
$id, $id,
$json, $json,
$active_at,
$type, $type,
$members, $members,
$name, $name,
@ -837,7 +838,7 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
{ {
$id: id, $id: id,
$json: objectToJSON(data), $json: objectToJSON(data),
$active_at: active_at,
$type: type, $type: type,
$members: null, $members: null,
$name: name, $name: name,
@ -854,6 +855,7 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
console.log('lokiPublicServerData', lokiPublicServerData); console.log('lokiPublicServerData', lokiPublicServerData);
const baseData = { const baseData = {
active_at: Date.now(),
friendRequestStatus: 4, // Friends friendRequestStatus: 4, // Friends
sealedSender: 0, sealedSender: 0,
sessionResetStatus: 0, sessionResetStatus: 0,

Loading…
Cancel
Save