Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Groups replies #50

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Groups replies #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c065a0d
Added replies to groups
f-r00t Aug 3, 2023
971a090
Added threads to groups
f-r00t Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 80 additions & 45 deletions src/Database.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,11 @@ async function createTables(DB) {
)`
);


// tx.executeSql(
// `DROP TABLE privateboards_messages_db`
// );

tx.executeSql(
`CREATE TABLE IF NOT EXISTS privateboards_messages_db (
board TEXT,
Expand All @@ -237,7 +242,9 @@ async function createTables(DB) {
message TEXT,
timestamp TEXT,
read BOOLEAN default 1,
UNIQUE (timestamp)
UNIQUE (timestamp),
hash TEXT UNIQUE,
reply TEXT
)`
);

Expand Down Expand Up @@ -270,9 +277,6 @@ async function createTables(DB) {
);


// tx.executeSql(
// `DROP TABLE knownTXs`
// );

tx.executeSql(
`CREATE TABLE IF NOT EXISTS knownTXs (
Expand Down Expand Up @@ -318,6 +322,22 @@ async function createTables(DB) {
latest_message INT default 0`);

}
console.log('dbVersion', dbVersion);
if (dbVersion === 6) {

tx.executeSql(
`ALTER TABLE
privateboards_messages_db
ADD
reply TEXT default ""`);

tx.executeSql(
`ALTER TABLE
privateboards_messages_db
ADD
hash TEXT default ""`);

}

/* Setup default preference values */
tx.executeSql(
Expand Down Expand Up @@ -384,7 +404,7 @@ async function createTables(DB) {


tx.executeSql(
`PRAGMA user_version = 6`
`PRAGMA user_version = 7`
);
});
}
Expand Down Expand Up @@ -573,9 +593,9 @@ export async function deleteKnownTransaction(txhash) {
}


export async function saveGroupMessage(group, type, message, timestamp, nickname, address) {

export async function saveGroupMessage(group, type, message, timestamp, nickname, address, reply, hash) {

console.log('Saving message with reply:', reply);

const read = (address == Globals.wallet.getPrimaryAddress() ? 1 : 0);

Expand All @@ -584,9 +604,9 @@ export async function saveGroupMessage(group, type, message, timestamp, nickname
await database.transaction((tx) => {
tx.executeSql(
`REPLACE INTO privateboards_messages_db
(board, type, message, timestamp, read, nickname, address, read)
(board, type, message, timestamp, read, nickname, address, read, reply, hash)
VALUES
(?, ?, ?, ?, ?, ?, ?, ?)`,
(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
[
group,
type,
Expand All @@ -595,7 +615,9 @@ export async function saveGroupMessage(group, type, message, timestamp, nickname
'false',
nickname,
address,
read
read,
reply,
hash
]
);
});
Expand Down Expand Up @@ -1013,7 +1035,7 @@ export async function getLatestGroupMessages() {
`
SELECT *
FROM privateboards_messages_db D
WHERE timestamp = (SELECT MAX(timestamp) FROM privateboards_messages_db WHERE board = D.board)
WHERE timestamp = (SELECT MAX(timestamp) FROM privateboards_messages_db WHERE board = D.board AND reply = '')
ORDER BY
timestamp
ASC
Expand All @@ -1029,7 +1051,10 @@ export async function getLatestGroupMessages() {
nickname: item.nickname,
message: item.message,
timestamp: item.timestamp,
read: item.read
read: item.read,
reply: item.reply,
hash: item.hash,

});
}
console.log(res);
Expand Down Expand Up @@ -1138,10 +1163,11 @@ export async function getGroupMessages(group=false, limit=25) {
message,
timestamp,
board,
address
address,
hash
FROM
privateboards_messages_db
${group ? 'WHERE board = "' + group + '"' : ''}
WHERE reply = '' ${group ? ' AND board = "' + group + '"' : ''}
ORDER BY
timestamp
DESC
Expand Down Expand Up @@ -1174,14 +1200,39 @@ export async function getGroupMessages(group=false, limit=25) {

for (let i = 0; i < data.rows.length; i++) {
const item = data.rows.item(i);

const [replyCount] = await database.executeSql(
`
SELECT COUNT(*) FROM privateboards_messages_db WHERE reply = "${item.hash}"
`
);

let replyCount_raw = 0;

if (replyCount && replyCount.rows && replyCount.rows.length) {

const res = [];

for (let i = 0; i < replyCount.rows.length; i++) {

const item = replyCount.rows.item(i);

replyCount_raw = item['COUNT(*)'];

}
};

res.push({
nickname: item.nickname,
type: item.type,
message: item.message,
timestamp: item.timestamp,
group: item.board,
address: item.address,
count: count_raw
hash: item.hash,
reply: item.reply,
replies: replyCount_raw,
count: count_raw,
});
}

Expand Down Expand Up @@ -1234,25 +1285,16 @@ export async function getReplies(post) {
console.log(post);

const [data] = await database.executeSql(
`SELECT
message,
address,
signature,
board,
timestamp,
nickname,
reply,
hash,
sent,
read
`SELECT *
FROM
boards_message_db WHERE reply = "${post}"
privateboards_messages_db WHERE reply = "${post}"
ORDER BY
timestamp
DESC
ASC
LIMIT
20`
);

console.log('Got ' + data.rows.length + " board messages");
if (data && data.rows && data.rows.length) {
const res = [];
Expand All @@ -1263,13 +1305,11 @@ export async function getReplies(post) {
res.push({
message: item.message,
address: item.address,
signature: item.signature,
board: item.board,
timestamp: item.timestamp,
nickname: item.nickname,
reply: item.reply,
hash: item.hash,
sent: item.sent,
type: item.type,
read: item.read
});
}
Expand Down Expand Up @@ -1342,25 +1382,22 @@ export async function getBoardsMessages(board='Home') {
return [];
}

export async function getBoardsMessage(hash) {
export async function getGroupsMessage(hash) {

const [data] = await database.executeSql(
`SELECT
nickname,
type,
message,
address,
signature,
board,
timestamp,
nickname,
reply,
board,
address,
hash,
sent,
read
reply
FROM
boards_message_db WHERE hash = '${hash}'
`
privateboards_messages_db WHERE hash = '${hash}'`
);
console.log('Got ' + data.rows.length + " board messages");

if (data && data.rows && data.rows.length) {
const res = [];

Expand All @@ -1370,14 +1407,12 @@ export async function getBoardsMessage(hash) {
res.push({
message: item.message,
address: item.address,
signature: item.signature,
board: item.board,
timestamp: item.timestamp,
nickname: item.nickname,
reply: item.reply,
hash: item.hash,
sent: item.sent,
read: item.read
sent: item.type
});
}

Expand Down
Loading
Loading