1 files changed, 144 insertions, 93 deletions

diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
index 590753e..4867c01 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
@@ -55,6 +55,9 @@ using OpenSim.Services.Interfaces;
  * UserID -> Group -> ActiveGroup
  * + GroupID
  * 
+ * UserID -> GroupSessionDropped -> GroupID
+ * UserID -> GroupSessionInvited -> GroupID
+ * 
  * UserID -> GroupMember -> GroupID
  * + SelectedRoleID [UUID]
  * + AcceptNotices  [bool]
@@ -63,6 +66,7 @@ using OpenSim.Services.Interfaces;
  *
  * UserID -> GroupRole[GroupID] -> RoleID
  * 
+ * 
  * GroupID -> Group -> GroupName 
  * + Charter
  * + ShowInList
@@ -159,7 +163,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
         private bool m_connectorEnabled = false;
 
-        private string m_serviceURL = string.Empty;
+        private string m_groupsServerURI = string.Empty;
 
         private bool m_debugEnabled = false;
 
@@ -199,13 +203,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     return;
                 }
 
-                m_log.InfoFormat("[GROUPS-CONNECTOR]: Initializing {0}", this.Name);
-
-                m_serviceURL = groupsConfig.GetString("XmlRpcServiceURL", string.Empty);
-                if ((m_serviceURL == null) ||
-                    (m_serviceURL == string.Empty))
-                {
-                    m_log.ErrorFormat("Please specify a valid Simian Server URL for XmlRpcServiceURL in OpenSim.ini, [Groups]");
+                m_log.InfoFormat("[GROUPS-CONNECTOR]: Initializing {0}", this.Name);

+

+                m_groupsServerURI = groupsConfig.GetString("GroupsServerURI", string.Empty);
+                if ((m_groupsServerURI == null) ||
+                    (m_groupsServerURI == string.Empty))
+                {

+                    m_log.ErrorFormat("Please specify a valid Simian Server for GroupsServerURI in OpenSim.ini, [Groups]");
                     m_connectorEnabled = false;
                     return;
                 }
@@ -288,8 +292,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             if(SimianAddGeneric(GroupID, "Group", name, GroupInfoMap))
             {
-                AddGroupRole(requestingAgentID, GroupID, UUID.Zero, "Everyone", "Members of " + name, "Member of " + name, (ulong)m_DefaultEveryonePowers);

-                AddGroupRole(requestingAgentID, GroupID, OwnerRoleID, "Owners", "Owners of " + name, "Owner of " + name, (ulong)m_DefaultOwnerPowers);

+                AddGroupRole(requestingAgentID, GroupID, UUID.Zero, "Everyone", "Members of " + name, "Member of " + name, (ulong)m_DefaultEveryonePowers);
+                AddGroupRole(requestingAgentID, GroupID, OwnerRoleID, "Owners", "Owners of " + name, "Owner of " + name, (ulong)m_DefaultOwnerPowers);
                 
                 AddAgentToGroup(requestingAgentID, requestingAgentID, GroupID, OwnerRoleID);
 
@@ -413,7 +417,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 }
             } 
             else if ((groupName != null) && (groupName != string.Empty))
-            {

+            {
                 if (!SimianGetFirstGenericEntry("Group", groupName, out groupID, out GroupInfoMap))
                 {
                     return null;
@@ -422,7 +426,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             GroupRecord GroupInfo = new GroupRecord();
 
-            GroupInfo.GroupID = groupID;

+            GroupInfo.GroupID = groupID;
             GroupInfo.GroupName = groupName;
             GroupInfo.Charter = GroupInfoMap["Charter"].AsString();
             GroupInfo.ShowInList = GroupInfoMap["ShowInList"].AsBoolean();
@@ -653,7 +657,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             };
 
 
-            OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs);
+            OSDMap response = WebUtil.PostToService(m_groupsServerURI, requestArgs);
             if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
             {
                 OSDArray entryArray = (OSDArray)response["Entries"];
@@ -751,9 +755,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             if (SimianGetGenericEntry(agentID, "Group", "ActiveGroup", out UserActiveGroup))
             {
                 GroupID = UserActiveGroup["GroupID"].AsUUID();
-            }

-

-            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Active GroupID : {0}", GroupID.ToString());

+            }
+
+            if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Active GroupID : {0}", GroupID.ToString());
             return GetAgentGroupMembership(requestingAgentID, agentID, GroupID);
         }
 
@@ -781,24 +785,24 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
             List<GroupRolesData> Roles = new List<GroupRolesData>();
 
-            Dictionary<string, OSDMap> GroupRoles;

-            if (SimianGetGenericEntries(groupID, "GroupRole", out GroupRoles))

