inex/famedlysdk
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'soru/emote-packs' into 'master'

Browse source 
change emote packs slightly

See merge request famedly/famedlysdk!295
This commit is contained in:
Christian Pauly 2020-05-15 19:11:30 +00:00
parent 52721553cb d6e9131b12
commit e8436198bb
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lib/src/room.dart
View file

@ -497,9 +497,31 @@ class Room {
return resp['event_id']; return resp['event_id'];
} }
/// return all current emote packs for this room
Map<String, Map<String, String>> get emotePacks {
final packs = <String, Map<String, String>>{};
final addEmotePack = (String packName, Map<String, dynamic> content) {
packs[packName] = <String, String>{};
content.forEach((key, value) {
if (key is String && value is String && value.startsWith('mxc://')) {
packs[packName][key] = value;
}
});
};
final roomEmotes = getState('im.ponies.room_emotes');
final userEmotes = client.accountData['im.ponies.user_emotes'];
if (roomEmotes != null && roomEmotes.content['short'] is Map) {
addEmotePack('room', roomEmotes.content['short']);
}
if (userEmotes != null && userEmotes.content['short'] is Map) {
addEmotePack('user', userEmotes.content['short']);
}
return packs;
}
/// Sends a normal text message to this room. Returns the event ID generated /// Sends a normal text message to this room. Returns the event ID generated
/// by the server for this message. /// by the server for this message.
Future<String> sendTextEvent(String message, {String txid, Event inReplyTo, bool parseMarkdown = true}) { Future<String> sendTextEvent(String message, {String txid, Event inReplyTo, bool parseMarkdown = true, Map<String, Map<String, String>> emotePacks}) {
final event = <String, dynamic>{ final event = <String, dynamic>{
'msgtype': 'm.text', 'msgtype': 'm.text',
'body': message, 'body': message,
@ -509,25 +531,7 @@ class Room {
event['body'] = message.substring(4); event['body'] = message.substring(4);
} }
if (parseMarkdown) { if (parseMarkdown) {
// load the emote packs final html = markdown(event['body'], emotePacks ?? this.emotePacks);
final emotePacks = <String, Map<String, String>>{};
final addEmotePack = (String packName, Map<String, dynamic> content) {
emotePacks[packName] = <String, String>{};
content.forEach((key, value) {
if (key is String && value is String && value.startsWith('mxc://')) {
emotePacks[packName][key] = value;
}
});
};
final roomEmotes = getState('im.ponies.room_emotes');
final userEmotes = client.accountData['im.ponies.user_emotes'];
if (roomEmotes != null && roomEmotes.content['short'] is Map) {
addEmotePack('room', roomEmotes.content['short']);
}
if (userEmotes != null && userEmotes.content['short'] is Map) {
addEmotePack('user', userEmotes.content['short']);
}
final html = markdown(event['body'], emotePacks);
// if the decoded html is the same as the body, there is no need in sending a formatted message // if the decoded html is the same as the body, there is no need in sending a formatted message
if (HtmlUnescape().convert(html) != event['body']) { if (HtmlUnescape().convert(html) != event['body']) {
event['format'] = 'org.matrix.custom.html'; event['format'] = 'org.matrix.custom.html';