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

Remove invalid MUC avatars

Browse source
This commit is contained in:
fiaxh 2019-05-29 16:52:36 +02:00
parent 6a1f057de2
commit 5456a85777
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libdino/src/application.vala
View file

@ -26,15 +26,15 @@ public interface Dino.Application : GLib.Application {
this.settings = new Dino.Entities.Settings.from_db(db); this.settings = new Dino.Entities.Settings.from_db(db);
this.stream_interactor = new StreamInteractor(db); this.stream_interactor = new StreamInteractor(db);
AvatarManager.start(stream_interactor, db);
MessageProcessor.start(stream_interactor, db); MessageProcessor.start(stream_interactor, db);
MessageStorage.start(stream_interactor, db); MessageStorage.start(stream_interactor, db);
CounterpartInteractionManager.start(stream_interactor); CounterpartInteractionManager.start(stream_interactor);
PresenceManager.start(stream_interactor); PresenceManager.start(stream_interactor);
BlockingManager.start(stream_interactor); BlockingManager.start(stream_interactor);
MucManager.start(stream_interactor);
RosterManager.start(stream_interactor, db);
ConversationManager.start(stream_interactor, db); ConversationManager.start(stream_interactor, db);
MucManager.start(stream_interactor);
AvatarManager.start(stream_interactor, db);
RosterManager.start(stream_interactor, db);
ChatInteraction.start(stream_interactor); ChatInteraction.start(stream_interactor);
FileManager.start(stream_interactor, db); FileManager.start(stream_interactor, db);
ContentItemStore.start(stream_interactor, db); ContentItemStore.start(stream_interactor, db);

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

@ -53,6 +53,8 @@ public class AvatarManager : StreamInteractionModule, Object {
Pixbuf? image = yield avatar_storage.get_image(hash); Pixbuf? image = yield avatar_storage.get_image(hash);
if (image != null) { if (image != null) {
cached_pixbuf[hash] = image; cached_pixbuf[hash] = image;
} else {
db.avatar.delete().with(db.avatar.hash, "=", hash).perform();
} }
return image; return image;
} }
@ -77,15 +79,11 @@ public class AvatarManager : StreamInteractionModule, Object {
} }
private string? get_avatar_hash(Account account, Jid jid) { private string? get_avatar_hash(Account account, Jid jid) {
Jid jid_ = jid; string? user_avatars_id = user_avatars[jid];
if (!stream_interactor.get_module(MucManager.IDENTITY).is_groupchat_occupant(jid, account)) {
jid_ = jid.bare_jid;
}
string? user_avatars_id = user_avatars[jid_];
if (user_avatars_id != null) { if (user_avatars_id != null) {
return user_avatars_id; return user_avatars_id;
} }
string? vcard_avatars_id = vcard_avatars[jid_]; string? vcard_avatars_id = vcard_avatars[jid];
if (vcard_avatars_id != null) { if (vcard_avatars_id != null) {
return vcard_avatars_id; return vcard_avatars_id;
} }
@ -122,13 +120,17 @@ public class AvatarManager : StreamInteractionModule, Object {
on_vcard_avatar_received(account, jid, id) on_vcard_avatar_received(account, jid, id)
); );
user_avatars = db.get_avatar_hashes(Source.USER_AVATARS); foreach (var entry in db.get_avatar_hashes(Source.USER_AVATARS).entries) {
foreach (Jid jid in user_avatars.keys) { on_user_avatar_received(account, entry.key, entry.value);
on_user_avatar_received(account, jid, user_avatars[jid]);
} }
vcard_avatars = db.get_avatar_hashes(Source.VCARD); foreach (var entry in db.get_avatar_hashes(Source.VCARD).entries) {
foreach (Jid jid in vcard_avatars.keys) { // FIXME: remove. temporary to remove falsely saved avatars.
on_vcard_avatar_received(account, jid, vcard_avatars[jid]); if (stream_interactor.get_module(MucManager.IDENTITY).is_groupchat(entry.key, account)) {
db.avatar.delete().with(db.avatar.jid, "=", entry.key.to_string()).perform();
continue;
}
on_vcard_avatar_received(account, entry.key, entry.value);
} }
} }
@ -148,7 +150,7 @@ public class AvatarManager : StreamInteractionModule, Object {
private void on_vcard_avatar_received(Account account, Jid jid, string id) { private void on_vcard_avatar_received(Account account, Jid jid, string id) {
if (!vcard_avatars.has_key(jid) || vcard_avatars[jid] != id) { if (!vcard_avatars.has_key(jid) || vcard_avatars[jid] != id) {
vcard_avatars[jid] = id; vcard_avatars[jid] = id;
if (!jid.is_full()) { // don't save muc avatars if (!jid.is_full()) { // don't save MUC occupant avatars
db.set_avatar_hash(jid, id, Source.VCARD); db.set_avatar_hash(jid, id, Source.VCARD);
} }
} }