-            {

-                Dictionary<string, OSDMap> MemberRoles;

-                if (SimianGetGenericEntries(agentID, "GroupRole" + groupID.ToString(), out MemberRoles))

-                {

-                    foreach (KeyValuePair<string, OSDMap> kvp in MemberRoles)

-                    {

-                        GroupRolesData data = new GroupRolesData();

-                        data.RoleID = UUID.Parse(kvp.Key);

-                        data.Name = GroupRoles[kvp.Key]["Name"].AsString();

-                        data.Description = GroupRoles[kvp.Key]["Description"].AsString();

-                        data.Title = GroupRoles[kvp.Key]["Title"].AsString();

-                        data.Powers = GroupRoles[kvp.Key]["Powers"].AsULong();

-

-                        Roles.Add(data);

-                    }

-                }

+            Dictionary<string, OSDMap> GroupRoles;
+            if (SimianGetGenericEntries(groupID, "GroupRole", out GroupRoles))
+            {
+                Dictionary<string, OSDMap> MemberRoles;
+                if (SimianGetGenericEntries(agentID, "GroupRole" + groupID.ToString(), out MemberRoles))
+                {
+                    foreach (KeyValuePair<string, OSDMap> kvp in MemberRoles)
+                    {
+                        GroupRolesData data = new GroupRolesData();
+                        data.RoleID = UUID.Parse(kvp.Key);
+                        data.Name = GroupRoles[kvp.Key]["Name"].AsString();
+                        data.Description = GroupRoles[kvp.Key]["Description"].AsString();
+                        data.Title = GroupRoles[kvp.Key]["Title"].AsString();
+                        data.Powers = GroupRoles[kvp.Key]["Powers"].AsULong();
+
+                        Roles.Add(data);
+                    }
+                }
             }
             return Roles;
         }
@@ -912,8 +916,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     {
                         foreach( KeyValuePair<UUID, OSDMap> GroupRoleMember in GroupRoleMembers )
                         {
-                            GroupRoleMembersData data = new GroupRoleMembersData();

-

+                            GroupRoleMembersData data = new GroupRoleMembersData();
+
                             data.MemberID = GroupRoleMember.Key;
                             data.RoleID = UUID.Parse(Role.Key);
 
@@ -996,9 +1000,55 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             SimianAddGeneric(groupID, "GroupNotice", noticeID.ToString(), Notice);
             
         }
+        #endregion

+

+        #region GroupSessionTracking

+

+        public void ResetAgentGroupChatSessions(UUID agentID)

+        {

+            Dictionary<string, OSDMap> agentSessions;

+

+            if (SimianGetGenericEntries(agentID, "GroupSessionDropped", out agentSessions))

+            {

+                foreach (string GroupID in agentSessions.Keys)

+                {

+                    SimianRemoveGenericEntry(agentID, "GroupSessionDropped", GroupID);

+                }

+            }

+

+            if (SimianGetGenericEntries(agentID, "GroupSessionInvited", out agentSessions))

+            {

+                foreach (string GroupID in agentSessions.Keys)

+                {

+                    SimianRemoveGenericEntry(agentID, "GroupSessionInvited", GroupID);

+                }

+            }

+        }

+

+        public bool hasAgentDroppedGroupChatSession(UUID agentID, UUID groupID)

+        {

+            OSDMap session;

+            return SimianGetGenericEntry(agentID, "GroupSessionDropped", groupID.ToString(), out session);

+        }

+

+        public void AgentDroppedFromGroupChatSession(UUID agentID, UUID groupID)

+        {

+            SimianAddGeneric(agentID, "GroupSessionDropped", groupID.ToString(), new OSDMap());

+        }

+

+        public void AgentInvitedToGroupChatSession(UUID agentID, UUID groupID)

+        {

+            SimianAddGeneric(agentID, "GroupSessionInvited", groupID.ToString(), new OSDMap());

+        }

+

+        public bool hasAgentBeenInvitedToGroupChatSession(UUID agentID, UUID groupID)

+        {

+            OSDMap session;

+            return SimianGetGenericEntry(agentID, "GroupSessionDropped", groupID.ToString(), out session);

+        }

+

         #endregion
 
-
         private void EnsureRoleNotSelectedByMember(UUID groupID, UUID roleID, UUID userID)
         {
             if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
@@ -1036,7 +1086,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             };
 
 
-            OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs);
+            OSDMap Response = WebUtil.PostToService(m_groupsServerURI, RequestArgs);
             if (Response["Success"].AsBoolean())
             {
                 return true;
@@ -1063,23 +1113,23 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             };
 
 
-            OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs);
+            OSDMap Response = WebUtil.PostToService(m_groupsServerURI, RequestArgs);
             if (Response["Success"].AsBoolean() && Response["Entries"] is OSDArray)
             {
-                OSDArray entryArray = (OSDArray)Response["Entries"];

-                if (entryArray.Count >= 1)

-                {

-                    OSDMap entryMap = entryArray[0] as OSDMap;

-                    key = entryMap["Key"].AsString();

-                    map = (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString());

-

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());

-

-                    return true;

-                }

