anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Don't change type of a conversation

Browse source
This commit is contained in:
fiaxh 2019-05-29 16:53:34 +02:00
parent 5456a85777
commit dd6c860aed
3 changed files with 46 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libdino/src/entity/conversation.vala
View file

@ -136,7 +136,7 @@ public class Conversation : Object {
} }
public static bool equals_func(Conversation conversation1, Conversation conversation2) { public static bool equals_func(Conversation conversation1, Conversation conversation2) {
return conversation1.counterpart.equals(conversation2.counterpart) && conversation1.account.equals(conversation2.account); return conversation1.counterpart.equals(conversation2.counterpart) && conversation1.account.equals(conversation2.account) && conversation1.type_ == conversation2.type_;
} }
public static uint hash_func(Conversation conversation) { public static uint hash_func(Conversation conversation) {

7
libdino/src/service/avatar_manager.vala
View file

@ -71,7 +71,12 @@ public class AvatarManager : StreamInteractionModule, Object {
} }
public async Pixbuf? get_avatar(Account account, Jid jid) { public async Pixbuf? get_avatar(Account account, Jid jid) {
string? hash = get_avatar_hash(account, jid); Jid jid_ = jid;
if (!stream_interactor.get_module(MucManager.IDENTITY).is_groupchat_occupant(jid, account)) {
jid_ = jid.bare_jid;
}
string? hash = get_avatar_hash(account, jid_);
if (hash != null) { if (hash != null) {
return yield get_avatar_by_hash(hash); return yield get_avatar_by_hash(hash);
} }

57
libdino/src/service/conversation_manager.vala
View file

@ -14,7 +14,7 @@ public class ConversationManager : StreamInteractionModule, Object {
private StreamInteractor stream_interactor; private StreamInteractor stream_interactor;
private Database db; private Database db;
private HashMap<Account, HashMap<Jid, Conversation>> conversations = new HashMap<Account, HashMap<Jid, Conversation>>(Account.hash_func, Account.equals_func); private HashMap<Account, HashMap<Jid, Gee.List<Conversation>>> conversations = new HashMap<Account, HashMap<Jid, Gee.List<Conversation>>>(Account.hash_func, Account.equals_func);
public static void start(StreamInteractor stream_interactor, Database db) { public static void start(StreamInteractor stream_interactor, Database db) {
ConversationManager m = new ConversationManager(stream_interactor, db); ConversationManager m = new ConversationManager(stream_interactor, db);
@ -33,15 +33,19 @@ public class ConversationManager : StreamInteractionModule, Object {
public Conversation create_conversation(Jid jid, Account account, Conversation.Type? type = null) { public Conversation create_conversation(Jid jid, Account account, Conversation.Type? type = null) {
assert(conversations.has_key(account)); assert(conversations.has_key(account));
Jid store_jid = type == Conversation.Type.GROUPCHAT ? jid.bare_jid : jid; Jid store_jid = type == Conversation.Type.GROUPCHAT ? jid.bare_jid : jid;
if (conversations[account].has_key(store_jid)) {
conversations[account][store_jid].type_ = type; // Do we already have a conversation for this jid?
return conversations[account][store_jid]; foreach (var conversation in conversations[account][store_jid]) {
} else { if (conversation.type_ == type) {
Conversation conversation = new Conversation(jid, account, type); return conversation;
add_conversation(conversation); }
conversation.persist(db);
return conversation;
} }
// Create a new converation
Conversation conversation = new Conversation(jid, account, type);
add_conversation(conversation);
conversation.persist(db);
return conversation;
} }
public Conversation? get_conversation_for_message(Entities.Message message) { public Conversation? get_conversation_for_message(Entities.Message message) {
@ -68,17 +72,27 @@ public class ConversationManager : StreamInteractionModule, Object {
return ret; return ret;
} }
public Conversation? get_conversation(Jid jid, Account account) { public Conversation? get_conversation(Jid jid, Account account, Conversation.Type? type = null) {
if (conversations.has_key(account)) { if (conversations.has_key(account)) {
return conversations[account][jid]; if (conversations[account].has_key(jid)) {
foreach (var conversation in conversations[account][jid]) {
if (type == null || conversation.type_ == type) {
return conversation;
}
}
}
} }
return null; return null;
} }
public Conversation? get_conversation_by_id(int id) { public Conversation? get_conversation_by_id(int id) {
foreach (HashMap<Jid, Conversation> hm in conversations.values) { foreach (HashMap<Jid, Gee.List<Conversation>> hm in conversations.values) {
foreach (Conversation conversation in hm.values) { foreach (Gee.List<Conversation> hm2 in hm.values) {
if (conversation.id == id) return conversation; foreach (Conversation conversation in hm2) {
if (conversation.id == id) {
return conversation;
}
}
} }
} }
return null; return null;
@ -88,8 +102,10 @@ public class ConversationManager : StreamInteractionModule, Object {
Gee.List<Conversation> ret = new ArrayList<Conversation>(Conversation.equals_func); Gee.List<Conversation> ret = new ArrayList<Conversation>(Conversation.equals_func);
foreach (Account account_ in conversations.keys) { foreach (Account account_ in conversations.keys) {
if (account != null && !account_.equals(account)) continue; if (account != null && !account_.equals(account)) continue;
foreach (Conversation conversation in conversations[account_].values) { foreach (Gee.List<Conversation> list in conversations[account_].values) {
if(conversation.active) ret.add(conversation); foreach (var conversation in list) {
if(conversation.active) ret.add(conversation);
}
} }
} }
return ret; return ret;
@ -112,7 +128,7 @@ public class ConversationManager : StreamInteractionModule, Object {
} }
private void on_account_added(Account account) { private void on_account_added(Account account) {
conversations[account] = new HashMap<Jid, Conversation>(Jid.hash_func, Jid.equals_func); conversations[account] = new HashMap<Jid, ArrayList<Conversation>>(Jid.hash_func, Jid.equals_func);
foreach (Conversation conversation in db.get_conversations(account)) { foreach (Conversation conversation in db.get_conversations(account)) {
add_conversation(conversation); add_conversation(conversation);
} }
@ -153,7 +169,12 @@ public class ConversationManager : StreamInteractionModule, Object {
} }
private void add_conversation(Conversation conversation) { private void add_conversation(Conversation conversation) {
conversations[conversation.account][conversation.counterpart] = conversation; if (!conversations[conversation.account].has_key(conversation.counterpart)) {
conversations[conversation.account][conversation.counterpart] = new ArrayList<Conversation>(Conversation.equals_func);
}
conversations[conversation.account][conversation.counterpart].add(conversation);
if (conversation.active) { if (conversation.active) {
conversation_activated(conversation); conversation_activated(conversation);
} }