From 42b9b4f08ec6b96fa1306fb0c1f2ab91827727bc Mon Sep 17 00:00:00 2001
From: Ske <voltasalt@gmail.com>
Date: Fri, 3 Jul 2020 12:00:59 +0200
Subject: [PATCH] Restrict proxy conflict checking to the same system

---
 PluralKit.Bot/Commands/MemberProxy.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PluralKit.Bot/Commands/MemberProxy.cs b/PluralKit.Bot/Commands/MemberProxy.cs
index 134e76a9..30db4f02 100644
--- a/PluralKit.Bot/Commands/MemberProxy.cs
+++ b/PluralKit.Bot/Commands/MemberProxy.cs
@@ -34,7 +34,7 @@ namespace PluralKit.Bot
             {
                 var query = "select * from (select *, (unnest(proxy_tags)).prefix as prefix, (unnest(proxy_tags)).suffix as suffix from members where system = @System) as _ where prefix = @Prefix and suffix = @Suffix and id != @Existing";
                 var conflicts = (await _db.Execute(conn => conn.QueryAsync<PKMember>(query,
-                    new {Prefix = newTag.Prefix, Suffix = newTag.Suffix, Existing = target.Id}))).ToList();
+                    new {Prefix = newTag.Prefix, Suffix = newTag.Suffix, Existing = target.Id, system = target.System}))).ToList();
                 
                 if (conflicts.Count <= 0) return true;