aboutsummaryrefslogtreecommitdiff
path: root/libdino/src/service/database.vala
diff options
context:
space:
mode:
authorbobufa <bobufa@users.noreply.github.com>2018-07-16 21:26:39 +0200
committerbobufa <bobufa@users.noreply.github.com>2018-08-13 22:39:07 +0200
commit2e2a9a239000509488f1a369ea4eaf4cdda9c0b1 (patch)
tree8c37f732a3f6b7345a19a8e17e151991ee72d0b6 /libdino/src/service/database.vala
parent61915ca56617e8f45ae8bd85cb87f0b8a9a895b0 (diff)
downloaddino-2e2a9a239000509488f1a369ea4eaf4cdda9c0b1.tar.gz
dino-2e2a9a239000509488f1a369ea4eaf4cdda9c0b1.zip
accumulate conversation content in meta db table
Diffstat (limited to 'libdino/src/service/database.vala')
-rw-r--r--libdino/src/service/database.vala48
1 files changed, 46 insertions, 2 deletions
diff --git a/libdino/src/service/database.vala b/libdino/src/service/database.vala
index d02e4c71..01cc2f52 100644
--- a/libdino/src/service/database.vala
+++ b/libdino/src/service/database.vala
@@ -6,7 +6,7 @@ using Dino.Entities;
namespace Dino {
public class Database : Qlite.Database {
- private const int VERSION = 7;
+ private const int VERSION = 8;
public class AccountTable : Table {
public Column<int> id = new Column.Integer("id") { primary_key = true, auto_increment = true };
@@ -34,6 +34,20 @@ public class Database : Qlite.Database {
}
}
+ public class ContentTable : Table {
+ public Column<int> id = new Column.Integer("id") { primary_key = true, auto_increment = true };
+ public Column<int> conversation_id = new Column.Integer("conversation_id") { not_null = true };
+ public Column<long> time = new Column.Long("time") { not_null = true };
+ public Column<long> local_time = new Column.Long("local_time") { not_null = true };
+ public Column<int> content_type = new Column.Integer("content_type") { not_null = true };
+ public Column<int> foreign_id = new Column.Integer("foreign_id") { not_null = true };
+
+ internal ContentTable(Database db) {
+ base(db, "content");
+ init({id, conversation_id, time, local_time, content_type, foreign_id});
+ }
+ }
+
public class MessageTable : Table {
public Column<int> id = new Column.Integer("id") { primary_key = true, auto_increment = true };
public Column<string> stanza_id = new Column.Text("stanza_id");
@@ -174,6 +188,7 @@ public class Database : Qlite.Database {
public AccountTable account { get; private set; }
public JidTable jid { get; private set; }
+ public ContentTable content { get; private set; }
public MessageTable message { get; private set; }
public RealJidTable real_jid { get; private set; }
public FileTransferTable file_transfer { get; private set; }
@@ -191,6 +206,7 @@ public class Database : Qlite.Database {
base(fileName, VERSION);
account = new AccountTable(this);
jid = new JidTable(this);
+ content = new ContentTable(this);
message = new MessageTable(this);
real_jid = new RealJidTable(this);
file_transfer = new FileTransferTable(this);
@@ -199,7 +215,7 @@ public class Database : Qlite.Database {
entity_feature = new EntityFeatureTable(this);
roster = new RosterTable(this);
settings = new SettingsTable(this);
- init({ account, jid, message, real_jid, file_transfer, conversation, avatar, entity_feature, roster, settings });
+ init({ account, jid, content, message, real_jid, file_transfer, conversation, avatar, entity_feature, roster, settings });
try {
exec("PRAGMA synchronous=0");
} catch (Error e) { }
@@ -209,6 +225,24 @@ public class Database : Qlite.Database {
// new table columns are added, outdated columns are still present
if (oldVersion < 7) {
message.fts_rebuild();
+ } else if (oldVersion < 8) {
+ exec("""
+ insert into content (conversation_id, time, local_time, content_type, foreign_id)
+ select conversation.id, message.time, message.local_time, 1, message.id
+ from message join conversation on
+ message.account_id=conversation.account_id and
+ message.counterpart_id=conversation.jid_id and
+ message.type=conversation.type+1 and
+ (message.counterpart_resource=conversation.resource or message.type != 3)
+ where
+ message.body not in (select info from file_transfer where info not null) and
+ message.id not in (select info from file_transfer where info not null)
+ union
+ select conversation.id, file_transfer.time, file_transfer.local_time, 2, file_transfer.id
+ from file_transfer join conversation on
+ file_transfer.account_id=conversation.account_id and
+ file_transfer.counterpart_id=conversation.jid_id
+ order by message.local_time, message.time""");
}
}
@@ -236,6 +270,16 @@ public class Database : Qlite.Database {
}
}
+ public int add_content_item(Conversation conversation, DateTime time, DateTime local_time, int content_type, int foreign_id) {
+ return (int) content.insert()
+ .value(content.conversation_id, conversation.id)
+ .value(content.local_time, (long) local_time.to_unix())
+ .value(content.time, (long) time.to_unix())
+ .value(content.content_type, content_type)
+ .value(content.foreign_id, foreign_id)
+ .perform();
+ }
+
public Gee.List<Message> get_messages(Xmpp.Jid jid, Account account, Message.Type? type, int count, DateTime? before, DateTime? after, int id) {
QueryBuilder select = message.select()
.with(message.counterpart_id, "=", get_jid_id(jid))