Skip to content

Adding Hyperlink Markup Type Support #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kg345 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Adding Hyperlink Markup Type Support #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c70ffd
Adding Hyperlink Markup Type Support
kg345 Oct 2, 2020
7311514
Improving Hyperlink Tag Regex/Logic
kg345 Oct 2, 2020
0041aff
Fix parsing url from hyperlink tag
kg345 Feb 7, 2022
3f6186a
Merge branch 'forcedotcom:master' into master
kg345 Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 29 additions & 10 deletions force-app/main/default/classes/ConnectApiHelper.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ global class ConnectApiHelper {
'p' => ConnectApi.MarkupType.Paragraph,
's' => ConnectApi.MarkupType.Strikethrough,
'u' => ConnectApi.MarkupType.Underline,
'ul' => ConnectApi.MarkupType.UnorderedList
'ul' => ConnectApi.MarkupType.UnorderedList,
'a href=' => ConnectApi.MarkupType.Hyperlink
};

/**
Expand Down Expand Up @@ -144,14 +145,16 @@ global class ConnectApiHelper {
List<ConnectApi.MessageSegmentInput> messageSegmentInputs = new List<ConnectApi.MessageSegmentInput>();
Integer strPos = 0;
// The pattern for matching mentions, markup begin/end tags, and inline images.
// The first group matches a 15 or 18 character ID surrounded by {}:
// The first and second group matches a 15 or 18 character ID surrounded by {}:
// (\\{[a-zA-Z0-9]{15}\\}|\\{[a-zA-Z0-9]{18}\\})
// The second/third groups match beginning/ending HTML tags: (<[a-zA-Z]*>)|(</[a-zA-Z]*>)
// The fourth group matches a 15 or 18 character content document ID preceded by "img:",
// The thrid group match hyperlink tags with the url and alt text and end tag <a href="https://test.com"></a>
// ((<a )(.*?)(">)|(</a>))
// The fourth/fifth groups match the other beginning/ending HTML tags and text: (<[a-zA-Z]*>)|(</[a-zA-Z]*>)
// The sixth group matches a 15 or 18 character content document ID preceded by "img:",
// optionally followed by a string (not containing '}'), and surrounded by {}:
// (\\{img:(069[a-zA-Z0-9]{12,15})(:[\\s\\S]*?)?\\})
// The fifth group matches a 15 or 18 character record ID preceded by "record:" ex:{record:01t3E000002GCm9QAG}
Pattern globalPattern = Pattern.compile('(\\{[a-zA-Z0-9]{15}\\}|\\{[a-zA-Z0-9]{18}\\})|(<[a-zA-Z]*>)|(</[a-zA-Z]*>)|(\\{img:(069[a-zA-Z0-9]{12,15})(:[\\s\\S]*?)?\\})|(\\{record:([a-zA-Z0-9]){15,18}(:[\\s\\S]*?)?\\})');
// The seventh group matches a 15 or 18 character record ID preceded by "record:" ex:{record:01t3E000002GCm9QAG}
Pattern globalPattern = Pattern.compile('(\\{[a-zA-Z0-9]{15}\\}|\\{[a-zA-Z0-9]{18}\\})|(<[aA]\\s+[hH][rR][eE][fF]=")(.*?)">(.*?)</[aA]>|(<[a-zA-Z]*>)|(</[a-zA-Z]*>)|(\\{img:(069[a-zA-Z0-9]{12,15})(:[\\s\\S]*?)?\\})|(\\{record:([a-zA-Z0-9]){15,18}(:[\\s\\S]*?)?\\})');

Matcher globalMatcher = globalPattern.matcher(inputText);

Expand Down Expand Up @@ -197,12 +200,24 @@ global class ConnectApiHelper {
// Add a segment for any accumulated text (which includes unsupported HTML tags).
addTextSegment(messageSegmentInputs, textSegment);

ConnectApi.MarkupBeginSegmentInput markupBeginSegmentInput = makeMarkupBeginSegmentInput(tag);
ConnectApi.MarkupBeginSegmentInput markupBeginSegmentInput = makeMarkupBeginSegmentInput(tag, null, null);
messageSegmentInputs.add(markupBeginSegmentInput);
strPos = globalMatcher.end();
} else if (tag.toLowerCase().contains('href=')){
// Add a segment for any accumulated text (which includes unsupported HTML tags).
addTextSegment(messageSegmentInputs, textSegment);
//hyperlink tag - get the URL. Assumes format of <a href="url">altText</a>
String url = matchingText.substring(matchingText.indexOf('"') + 1, matchingText.indexOf('>') - 1);
String htmlTag = matchingText.substring(1, matchingText.indexOf('"'));
String altText = matchingText.substring(matchingText.indexOf('>') + 1, matchingText.indexOf('</'));
ConnectApi.MarkupBeginSegmentInput markupBeginSegmentInput = makeMarkupBeginSegmentInput(htmlTag, url, altText);
ConnectApi.MarkupEndSegmentInput markupEndSegmentInput = makeMarkupEndSegmentInput(htmlTag);
messageSegmentInputs.add(markupBeginSegmentInput);
addTextSegment(messageSegmentInputs, altText);
messageSegmentInputs.add(markupEndSegmentInput);
strPos = globalMatcher.end();
}
}
else { // This is an end tag.
} else { // This is an end tag.
// Strip off the </ and >.
String tag = matchingText.substring(2, matchingText.indexOf('>'));
if (supportedMarkup.containsKey(tag.toLowerCase())) {
Expand Down Expand Up @@ -258,9 +273,13 @@ global class ConnectApiHelper {
* Create a MarkupBeginSegmentInput corresponding to the tag. Checking whether the tag is
* supported markup should happen before calling this method.
*/
private static ConnectApi.MarkupBeginSegmentInput makeMarkupBeginSegmentInput(String tag) {
private static ConnectApi.MarkupBeginSegmentInput makeMarkupBeginSegmentInput(String tag, String url, String altText) {
ConnectApi.MarkupBeginSegmentInput markupBeginSegment = new ConnectApi.MarkupBeginSegmentInput();
markupBeginSegment.markupType = supportedMarkup.get(tag.toLowerCase());
if(!String.isEmpty(url)){
markupBeginSegment.url = url;
markupBeginSegment.altText = altText;
}
return markupBeginSegment;
}

Expand Down
2 changes: 1 addition & 1 deletion force-app/main/default/classes/ConnectApiHelper.cls-meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>47.0</apiVersion>
<apiVersion>49.0</apiVersion>
<status>Active</status>
</ApexClass>
32 changes: 29 additions & 3 deletions force-app/main/default/classes/ConnectApiHelperTest.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,20 @@ public class ConnectApiHelperTest {
System.assertEquals(mentionId2, mentionSegment2.id);
}

@IsTest(SeeAllData=true)
static void testHyperlinkPost() {
String mentionId = '005x0000000URNPzzz';
String mentionId2 = '0F9x00000000D7m';
String text = '<a href="https://google.com">Testing Hyperlink</a>';
List<ConnectApi.MessageSegmentInput> segments = ConnectApiHelper.getMessageSegmentInputs(text);

System.assertEquals(3, segments.size());
System.assert(segments.get(0) instanceof ConnectApi.MarkupBeginSegmentInput);
System.assert(segments.get(1) instanceof ConnectApi.TextSegmentInput);
System.assert(segments.get(2) instanceof ConnectApi.MarkupEndSegmentInput);

}

@IsTest(SeeAllData=true)
static void testLinkAndHashtagParsing() {
// The test string is: #Yolo: http://salesforce.com, {005} {005x0000000URNPzzz} test.
Expand Down Expand Up @@ -384,7 +398,7 @@ public class ConnectApiHelperTest {
// 2 = text2
// 3 = markup end
// 4 = text3
String text1 = '<span>a</span>, <h1><a>b</a> <br> ';
String text1 = '<span>a</span>, <h1><tr>b</tr> <br> ';
String text2 = 'Does this work?';
String text3 = '</h1>';
String text = text1 + '<b>' + text2 + '</b>' + text3;
Expand Down Expand Up @@ -440,10 +454,10 @@ public class ConnectApiHelperTest {
String text1 = 'foo';
String text2 = 'bar';
String text3 = 'baz';
String text = '<U>' + text1 + '</U><b>' + text2 + '</B><oL><li>' + text3 + '</li></oL>';
String text = '<U>' + text1 + '</U><b>' + text2 + '</B><oL><li>' + text3 + '</li></oL>' + '<A hrEf="https://www.salesforce.com">' + text3 + '</A>';
List<ConnectApi.MessageSegmentInput> segments = ConnectApiHelper.getMessageSegmentInputs(text);

System.assertEquals(11, segments.size());
System.assertEquals(14, segments.size());
System.assert(segments.get(0) instanceof ConnectApi.MarkupBeginSegmentInput);
System.assert(segments.get(1) instanceof ConnectApi.TextSegmentInput);
System.assert(segments.get(2) instanceof ConnectApi.MarkupEndSegmentInput);
Expand All @@ -455,6 +469,9 @@ public class ConnectApiHelperTest {
System.assert(segments.get(8) instanceof ConnectApi.TextSegmentInput);
System.assert(segments.get(9) instanceof ConnectApi.MarkupEndSegmentInput);
System.assert(segments.get(10) instanceof ConnectApi.MarkupEndSegmentInput);
System.assert(segments.get(11) instanceof ConnectApi.MarkupBeginSegmentInput);
System.assert(segments.get(12) instanceof ConnectApi.TextSegmentInput);
System.assert(segments.get(13) instanceof ConnectApi.MarkupEndSegmentInput);

ConnectApi.MarkupBeginSegmentInput markupBeginSegment = (ConnectApi.MarkupBeginSegmentInput) segments.get(0);
System.assertEquals(ConnectApi.MarkupType.Underline, markupBeginSegment.markupType);
Expand Down Expand Up @@ -488,6 +505,15 @@ public class ConnectApiHelperTest {

markupEndSegment = (ConnectApi.MarkupEndSegmentInput) segments.get(10);
System.assertEquals(ConnectApi.MarkupType.OrderedList, markupEndSegment.markupType);

markupBeginSegment = (ConnectApi.MarkupBeginSegmentInput) segments.get(11);
System.assertEquals(ConnectApi.MarkupType.Hyperlink, markupBeginSegment.markupType);

textSegment = (ConnectApi.TextSegmentInput) segments.get(12);
System.assertEquals(text3, textSegment.text);

markupEndSegment = (ConnectApi.MarkupEndSegmentInput) segments.get(13);
System.assertEquals(ConnectApi.MarkupType.Hyperlink, markupEndSegment.markupType);
}

@IsTest(SeeAllData=true)
Expand Down
2 changes: 1 addition & 1 deletion force-app/main/default/classes/ConnectApiHelperTest.cls-meta.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>47.0</apiVersion>
<apiVersion>49.0</apiVersion>
<status>Active</status>
</ApexClass>