Skip to content
This repository was archived by the owner on Jan 15, 2022. It is now read-only.

Fix/1.2.x/soc 2603 #58

Open
quangpld wants to merge 1 commit into
base: stable/1.2.x
Choose a base branch
from
Open

Fix/1.2.x/soc 2603 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 13 additions & 24 deletions component/core/src/main/java/org/exoplatform/social/core/processor/MentionsProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,11 @@
*/
package org.exoplatform.social.core.processor;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.social.core.BaseActivityProcessorPlugin;
Expand All @@ -39,7 +34,7 @@
*/
public class MentionsProcessor extends BaseActivityProcessorPlugin {


private static final Pattern USERNAME_PATTERN = Pattern.compile("(^|\\s)(@([\\p{L}\\p{Digit}\\_\\.\\-]+)([\\p{L}\\p{Digit}]+))");

public MentionsProcessor(InitParams params) {
super(params);
Expand All @@ -66,39 +61,33 @@ private String substituteUsernames(String message) {
if (message == null) {
return null;
}

Pattern pattern = Pattern.compile("@([^\\s]+)|@([^\\s]+)$");
Matcher matcher = pattern.matcher(message);

Matcher matcher = USERNAME_PATTERN.matcher(message);

// Replace all occurrences of pattern in input
StringBuffer buf = new StringBuffer();
String mention, replaceStr, portalOwner;
while (matcher.find()) {
// Get the match result
String replaceStr = matcher.group().substring(1);

String portalOwner = null;
try{
mention = matcher.group();
replaceStr = mention.substring(mention.indexOf("@") + 1);
try {
portalOwner = Util.getPortalRequestContext().getPortalOwner();
} catch (Exception e){
} catch (Exception e) {
//default value for testing and social
portalOwner = LinkProvider.DEFAULT_PORTAL_OWNER;
}

// Convert to uppercase
ExoContainer container = ExoContainerContext.getCurrentContainer();
LinkProvider lp = (LinkProvider) container.getComponentInstanceOfType(LinkProvider.class);
replaceStr = lp.getProfileLink(replaceStr, portalOwner);
replaceStr = LinkProvider.getProfileLink(replaceStr, portalOwner);
if (mention.indexOf("@") > 0) {
replaceStr = " " + replaceStr;
}

// Insert replacement
if(replaceStr != null){
if (replaceStr != null) {
matcher.appendReplacement(buf, replaceStr);
}

}
matcher.appendTail(buf);
return buf.toString();

}


}
71 changes: 65 additions & 6 deletions ...onent/core/src/test/java/org/exoplatform/social/core/processor/MentionsProcessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,32 @@
public class MentionsProcessorTest extends AbstractCoreTest {

private IdentityManager identityManager;
private Identity rootIdentity, johnIdentity;
private Identity rootIdentity, johnIdentity, maryIdentity, demoIdentity;


public void setUp() throws Exception {
super.setUp();
identityManager = (IdentityManager) PortalContainer.getComponent(IdentityManager.class);
assertNotNull("identityManager must not be null", identityManager);
rootIdentity = identityManager.getOrCreateIdentity(OrganizationIdentityProvider.NAME, "root");
johnIdentity = identityManager.getOrCreateIdentity(OrganizationIdentityProvider.NAME, "john");
rootIdentity = identityManager.getOrCreateIdentity(OrganizationIdentityProvider.NAME, "root", true);
johnIdentity = identityManager.getOrCreateIdentity(OrganizationIdentityProvider.NAME, "john", true);
maryIdentity = createIdentity(OrganizationIdentityProvider.NAME, "mary.kelly");
demoIdentity = createIdentity(OrganizationIdentityProvider.NAME, "demo_gtn");
assertNotNull("rootIdentity.getId() must not be null", rootIdentity.getId());
assertNotNull("johnIdentity.getId() must not be null", johnIdentity.getId());
assertNotNull("maryIdentity.getId() must not be null", maryIdentity.getId());
assertNotNull("demoIdentity.getId() must not be null", demoIdentity.getId());
}

public void tearDown() throws Exception {
identityManager.deleteIdentity(rootIdentity);
identityManager.deleteIdentity(johnIdentity);
identityManager.deleteIdentity(maryIdentity);
identityManager.deleteIdentity(demoIdentity);
super.tearDown();
}

public void testSubstituteUsernames() throws Exception {
assertTrue(true);
MentionsProcessor processor = (MentionsProcessor) getContainer().getComponentInstanceOfType(MentionsProcessor.class);
assertNotNull("prococessor must not be null", processor);
ExoSocialActivity activity = null;
Expand All @@ -64,10 +69,12 @@ public void testSubstituteUsernames() throws Exception {
assertNull(activity.getTitle());
assertNull(activity.getBody());

String root = "root", john = "john";
String root = "root", john = "john", mary = "mary.kelly", demo = "demo_gtn";

String rootLink = LinkProvider.getProfileLink(root, LinkProvider.DEFAULT_PORTAL_OWNER);
String johnLink = LinkProvider.getProfileLink(john, LinkProvider.DEFAULT_PORTAL_OWNER);
String maryLink = LinkProvider.getProfileLink(mary, LinkProvider.DEFAULT_PORTAL_OWNER);
String demoLink = LinkProvider.getProfileLink(demo, LinkProvider.DEFAULT_PORTAL_OWNER);

activity.setTitle("single @root substitution");
processor.processActivity(activity);
Expand All @@ -79,6 +86,34 @@ public void testSubstituteUsernames() throws Exception {
processor.processActivity(activity);
assertEquals("Multiple substitution : ",activity.getTitle(), rootLink + " and " + johnLink + " title");
assertEquals(activity.getBody(), "body with " + rootLink + " and " + johnLink);

activity.setTitle("@root. and @john. title");
activity.setBody("body with @root. and @john.");
processor.processActivity(activity);
assertEquals(activity.getTitle(), rootLink + ". and " + johnLink + ". title");
assertEquals(activity.getBody(), "body with " + rootLink + ". and " + johnLink + ".");

activity.setTitle("@root$#%#^& and @john$#%#^& title");
activity.setBody("body with @root$#%#^& and @john$#%#^&");
processor.processActivity(activity);
assertEquals(activity.getTitle(), rootLink + "$#%#^& and " + johnLink + "$#%#^& title");
assertEquals(activity.getBody(), "body with " + rootLink + "$#%#^& and " + johnLink + "$#%#^&");

activity.setTitle("@mary.kelly and @demo_gtn title");
activity.setBody("body with @mary.kelly. and @demo_gtn.");
processor.processActivity(activity);
assertEquals(activity.getTitle(), maryLink + " and " + demoLink + " title");
assertEquals(activity.getBody(), "body with " + maryLink + ". and " + demoLink + ".");

activity.setTitle("@root.1234 and @john.4321 title");
activity.setBody("body with @root.1234 and @john.4321");
try {
processor.processActivity(activity);
} catch(Exception e) {
assertEquals("Identity must not be null.", e.getMessage());
assertEquals(activity.getTitle(), "@root.1234 and @john.4321 title");
assertEquals(activity.getBody(), "body with @root.1234 and @john.4321");
}
}

public void testProcessActivityWithTemplateParam() throws Exception {
Expand All @@ -102,6 +137,30 @@ public void testProcessActivityWithTemplateParam() throws Exception {
templateParams.get("a"));
assertEquals(LinkProvider.getProfileLink("john", LinkProvider.DEFAULT_PORTAL_OWNER),
templateParams.get("b"));
assertEquals("@mary", templateParams.get("d"));
assertEquals("@mary", templateParams.get("d"));

// Test process with special character.
templateParams = new LinkedHashMap<String, String>();
templateParams.put("a", "@mary.kelly. and @demo_gtn");
templateParams.put("b", "@mary%$^");
templateParams.put("d", "@demo+");
templateParams.put(BaseActivityProcessorPlugin.TEMPLATE_PARAM_TO_PROCESS, keysToProcess);
activity.setTemplateParams(templateParams);
processor.processActivity(activity);

templateParams = activity.getTemplateParams();
assertEquals(LinkProvider.getProfileLink("mary.kelly", LinkProvider.DEFAULT_PORTAL_OWNER) + ". and " +
LinkProvider.getProfileLink("demo_gtn", LinkProvider.DEFAULT_PORTAL_OWNER),
templateParams.get("a"));
assertEquals(LinkProvider.getProfileLink("mary", LinkProvider.DEFAULT_PORTAL_OWNER) + "%$^",
templateParams.get("b"));
assertEquals("@demo+", templateParams.get("d"));
}

private Identity createIdentity(String providerId, String remoteId) {
Identity identity = new Identity(providerId, remoteId);
identityManager.saveIdentity(identity);
identity = identityManager.getOrCreateIdentity(providerId, remoteId, true);
return identity;
}
}