From d21e9c755f004d8fe03b11bc57b810dbd401435a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 19 May 2011 16:54:46 -0700
Subject: HG Friends working to some extent: friendships offered and accepted
 correctly handled. Friends list showing correct foreign names. TODO:
 GrantRights.

---
 OpenSim/Services/Friends/FriendsService.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Services/Friends/FriendsService.cs')

diff --git a/OpenSim/Services/Friends/FriendsService.cs b/OpenSim/Services/Friends/FriendsService.cs
index 3c64ecc..039dc0b 100644
--- a/OpenSim/Services/Friends/FriendsService.cs
+++ b/OpenSim/Services/Friends/FriendsService.cs
@@ -43,17 +43,16 @@ namespace OpenSim.Services.Friends
         {
         }
 
-        public FriendInfo[] GetFriends(UUID PrincipalID)
+        public virtual FriendInfo[] GetFriends(UUID PrincipalID)
         {
             FriendsData[] data = m_Database.GetFriends(PrincipalID);
-
             List<FriendInfo> info = new List<FriendInfo>();
 
             foreach (FriendsData d in data)
             {
                 FriendInfo i = new FriendInfo();
 
-                i.PrincipalID = d.PrincipalID;
+                i.PrincipalID = new UUID(d.PrincipalID);
                 i.Friend = d.Friend;
                 i.MyFlags = Convert.ToInt32(d.Data["Flags"]);
                 i.TheirFlags = Convert.ToInt32(d.Data["TheirFlags"]);
@@ -64,7 +63,7 @@ namespace OpenSim.Services.Friends
             return info.ToArray();
         }
 
-        public bool StoreFriend(UUID PrincipalID, string Friend, int flags)
+        public virtual bool StoreFriend(string PrincipalID, string Friend, int flags)
         {
             FriendsData d = new FriendsData();
 
@@ -76,7 +75,7 @@ namespace OpenSim.Services.Friends
             return m_Database.Store(d);
         }
 
-        public bool Delete(UUID PrincipalID, string Friend)
+        public virtual bool Delete(UUID PrincipalID, string Friend)
         {
             return m_Database.Delete(PrincipalID, Friend);
         }
-- 
cgit v1.1


From 58c53c41de2cae0bb041a2e8121792e136d1edb2 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 21 May 2011 16:48:00 -0700
Subject: Fixed permissions bug related to friends in PermissionsModule. Added
 FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[]
 GetFriends(string PrincipalID) to IFriendsService. Refactored some more in
 the FriendsModule. Made client get notification of local friends permissions
 upon HGLogin. HG Friends object permissions work.

---
 OpenSim/Services/Friends/FriendsService.cs | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'OpenSim/Services/Friends/FriendsService.cs')

diff --git a/OpenSim/Services/Friends/FriendsService.cs b/OpenSim/Services/Friends/FriendsService.cs
index 039dc0b..4664cb3 100644
--- a/OpenSim/Services/Friends/FriendsService.cs
+++ b/OpenSim/Services/Friends/FriendsService.cs
@@ -63,6 +63,32 @@ namespace OpenSim.Services.Friends
             return info.ToArray();
         }
 
+        public virtual FriendInfo[] GetFriends(string PrincipalID)
+        {
+            FriendsData[] data = m_Database.GetFriends(PrincipalID);
+            List<FriendInfo> info = new List<FriendInfo>();
+
+            foreach (FriendsData d in data)
+            {
+                FriendInfo i = new FriendInfo();
+
+                if (!UUID.TryParse(d.PrincipalID, out i.PrincipalID))
+                {
+                    string tmp = string.Empty;
+                    if (!Util.ParseUniversalUserIdentifier(d.PrincipalID, out i.PrincipalID, out tmp, out tmp, out tmp))
+                        // bad record. ignore this entry
+                        continue;
+                }
+                i.Friend = d.Friend;
+                i.MyFlags = Convert.ToInt32(d.Data["Flags"]);
+                i.TheirFlags = Convert.ToInt32(d.Data["TheirFlags"]);
+
+                info.Add(i);
+            }
+
+            return info.ToArray();
+        }
+
         public virtual bool StoreFriend(string PrincipalID, string Friend, int flags)
         {
             FriendsData d = new FriendsData();
-- 
cgit v1.1


From 336665e03532cf9d7a1ad65d5071e7050bf6ecd0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 22 May 2011 16:51:03 -0700
Subject: More on HG Friends. Added Delete(string, string) across the board.
 Added security to friendship identifiers so that they can safely be deleted
 across worlds. Had to change Get(string) to use LIKE because the secret in
 the identifier is not always known -- affects only HG visitors. BOTTOM LINE
 SO FAR: HG friendships established and deleted safely across grids, local
 rights working but not (yet?) being transmitted back.

---
 OpenSim/Services/Friends/FriendsService.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Services/Friends/FriendsService.cs')

diff --git a/OpenSim/Services/Friends/FriendsService.cs b/OpenSim/Services/Friends/FriendsService.cs
index 4664cb3..e2033ac 100644
--- a/OpenSim/Services/Friends/FriendsService.cs
+++ b/OpenSim/Services/Friends/FriendsService.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Services.Friends
                 if (!UUID.TryParse(d.PrincipalID, out i.PrincipalID))
                 {
                     string tmp = string.Empty;
-                    if (!Util.ParseUniversalUserIdentifier(d.PrincipalID, out i.PrincipalID, out tmp, out tmp, out tmp))
+                    if (!Util.ParseUniversalUserIdentifier(d.PrincipalID, out i.PrincipalID, out tmp, out tmp, out tmp, out tmp))
                         // bad record. ignore this entry
                         continue;
                 }
@@ -101,6 +101,11 @@ namespace OpenSim.Services.Friends
             return m_Database.Store(d);
         }
 
+        public bool Delete(string principalID, string friend)
+        {
+            return m_Database.Delete(principalID, friend);
+        }
+
         public virtual bool Delete(UUID PrincipalID, string Friend)
         {
             return m_Database.Delete(PrincipalID, Friend);
-- 
cgit v1.1