1 files changed, 25 insertions, 6 deletions

diff --git a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
index ad368f11..bdd13932 100644
--- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
@@ -7,8 +7,11 @@ import java.util.Locale;
 
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Contact;
+import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.MucOptions;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.xml.Element;
+import eu.siacs.conversations.xmpp.jid.InvalidJidException;
 import eu.siacs.conversations.xmpp.jid.Jid;
 import eu.siacs.conversations.xmpp.stanzas.AbstractStanza;
 
@@ -71,16 +74,12 @@ public abstract class AbstractParser {
         return dateFormat.parse(timestamp);
 	}
 
-	protected void updateLastseen(final AbstractStanza packet, final Account account, final boolean presenceOverwrite) {
-		updateLastseen(getTimestamp(packet), account, packet.getFrom(), presenceOverwrite);
-	}
-
-	protected void updateLastseen(long timestamp, final Account account, final Jid from, final boolean presenceOverwrite) {
+	protected void updateLastseen(long timestamp, final Account account, final Jid from) {
 		final String presence = from == null || from.isBareJid() ? "" : from.getResourcepart();
 		final Contact contact = account.getRoster().getContact(from);
 		if (timestamp >= contact.lastseen.time) {
 			contact.lastseen.time = timestamp;
-			if (!presence.isEmpty() && presenceOverwrite) {
+			if (!presence.isEmpty()) {
 				contact.lastseen.presence = presence;
 			}
 		}
@@ -93,4 +92,24 @@ public abstract class AbstractParser {
 		}
 		return item.findChildContent("data", "urn:xmpp:avatar:data");
 	}
+
+	public static MucOptions.User parseItem(Conversation conference, Element item) {
+		final String local = conference.getJid().getLocalpart();
+		final String domain = conference.getJid().getDomainpart();
+		String affiliation = item.getAttribute("affiliation");
+		String role = item.getAttribute("role");
+		String nick = item.getAttribute("nick");
+		Jid fullJid;
+		try {
+			fullJid = nick != null ? Jid.fromParts(local, domain, nick) : null;
+		} catch (InvalidJidException e) {
+			fullJid = null;
+		}
+		Jid realJid = item.getAttributeAsJid("jid");
+		MucOptions.User user = new MucOptions.User(conference.getMucOptions(), nick == null ? null : fullJid);
+		user.setRealJid(realJid);
+		user.setAffiliation(affiliation);
+		user.setRole(role);
+		return user;
+	}
 }