Introduce NoTrustReply

Author: rexim

src/Bot/Links.hs

@@ -135,15 +135,10 @@ linkFilter reaction =
   Reaction
     (\case
        Message { messageContent = message
-               , messageSender = sender@Sender { senderRoles = []
-                                               , senderChannel = channel
-                                               }
+               , messageSender = sender@Sender {senderRoles = []}
                }
          | textContainsLink message -> do
            timeoutSender 1 sender
-           replyToSender
-             sender
-             [qms|Links are not allowed for untrusted users.
-                  Subscribe to gain the trust instantly:
-                  https://twitch.tv/{unChannel $ channelToName channel}/subscribe|]
+           reply <- entityPayload <$> noTrustReply
+           replyToSender sender $ noTrustLinkReply reply
        msg -> runReaction reaction msg)

src/Bot/Replies.hs

@@ -14,6 +14,10 @@ import Reaction
 import Regexp
 import Text.InterpolatedString.QM
 import Transport
+import Entity
+import Data.Proxy
+import Property
+import Data.Maybe
 
 sayMessage :: Reaction Message T.Text
 sayMessage =
@@ -87,14 +91,39 @@ nonEmptyRoles reaction =
     (Reaction noTrust)
     (cmapR extract reaction)
 
+data NoTrustReply = NoTrustReply
+  { noTrustCommandReply :: T.Text
+  , noTrustLinkReply :: T.Text
+  } deriving (Eq)
+
+instance IsEntity NoTrustReply where
+  nameOfEntity Proxy = "NoTrustReply"
+  toProperties reply =
+    M.fromList
+      [ ("command", PropertyText $ noTrustCommandReply reply)
+      , ("link", PropertyText $ noTrustLinkReply reply)
+      ]
+  fromProperties properties =
+    NoTrustReply <$> extractProperty "command" properties <*>
+    extractProperty "link" properties
+
+noTrustReply :: Effect (Entity NoTrustReply)
+noTrustReply = do
+  reply <- listToMaybe <$> selectEntities Proxy (Take 1 $ All)
+  case reply of
+    Just reply' -> return reply'
+    Nothing ->
+      createEntity Proxy $
+      NoTrustReply
+        [qms|You have to be trusted to use this command.
+             Mods can change this message with !TODO|]
+        [qms|You have to be trusted to send links.
+             Mods can change this message with !TODO|]
+
 noTrust :: Message a -> Effect ()
-noTrust msg = replyToSender (messageSender msg) reply
-  where
-    reply =
-      [qms|You have to be trusted to use this command.
-                   Subscribe to gain the trust instantly:
-                   https://twitch.tv/{channel'}/subscribe|]
-    channel' = unChannel $ channelToName $ senderChannel $ messageSender msg
+noTrust Message {messageSender = sender} = do
+  reply <- entityPayload <$> noTrustReply
+  replyToSender sender $ noTrustCommandReply reply
 
 onlyForTwitch :: Reaction Message a -> Reaction Message a
 onlyForTwitch reaction =

src/Sqlite/EntityPersistence.hs

@@ -292,6 +292,16 @@ selectEntityIds conn name (Take n (Filter (PropertyEquals propertyName property)
     , ":propertyUTCTime" := (fromProperty property :: Maybe UTCTime)
     , ":n" := n
     ]
+selectEntityIds conn name (Take n All) =
+  map fromOnly <$>
+  queryNamed
+    conn
+    [r| SELECT entityId
+        FROM EntityProperty
+        WHERE entityName = :entityName
+        GROUP BY entityId
+        LIMIT :n |]
+    [":entityName" := name, ":n" := n]
 selectEntityIds conn name (Shuffle All) =
   map fromOnly <$>
   queryNamed

src/Transport.hs

@@ -71,15 +71,6 @@ paidRoles = [tsodingTwitchedDiscordRole, TwitchSub]
 senderAuthority :: Sender -> Bool
 senderAuthority sender = any (`elem` senderRoles sender) authorityRoles
 
-channelToName :: Channel -> ChannelName
-channelToName (DiscordChannel x) = ChannelName $ T.pack $ show x
-channelToName (TwitchChannel (T.uncons -> Just ('#', x))) = ChannelName x
-channelToName (TwitchChannel _) = ChannelName ""
-
-newtype ChannelName = ChannelName
-  { unChannel :: T.Text
-  } deriving Eq
-
 data InEvent
   = Started
   | Joined Channel