-                else

-                {

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");

+                OSDArray entryArray = (OSDArray)Response["Entries"];
+                if (entryArray.Count >= 1)
+                {
+                    OSDMap entryMap = entryArray[0] as OSDMap;
+                    key = entryMap["Key"].AsString();
+                    map = (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString());
+
+                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());
+
+                    return true;
+                }
+                else
+                {
+                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");
                 }
             }
             else
@@ -1103,23 +1153,23 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             };
 
 
-            OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs);
+            OSDMap Response = WebUtil.PostToService(m_groupsServerURI, RequestArgs);
             if (Response["Success"].AsBoolean() && Response["Entries"] is OSDArray)
             {
-                OSDArray entryArray = (OSDArray)Response["Entries"];

-                if (entryArray.Count >= 1)

-                {

-                    OSDMap entryMap = entryArray[0] as OSDMap;

-                    ownerID = entryMap["OwnerID"].AsUUID();

-                    map = (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString());

-

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());

-

-                    return true;

-                }

-                else

-                {

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");

+                OSDArray entryArray = (OSDArray)Response["Entries"];
+                if (entryArray.Count >= 1)
+                {
+                    OSDMap entryMap = entryArray[0] as OSDMap;
+                    ownerID = entryMap["OwnerID"].AsUUID();
+                    map = (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString());
+
+                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());
+
+                    return true;
+                }
+                else
+                {
+                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");
                 }
             }
             else
@@ -1144,7 +1194,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             };
 
 
-            OSDMap Response = WebUtil.PostToService(m_serviceURL, RequestArgs);
+            OSDMap Response = WebUtil.PostToService(m_groupsServerURI, RequestArgs);
             if (Response["Success"].AsBoolean() && Response["Entries"] is OSDArray)
             {
                 OSDArray entryArray = (OSDArray)Response["Entries"];
@@ -1152,16 +1202,16 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 {
                     OSDMap entryMap = entryArray[0] as OSDMap;
                     key = entryMap["Key"].AsString();
-                    map = (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString());

-

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());

-

+                    map = (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString());
+
+                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());
+
                     return true;
-                }

-                else

-                {

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");

-                }

+                }
+                else
+                {
+                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");
+                }
             }
             else
             {
@@ -1184,20 +1234,20 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             
 
 
-            OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs);
+            OSDMap response = WebUtil.PostToService(m_groupsServerURI, requestArgs);
             if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
             {
                 maps = new Dictionary<string, OSDMap>();
 
                 OSDArray entryArray = (OSDArray)response["Entries"];
                 foreach (OSDMap entryMap in entryArray)
-                {

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());

+                {
+                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());
                     maps.Add(entryMap["Key"].AsString(), (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString()));
                 }
-                if(maps.Count == 0)

-                {

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");

+                if(maps.Count == 0)
+                {
+                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");
                 }
 
                 return true;
@@ -1222,21 +1272,21 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
 
 
 
-            OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs);
+            OSDMap response = WebUtil.PostToService(m_groupsServerURI, requestArgs);
             if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
             {
                 maps = new Dictionary<UUID, OSDMap>();
 
                 OSDArray entryArray = (OSDArray)response["Entries"];
                 foreach (OSDMap entryMap in entryArray)
-                {

+                {
                     if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  Generics Result {0}", entryMap["Value"].AsString());
                     maps.Add(entryMap["OwnerID"].AsUUID(), (OSDMap)OSDParser.DeserializeJson(entryMap["Value"].AsString()));
-                }

-                if (maps.Count == 0)

-                {

-                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");

-                }

+                }
+                if (maps.Count == 0)
+                {
+                    if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR]  No Generics Results");
+                }
                 return true;
             }
             else
@@ -1260,7 +1310,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
             };
 
 
-            OSDMap response = WebUtil.PostToService(m_serviceURL, requestArgs);
+            OSDMap response = WebUtil.PostToService(m_groupsServerURI, requestArgs);
             if (response["Success"].AsBoolean())
             {
                 return true;
@@ -1271,7 +1321,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                 return false;
             }
         }
-        #endregion
+        #endregion

+

     }
 
 }