Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit f1f214b

Browse files
committed
Parse emojis in notification
1 parent fb12908 commit f1f214b

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

Rocket.Chat.NotificationServiceExtension/NotificationService.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class NotificationService: UNNotificationServiceExtension {
2424
// Modify the notification content here...
2525
let attributedString = NSAttributedString(string: bestAttemptContent.body)
2626
bestAttemptContent.body = MarkdownManager.shared.transformAttributedString(attributedString).string
27+
bestAttemptContent.body = Emojione.transform(string: bestAttemptContent.body)
2728

2829
contentHandler(bestAttemptContent)
2930
}

Rocket.Chat.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,10 @@
450450
801B0EF42114B2A300C0972E /* ShortcutHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 801B0EF32114B2A300C0972E /* ShortcutHelpers.swift */; };
451451
801B0EF7211895E900C0972E /* MainSplitViewControllerShortcuts.swift in Sources */ = {isa = PBXBuildFile; fileRef = 801B0EF6211895E900C0972E /* MainSplitViewControllerShortcuts.swift */; };
452452
801DF8151FD7172500302CC8 /* SubscriptionUserView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 801DF8141FD7172500302CC8 /* SubscriptionUserView.swift */; };
453+
80200CCF21CD39FA00D00144 /* Emojione+Transform.swift in Sources */ = {isa = PBXBuildFile; fileRef = 807FB53C2044B49800E21429 /* Emojione+Transform.swift */; };
454+
80200CD021CD3A2A00D00144 /* Emojione.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4199A9881DABCC570035F820 /* Emojione.swift */; };
455+
80200CD221CD3A5500D00144 /* Emoji.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8069D26D1FFF876D00C75926 /* Emoji.swift */; };
456+
80200CD321CD3AAE00D00144 /* NSAttributedString+CustomEmojis.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80F09A1C1FFFC24800977D0D /* NSAttributedString+CustomEmojis.swift */; };
453457
8020C3D52199DDA400AA7133 /* MessagesViewControllerDrafting.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8020C3D42199DDA400AA7133 /* MessagesViewControllerDrafting.swift */; };
454458
8020C3D82199F75A00AA7133 /* MessagesViewControllerEmptyState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8020C3D72199F75A00AA7133 /* MessagesViewControllerEmptyState.swift */; };
455459
8020C3DA2199F78800AA7133 /* MessagesViewControllerSearching.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8020C3D92199F78800AA7133 /* MessagesViewControllerSearching.swift */; };
@@ -5521,9 +5525,13 @@
55215525
808921FA21C3FF9600271A1F /* MessageTextFontAttributes.swift in Sources */,
55225526
808921F421C3FEA400271A1F /* Theme.swift in Sources */,
55235527
80A27F9121C3FA86006EC454 /* MarkdownManager.swift in Sources */,
5528+
80200CD221CD3A5500D00144 /* Emoji.swift in Sources */,
55245529
808921F621C3FF1900271A1F /* UIColorCSSColorsExtension.swift in Sources */,
55255530
80A27F8721C3F853006EC454 /* NotificationService.swift in Sources */,
55265531
808921F521C3FEF700271A1F /* UIColorExtension.swift in Sources */,
5532+
80200CD321CD3AAE00D00144 /* NSAttributedString+CustomEmojis.swift in Sources */,
5533+
80200CCF21CD39FA00D00144 /* Emojione+Transform.swift in Sources */,
5534+
80200CD021CD3A2A00D00144 /* Emojione.swift in Sources */,
55275535
);
55285536
runOnlyForDeploymentPostprocessing = 0;
55295537
};

Rocket.Chat/External/RCEmojiKit/Emojione+Transform.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ extension Emojione {
1818
(validString, notMatched) = insertEmojis(into: validString, in: (validString as String).filterOutRangesInsideCode(ranges: ranges))
1919
ranges = getMatches(from: validString, excludingRanges: notMatched)
2020
(validString, _) = insertEmojis(into: validString, in: (validString as String).filterOutRangesInsideCode(ranges: ranges))
21-
return validString as String
21+
return validString as String
2222
}
2323

2424
static func getMatches(from string: NSString, excludingRanges: [NSRange] = []) -> [NSRange] {

Rocket.Chat/External/RCEmojiKit/NSAttributedString+CustomEmojis.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2018 Rocket.Chat. All rights reserved.
77
//
88

9-
import Foundation
9+
import UIKit
1010

1111
extension NSAttributedString {
1212
func applyingCustomEmojis(_ emojis: [String: Emoji]) -> NSAttributedString {

0 commit comments

Comments
 (0)