From 127a03ccf30ac25cc4434b1b50cf48f242bd1ac4 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Thu, 1 Oct 2020 09:42:08 -0400
Subject: [PATCH] fix #1295

---
 conventional.yaml | 2 +-
 default.yaml      | 2 +-
 irc/handlers.go   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conventional.yaml b/conventional.yaml
index ddabe3c6..580a2a15 100644
--- a/conventional.yaml
+++ b/conventional.yaml
@@ -546,7 +546,7 @@ oper-classes:
             - "local_unban"
             - "nofakelag"
             - "roleplay"
-            - "relaymsg-anywhere"
+            - "relaymsg"
 
     # network operator
     "network-oper":
diff --git a/default.yaml b/default.yaml
index c6d5e8ce..e3db7c29 100644
--- a/default.yaml
+++ b/default.yaml
@@ -574,7 +574,7 @@ oper-classes:
             - "local_unban"
             - "nofakelag"
             - "roleplay"
-            - "relaymsg-anywhere"
+            - "relaymsg"
 
     # network operator
     "network-oper":
diff --git a/irc/handlers.go b/irc/handlers.go
index 9bdb3fbd..89604db2 100644
--- a/irc/handlers.go
+++ b/irc/handlers.go
@@ -2430,7 +2430,7 @@ func relaymsgHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *
 		return false
 	}
 
-	allowedToRelay := client.HasRoleCapabs("relaymsg-anywhere") || (config.Server.Relaymsg.AvailableToChanops && channel.ClientIsAtLeast(client, modes.ChannelOperator))
+	allowedToRelay := client.HasRoleCapabs("relaymsg") || (config.Server.Relaymsg.AvailableToChanops && channel.ClientIsAtLeast(client, modes.ChannelOperator))
 	if !allowedToRelay {
 		rb.Add(nil, server.name, "FAIL", "RELAYMSG", "NOT_PRIVED", client.t("You cannot relay messages to this channel"))
 		return false