Merge pull request #2 from Dykam/grouppresence

Make it possible to retrieve the room which spawned GroupPresenceEventArgs
ParamountVentures · Feb 8, 2018 · 0a5156b · 0a5156b
2 parents b2e0ae8 + d7dc0ea
commit 0a5156b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Extensions/XEP-0045/GroupPresenceEventArgs.cs b/Extensions/XEP-0045/GroupPresenceEventArgs.cs
@@ -13,6 +13,8 @@ public class GroupPresenceEventArgs : EventArgs
         /// </summary>
         public Occupant Person { get; set; }
 
+        public Jid Group { get; }
+
         /// <summary>
         /// 
         /// </summary>
@@ -22,10 +24,12 @@ public class GroupPresenceEventArgs : EventArgs
         /// 
         /// </summary>
         /// <param name="person"></param>
+        /// <param name="group"></param>
         /// <param name="statuses"></param>
-        public GroupPresenceEventArgs(Occupant person, IEnumerable<MucStatusType> statuses) : base()
+        public GroupPresenceEventArgs(Occupant person, Jid group, IEnumerable<MucStatusType> statuses) : base()
         {
             Person = person;
+            Group = group;
             Statuses = statuses;
         }
     }

diff --git a/Extensions/XEP-0045/MultiUserChat.cs b/Extensions/XEP-0045/MultiUserChat.cs
@@ -172,7 +172,7 @@ public bool Input (Im.Presence stanza)
                 bool hasNoAvailability = string.IsNullOrWhiteSpace(stanza.Data["show"]?.InnerText);
 
 				if (person != null) {
-					PrescenceChanged.Raise (this, new GroupPresenceEventArgs (person, statusCodeList));
+					PrescenceChanged.Raise (this, new GroupPresenceEventArgs (person, new Jid(stanza.From.Domain, stanza.From.Node), statusCodeList));
 					return hasNoAvailability;
 				}
 			}