TakeV
/
dino
mirror of https://github.com/TakeV-Lambda/dino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly display names in groupchat pms 

Also show "Me" when no local alias is set instead of JID
This commit is contained in:
Marvin W 2020-01-09 14:28:08 +01:00
parent 5e1f646cbc
commit 3fc9bdab05
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
6 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libdino/src/entity/conversation.vala
View File

@ -9,7 +9,11 @@ public class Conversation : Object {
public enum Type {
CHAT,
GROUPCHAT,
GROUPCHAT_PM
GROUPCHAT_PM;
public bool is_muc_semantic() {
return this == GROUPCHAT || this == GROUPCHAT_PM;
}
}
public int id { get; set; }

8
libdino/src/entity/message.vala
View File

@ -22,7 +22,11 @@ public class Message : Object {
CHAT,
GROUPCHAT,
GROUPCHAT_PM,
UNKNOWN
UNKNOWN;
public bool is_muc_semantic() {
return this == GROUPCHAT || this == GROUPCHAT_PM;
}
}
public int id { get; set; default = -1; }
@ -74,7 +78,7 @@ public class Message : Object {
if (counterpart_resource != null) counterpart = counterpart.with_resource(counterpart_resource);
string our_resource = row[db.message.our_resource];
if (type_ == Type.GROUPCHAT && our_resource != null) {
if (type_.is_muc_semantic() && our_resource != null) {
ourpart = counterpart.with_resource(our_resource);
} else if (our_resource != null) {
ourpart = account.bare_jid.with_resource(our_resource);

2
libdino/src/service/content_item_store.vala
View File

@ -68,7 +68,7 @@ public class ContentItemStore : StreamInteractionModule, Object {
try {
string storage_dir = FileManager.get_storage_dir();
FileTransfer file_transfer = new FileTransfer.from_row(db, row_option.inner, storage_dir);
if (conversation.type_ in new Conversation.Type[]{Conversation.Type.GROUPCHAT, Conversation.Type.GROUPCHAT_PM}) {
if (conversation.type_.is_muc_semantic()) {
try {
// resourcepart wasn't set before, so we pick nickname instead (which isn't accurate if nickname is changed)
file_transfer.ourpart = conversation.counterpart.with_resource(file_transfer.ourpart.resourcepart ?? conversation.nickname);

4
libdino/src/service/file_manager.vala
View File

@ -42,7 +42,7 @@ public class FileManager : StreamInteractionModule, Object {
FileTransfer file_transfer = new FileTransfer();
file_transfer.account = conversation.account;
file_transfer.counterpart = conversation.counterpart;
if (conversation.type_ in new Conversation.Type[]{Conversation.Type.GROUPCHAT, Conversation.Type.GROUPCHAT_PM}) {
if (conversation.type_.is_muc_semantic()) {
file_transfer.ourpart = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account) ?? conversation.account.bare_jid;
} else {
file_transfer.ourpart = conversation.account.full_jid;
@ -292,7 +292,7 @@ public class FileManager : StreamInteractionModule, Object {
file_transfer.account = conversation.account;
file_transfer.direction = from.bare_jid.equals(conversation.account.bare_jid) ? FileTransfer.DIRECTION_SENT : FileTransfer.DIRECTION_RECEIVED;
file_transfer.counterpart = file_transfer.direction == FileTransfer.DIRECTION_RECEIVED ? from : conversation.counterpart;
if (conversation.type_ in new Conversation.Type[]{Conversation.Type.GROUPCHAT, Conversation.Type.GROUPCHAT_PM}) {
if (conversation.type_.is_muc_semantic()) {
file_transfer.ourpart = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account) ?? conversation.account.bare_jid;
} else {
file_transfer.ourpart = conversation.account.full_jid;

2
libdino/src/service/message_processor.vala
View File

@ -530,7 +530,7 @@ public class MessageProcessor : StreamInteractionModule, Object {
message.local_time = now;
message.direction = Entities.Message.DIRECTION_SENT;
message.counterpart = conversation.counterpart;
if (conversation.type_ in new Conversation.Type[]{Conversation.Type.GROUPCHAT, Conversation.Type.GROUPCHAT_PM}) {
if (conversation.type_.is_muc_semantic()) {
message.ourpart = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account) ?? conversation.account.bare_jid;
message.real_jid = conversation.account.bare_jid;
} else {

27
main/src/ui/util/helper.vala
View File

@ -146,10 +146,10 @@ public static string get_participant_display_name(StreamInteractor stream_intera
}
private static string? get_real_display_name(StreamInteractor stream_interactor, Account account, Jid jid, bool me_is_me = false) {
if (me_is_me && jid.equals_bare(account.bare_jid)) {
return _("Me");
}
if (jid.equals_bare(account.bare_jid) && account.alias != null && account.alias.length != 0) {
if (jid.equals_bare(account.bare_jid)) {
if (me_is_me || account.alias == null || account.alias.length == 0) {
return _("Me");
}
return account.alias;
}
Roster.Item roster_item = stream_interactor.get_module(RosterManager.IDENTITY).get_roster_item(account, jid);
@ -181,16 +181,17 @@ private static string get_groupchat_display_name(StreamInteractor stream_interac
return jid.to_string();
}
private static string get_occupant_display_name(StreamInteractor stream_interactor, Account account, Jid jid, bool me_is_me = false) {
/* TODO: MUC Real JID
MucManager muc_manager = stream_interactor.get_module(MucManager.IDENTITY);
if (muc_manager.is_private_room(account, jid.bare_jid)) {
Jid? real_jid = muc_manager.get_real_jid(jid, account);
if (real_jid != null) {
string? display_name = get_real_display_name(stream_interactor, account, real_jid, me_is_me);
if (display_name != null) return display_name;
private static string get_occupant_display_name(StreamInteractor stream_interactor, Account account, Jid jid, bool me_is_me = false, bool muc_real_name = false) {
if (muc_real_name) {
MucManager muc_manager = stream_interactor.get_module(MucManager.IDENTITY);
if (muc_manager.is_private_room(account, jid.bare_jid)) {
Jid? real_jid = muc_manager.get_real_jid(jid, account);
if (real_jid != null) {
string? display_name = get_real_display_name(stream_interactor, account, real_jid, me_is_me);
if (display_name != null) return display_name;
}
}
}*/
}
return jid.resourcepart ?? jid.to_string();
}