From 19ec3759126082f4682d4e81094aff899265fbaf Mon Sep 17 00:00:00 2001
From: Adil El Farissi <144741970+AdilElFarissi@users.noreply.github.com>
Date: Sat, 6 Jul 2024 20:31:46 +0000
Subject: [PATCH] fixing conflicts

---
 .../MySQL/Resources/RegionStore.migrations    |  8 +--
 OpenSim/Data/PGSQL/PGSQLMuteListData.cs       | 72 +++++++++++++++++++
 .../PGSQL/Resources/MuteListStore.migrations  | 17 +++++
 3 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 OpenSim/Data/PGSQL/PGSQLMuteListData.cs
 create mode 100644 OpenSim/Data/PGSQL/Resources/MuteListStore.migrations

diff --git a/OpenSim/Data/MySQL/Resources/RegionStore.migrations b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
index 1e949c6a89..e6aa016b2b 100644
--- a/OpenSim/Data/MySQL/Resources/RegionStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/RegionStore.migrations
@@ -562,8 +562,8 @@ COMMIT;
 
 :VERSION 66         #----- add PBR Terrain storage column
 BEGIN;
-ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR1` varchar(36) NOT NULL;
-ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR2` varchar(36) NOT NULL;
-ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR3` varchar(36) NOT NULL;
-ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR4` varchar(36) NOT NULL;
+ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR1` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR2` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR3` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
+ALTER TABLE `regionsettings` ADD COLUMN `TerrainPBR4` varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000';
 COMMIT;
\ No newline at end of file
diff --git a/OpenSim/Data/PGSQL/PGSQLMuteListData.cs b/OpenSim/Data/PGSQL/PGSQLMuteListData.cs
new file mode 100644
index 0000000000..6b49f46fa7
--- /dev/null
+++ b/OpenSim/Data/PGSQL/PGSQLMuteListData.cs
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using OpenSim.Framework;
+using OpenMetaverse;
+using Npgsql;
+
+namespace OpenSim.Data.PGSQL
+{
+    public class PGSQLMuteListData: PGSQLGenericTableHandler<MuteData>, IMuteListData
+    {
+        public PGSQLMuteListData(string connectionString)
+            : base(connectionString, "MuteList", "MuteListStore")
+        {
+        }
+
+        public MuteData[] Get(UUID agentID)
+        {
+            var data = base.Get("AgentID", agentID.ToString());
+            return data;
+        }
+
+        public bool Delete(UUID agentID, UUID muteID, string muteName)
+        {
+            var query = $"DELETE FROM MuteList WHERE \"AgentID\" = :AgentID and " +
+                        $"\"MuteID\" = :MuteID and " +
+                        $"\"MuteName\" = :MuteName";
+
+            using (NpgsqlConnection conn = new NpgsqlConnection(m_ConnectionString))
+            using (NpgsqlCommand cmd = new NpgsqlCommand())
+            {
+                cmd.CommandText = query;
+                cmd.Parameters.AddWithValue(":AgentID", agentID.ToString());
+                cmd.Parameters.AddWithValue(":MuteID", muteID.ToString());
+                cmd.Parameters.AddWithValue("MuteName", muteName);
+                cmd.Connection = conn;
+                conn.Open();
+                cmd.ExecuteNonQuery();
+
+                return true;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Data/PGSQL/Resources/MuteListStore.migrations b/OpenSim/Data/PGSQL/Resources/MuteListStore.migrations
new file mode 100644
index 0000000000..83f3fcc2c0
--- /dev/null
+++ b/OpenSim/Data/PGSQL/Resources/MuteListStore.migrations
@@ -0,0 +1,17 @@
+:VERSION 1
+
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS MuteList (
+
+    "AgentID" varchar(36) NOT NULL,
+    "MuteId" varchar(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',
+    "MuteName" varchar(64) NOT NULL DEFAULT '',
+    "MuteType" int4 NOT NULL DEFAULT 1,
+    "MuteFlags" int4 NOT NULL DEFAULT 0,
+    "Stamp" int4 NOT NULL,
+    CONSTRAINT pk_agent_id PRIMARY KEY ("AgentID"),
+    CONSTRAINT unique_agent_2 UNIQUE ("AgentID", "MuteId", "MuteName")
+);
+
+COMMIT;
\ No newline at end of file