calamity 0.1.11.1 → 0.1.11.2
raw patch · 8 files changed
+57/−34 lines, 8 filesPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
API changes (from Hackage documentation)
- Calamity.Types.Model.Channel: data Message
- Calamity.Types.Model.Channel: data MessageType
- Calamity.Types.Model.Channel.Message: UpdatedMessage :: Snowflake Message -> Snowflake Channel -> Maybe Text -> Maybe UTCTime -> Maybe Bool -> Maybe Bool -> Maybe (Vector (Snowflake User)) -> Maybe (Vector (Snowflake Role)) -> Maybe [Attachment] -> Maybe [Embed] -> Maybe [Reaction] -> Maybe Bool -> UpdatedMessage
- Calamity.Types.Model.Channel.Message: [$sel:attachments:UpdatedMessage] :: UpdatedMessage -> Maybe [Attachment]
- Calamity.Types.Model.Channel.Message: [$sel:channelID:UpdatedMessage] :: UpdatedMessage -> Snowflake Channel
- Calamity.Types.Model.Channel.Message: [$sel:content:UpdatedMessage] :: UpdatedMessage -> Maybe Text
- Calamity.Types.Model.Channel.Message: [$sel:editedTimestamp:UpdatedMessage] :: UpdatedMessage -> Maybe UTCTime
- Calamity.Types.Model.Channel.Message: [$sel:embeds:UpdatedMessage] :: UpdatedMessage -> Maybe [Embed]
- Calamity.Types.Model.Channel.Message: [$sel:id:UpdatedMessage] :: UpdatedMessage -> Snowflake Message
- Calamity.Types.Model.Channel.Message: [$sel:mentionEveryone:UpdatedMessage] :: UpdatedMessage -> Maybe Bool
- Calamity.Types.Model.Channel.Message: [$sel:mentionRoles:UpdatedMessage] :: UpdatedMessage -> Maybe (Vector (Snowflake Role))
- Calamity.Types.Model.Channel.Message: [$sel:mentions:UpdatedMessage] :: UpdatedMessage -> Maybe (Vector (Snowflake User))
- Calamity.Types.Model.Channel.Message: [$sel:pinned:UpdatedMessage] :: UpdatedMessage -> Maybe Bool
- Calamity.Types.Model.Channel.Message: [$sel:reactions:UpdatedMessage] :: UpdatedMessage -> Maybe [Reaction]
- Calamity.Types.Model.Channel.Message: [$sel:tts:UpdatedMessage] :: UpdatedMessage -> Maybe Bool
- Calamity.Types.Model.Channel.Message: data UpdatedMessage
- Calamity.Types.Model.Channel.Message: instance Calamity.Types.Snowflake.HasID Calamity.Types.Model.Channel.Channel Calamity.Types.Model.Channel.Message.UpdatedMessage
- Calamity.Types.Model.Channel.Message: instance Calamity.Types.Snowflake.HasID Calamity.Types.Model.Channel.Message.Message Calamity.Types.Model.Channel.Message.UpdatedMessage
- Calamity.Types.Model.Channel.Message: instance Data.Aeson.Types.FromJSON.FromJSON Calamity.Types.Model.Channel.Message.UpdatedMessage
- Calamity.Types.Model.Channel.Message: instance GHC.Classes.Eq Calamity.Types.Model.Channel.Message.UpdatedMessage
- Calamity.Types.Model.Channel.Message: instance GHC.Generics.Generic Calamity.Types.Model.Channel.Message.UpdatedMessage
- Calamity.Types.Model.Channel.Message: instance GHC.Show.Show Calamity.Types.Model.Channel.Message.UpdatedMessage
- Calamity.Types.Model.Channel.Message: instance TextShow.Classes.TextShow Calamity.Types.Model.Channel.Message.UpdatedMessage
+ Calamity.Types.Model.Channel.UpdatedMessage: UpdatedMessage :: Snowflake Message -> Snowflake Channel -> Maybe Text -> Maybe UTCTime -> Maybe Bool -> Maybe Bool -> Maybe (Vector (Snowflake User)) -> Maybe (Vector (Snowflake Role)) -> Maybe [Attachment] -> Maybe [Embed] -> Maybe [Reaction] -> Maybe Bool -> UpdatedMessage
+ Calamity.Types.Model.Channel.UpdatedMessage: [$sel:attachments:UpdatedMessage] :: UpdatedMessage -> Maybe [Attachment]
+ Calamity.Types.Model.Channel.UpdatedMessage: [$sel:channelID:UpdatedMessage] :: UpdatedMessage -> Snowflake Channel
+ Calamity.Types.Model.Channel.UpdatedMessage: [$sel:content:UpdatedMessage] :: UpdatedMessage -> Maybe Text
+ Calamity.Types.Model.Channel.UpdatedMessage: [$sel:editedTimestamp:UpdatedMessage] :: UpdatedMessage -> Maybe UTCTime
+ Calamity.Types.Model.Channel.UpdatedMessage: [$sel:embeds:UpdatedMessage] :: UpdatedMessage -> Maybe [Embed]
+ Calamity.Types.Model.Channel.UpdatedMessage: [$sel:id:UpdatedMessage] :: UpdatedMessage -> Snowflake Message
+ Calamity.Types.Model.Channel.UpdatedMessage: [$sel:mentionEveryone:UpdatedMessage] :: UpdatedMessage -> Maybe Bool
+ Calamity.Types.Model.Channel.UpdatedMessage: [$sel:mentionRoles:UpdatedMessage] :: UpdatedMessage -> Maybe (Vector (Snowflake Role))
+ Calamity.Types.Model.Channel.UpdatedMessage: [$sel:mentions:UpdatedMessage] :: UpdatedMessage -> Maybe (Vector (Snowflake User))
+ Calamity.Types.Model.Channel.UpdatedMessage: [$sel:pinned:UpdatedMessage] :: UpdatedMessage -> Maybe Bool
+ Calamity.Types.Model.Channel.UpdatedMessage: [$sel:reactions:UpdatedMessage] :: UpdatedMessage -> Maybe [Reaction]
+ Calamity.Types.Model.Channel.UpdatedMessage: [$sel:tts:UpdatedMessage] :: UpdatedMessage -> Maybe Bool
+ Calamity.Types.Model.Channel.UpdatedMessage: data UpdatedMessage
+ Calamity.Types.Model.Channel.UpdatedMessage: instance Calamity.Types.Snowflake.HasID Calamity.Types.Model.Channel.Channel Calamity.Types.Model.Channel.UpdatedMessage.UpdatedMessage
+ Calamity.Types.Model.Channel.UpdatedMessage: instance Calamity.Types.Snowflake.HasID Calamity.Types.Model.Channel.Message.Message Calamity.Types.Model.Channel.UpdatedMessage.UpdatedMessage
+ Calamity.Types.Model.Channel.UpdatedMessage: instance Data.Aeson.Types.FromJSON.FromJSON Calamity.Types.Model.Channel.UpdatedMessage.UpdatedMessage
+ Calamity.Types.Model.Channel.UpdatedMessage: instance GHC.Classes.Eq Calamity.Types.Model.Channel.UpdatedMessage.UpdatedMessage
+ Calamity.Types.Model.Channel.UpdatedMessage: instance GHC.Generics.Generic Calamity.Types.Model.Channel.UpdatedMessage.UpdatedMessage
+ Calamity.Types.Model.Channel.UpdatedMessage: instance GHC.Show.Show Calamity.Types.Model.Channel.UpdatedMessage.UpdatedMessage
+ Calamity.Types.Model.Channel.UpdatedMessage: instance TextShow.Classes.TextShow Calamity.Types.Model.Channel.UpdatedMessage.UpdatedMessage
- Calamity.Cache.Eff: delDM :: forall r_a9O0R. MemberWithError CacheEff r_a9O0R => Snowflake DMChannel -> Sem r_a9O0R ()
+ Calamity.Cache.Eff: delDM :: forall r_a9O6s. MemberWithError CacheEff r_a9O6s => Snowflake DMChannel -> Sem r_a9O6s ()
- Calamity.Cache.Eff: delGuild :: forall r_a9O0K. MemberWithError CacheEff r_a9O0K => Snowflake Guild -> Sem r_a9O0K ()
+ Calamity.Cache.Eff: delGuild :: forall r_a9O6l. MemberWithError CacheEff r_a9O6l => Snowflake Guild -> Sem r_a9O6l ()
- Calamity.Cache.Eff: delMessage :: forall r_a9O1c. MemberWithError CacheEff r_a9O1c => Snowflake Message -> Sem r_a9O1c ()
+ Calamity.Cache.Eff: delMessage :: forall r_a9O6N. MemberWithError CacheEff r_a9O6N => Snowflake Message -> Sem r_a9O6N ()
- Calamity.Cache.Eff: delUnavailableGuild :: forall r_a9O15. MemberWithError CacheEff r_a9O15 => Snowflake Guild -> Sem r_a9O15 ()
+ Calamity.Cache.Eff: delUnavailableGuild :: forall r_a9O6G. MemberWithError CacheEff r_a9O6G => Snowflake Guild -> Sem r_a9O6G ()
- Calamity.Cache.Eff: delUser :: forall r_a9O0Y. MemberWithError CacheEff r_a9O0Y => Snowflake User -> Sem r_a9O0Y ()
+ Calamity.Cache.Eff: delUser :: forall r_a9O6z. MemberWithError CacheEff r_a9O6z => Snowflake User -> Sem r_a9O6z ()
- Calamity.Cache.Eff: getBotUser :: forall r_a9O0C. MemberWithError CacheEff r_a9O0C => Sem r_a9O0C (Maybe User)
+ Calamity.Cache.Eff: getBotUser :: forall r_a9O6d. MemberWithError CacheEff r_a9O6d => Sem r_a9O6d (Maybe User)
- Calamity.Cache.Eff: getDM :: forall r_a9O0O. MemberWithError CacheEff r_a9O0O => Snowflake DMChannel -> Sem r_a9O0O (Maybe DMChannel)
+ Calamity.Cache.Eff: getDM :: forall r_a9O6p. MemberWithError CacheEff r_a9O6p => Snowflake DMChannel -> Sem r_a9O6p (Maybe DMChannel)
- Calamity.Cache.Eff: getDMs :: forall r_a9O0Q. MemberWithError CacheEff r_a9O0Q => Sem r_a9O0Q [DMChannel]
+ Calamity.Cache.Eff: getDMs :: forall r_a9O6r. MemberWithError CacheEff r_a9O6r => Sem r_a9O6r [DMChannel]
- Calamity.Cache.Eff: getGuild :: forall r_a9O0F. MemberWithError CacheEff r_a9O0F => Snowflake Guild -> Sem r_a9O0F (Maybe Guild)
+ Calamity.Cache.Eff: getGuild :: forall r_a9O6g. MemberWithError CacheEff r_a9O6g => Snowflake Guild -> Sem r_a9O6g (Maybe Guild)
- Calamity.Cache.Eff: getGuildChannel :: forall r_a9O0H. MemberWithError CacheEff r_a9O0H => Snowflake GuildChannel -> Sem r_a9O0H (Maybe GuildChannel)
+ Calamity.Cache.Eff: getGuildChannel :: forall r_a9O6i. MemberWithError CacheEff r_a9O6i => Snowflake GuildChannel -> Sem r_a9O6i (Maybe GuildChannel)
- Calamity.Cache.Eff: getGuilds :: forall r_a9O0J. MemberWithError CacheEff r_a9O0J => Sem r_a9O0J [Guild]
+ Calamity.Cache.Eff: getGuilds :: forall r_a9O6k. MemberWithError CacheEff r_a9O6k => Sem r_a9O6k [Guild]
- Calamity.Cache.Eff: getMessage :: forall r_a9O19. MemberWithError CacheEff r_a9O19 => Snowflake Message -> Sem r_a9O19 (Maybe Message)
+ Calamity.Cache.Eff: getMessage :: forall r_a9O6K. MemberWithError CacheEff r_a9O6K => Snowflake Message -> Sem r_a9O6K (Maybe Message)
- Calamity.Cache.Eff: getMessages :: forall r_a9O1b. MemberWithError CacheEff r_a9O1b => Sem r_a9O1b [Message]
+ Calamity.Cache.Eff: getMessages :: forall r_a9O6M. MemberWithError CacheEff r_a9O6M => Sem r_a9O6M [Message]
- Calamity.Cache.Eff: getUnavailableGuilds :: forall r_a9O14. MemberWithError CacheEff r_a9O14 => Sem r_a9O14 [Snowflake Guild]
+ Calamity.Cache.Eff: getUnavailableGuilds :: forall r_a9O6F. MemberWithError CacheEff r_a9O6F => Sem r_a9O6F [Snowflake Guild]
- Calamity.Cache.Eff: getUser :: forall r_a9O0V. MemberWithError CacheEff r_a9O0V => Snowflake User -> Sem r_a9O0V (Maybe User)
+ Calamity.Cache.Eff: getUser :: forall r_a9O6w. MemberWithError CacheEff r_a9O6w => Snowflake User -> Sem r_a9O6w (Maybe User)
- Calamity.Cache.Eff: getUsers :: forall r_a9O0X. MemberWithError CacheEff r_a9O0X => Sem r_a9O0X [User]
+ Calamity.Cache.Eff: getUsers :: forall r_a9O6y. MemberWithError CacheEff r_a9O6y => Sem r_a9O6y [User]
- Calamity.Cache.Eff: isUnavailableGuild :: forall r_a9O12. MemberWithError CacheEff r_a9O12 => Snowflake Guild -> Sem r_a9O12 Bool
+ Calamity.Cache.Eff: isUnavailableGuild :: forall r_a9O6D. MemberWithError CacheEff r_a9O6D => Snowflake Guild -> Sem r_a9O6D Bool
- Calamity.Cache.Eff: setBotUser :: forall r_a9O0A. MemberWithError CacheEff r_a9O0A => User -> Sem r_a9O0A ()
+ Calamity.Cache.Eff: setBotUser :: forall r_a9O6b. MemberWithError CacheEff r_a9O6b => User -> Sem r_a9O6b ()
- Calamity.Cache.Eff: setDM :: forall r_a9O0M. MemberWithError CacheEff r_a9O0M => DMChannel -> Sem r_a9O0M ()
+ Calamity.Cache.Eff: setDM :: forall r_a9O6n. MemberWithError CacheEff r_a9O6n => DMChannel -> Sem r_a9O6n ()
- Calamity.Cache.Eff: setGuild :: forall r_a9O0D. MemberWithError CacheEff r_a9O0D => Guild -> Sem r_a9O0D ()
+ Calamity.Cache.Eff: setGuild :: forall r_a9O6e. MemberWithError CacheEff r_a9O6e => Guild -> Sem r_a9O6e ()
- Calamity.Cache.Eff: setMessage :: forall r_a9O17. MemberWithError CacheEff r_a9O17 => Message -> Sem r_a9O17 ()
+ Calamity.Cache.Eff: setMessage :: forall r_a9O6I. MemberWithError CacheEff r_a9O6I => Message -> Sem r_a9O6I ()
- Calamity.Cache.Eff: setUnavailableGuild :: forall r_a9O10. MemberWithError CacheEff r_a9O10 => Snowflake Guild -> Sem r_a9O10 ()
+ Calamity.Cache.Eff: setUnavailableGuild :: forall r_a9O6B. MemberWithError CacheEff r_a9O6B => Snowflake Guild -> Sem r_a9O6B ()
- Calamity.Cache.Eff: setUser :: forall r_a9O0T. MemberWithError CacheEff r_a9O0T => User -> Sem r_a9O0T ()
+ Calamity.Cache.Eff: setUser :: forall r_a9O6u. MemberWithError CacheEff r_a9O6u => User -> Sem r_a9O6u ()
- Calamity.Commands.ParsePrefix: parsePrefix :: forall r_a7reh. MemberWithError ParsePrefix r_a7reh => Message -> Sem r_a7reh (Maybe (Text, Text))
+ Calamity.Commands.ParsePrefix: parsePrefix :: forall r_a7rjS. MemberWithError ParsePrefix r_a7rjS => Message -> Sem r_a7rjS (Maybe (Text, Text))
Files
- ChangeLog.md +8/−0
- calamity.cabal +3/−2
- src/Calamity/Gateway/DispatchEvents.hs +1/−1
- src/Calamity/Internal/Updateable.hs +1/−1
- src/Calamity/Types/Model/Channel.hs +1/−1
- src/Calamity/Types/Model/Channel/Message.hs +0/−23
- src/Calamity/Types/Model/Channel/Message.hs-boot +0/−6
- src/Calamity/Types/Model/Channel/UpdatedMessage.hs +43/−0
ChangeLog.md view
@@ -1,5 +1,13 @@ # Changelog for Calamity +## 0.1.11.2++*2020-06-03*++* Moved the internal `UpdatedMessage` from+ `Calamity.Types.Model.Channel.Message` into+ `Calamity.Types.Model.Channel.UpdatedMessage`.+ ## 0.1.11.0 *2020-05-31*
calamity.cabal view
@@ -4,10 +4,10 @@ -- -- see: https://github.com/sol/hpack ----- hash: 12a035b3d93c607f12c355b451e20803b1c5e62716eddb253a236cf2467effe3+-- hash: ba16c0e978455ebd1dd04a85ba656738289d036e6dfe9e45b55d5843d6511fab name: calamity-version: 0.1.11.1+version: 0.1.11.2 synopsis: A library for writing discord bots description: Please see the README on GitHub at <https://github.com/nitros12/calamity#readme> category: Network, Web@@ -100,6 +100,7 @@ Calamity.Types.Model.Channel.Guild.Voice Calamity.Types.Model.Channel.Message Calamity.Types.Model.Channel.Reaction+ Calamity.Types.Model.Channel.UpdatedMessage Calamity.Types.Model.Channel.Webhook Calamity.Types.Model.Guild Calamity.Types.Model.Guild.AuditLog
src/Calamity/Gateway/DispatchEvents.hs view
@@ -5,7 +5,7 @@ import Calamity.Internal.ConstructorName import Calamity.Internal.Utils () import Calamity.Types.Model.Channel-import Calamity.Types.Model.Channel.Message+import Calamity.Types.Model.Channel.UpdatedMessage import Calamity.Types.Model.Guild.Ban import Calamity.Types.Model.Guild.Emoji import Calamity.Types.Model.Guild.Guild
src/Calamity/Internal/Updateable.hs view
@@ -4,7 +4,7 @@ import Calamity.Internal.Utils import Calamity.Types.Model.Channel-import Calamity.Types.Model.Channel.Message+import Calamity.Types.Model.Channel.UpdatedMessage import Calamity.Types.Model.Guild.Guild import Calamity.Types.Model.User
src/Calamity/Types/Model/Channel.hs view
@@ -19,7 +19,7 @@ import Calamity.Types.Model.Channel.Embed import Calamity.Types.Model.Channel.Group import Calamity.Types.Model.Channel.Guild-import {-# SOURCE #-} Calamity.Types.Model.Channel.Message hiding ( UpdatedMessage )+import {-# SOURCE #-} Calamity.Types.Model.Channel.Message import Calamity.Types.Model.Channel.Reaction import Calamity.Types.Model.Channel.Webhook import Calamity.Types.Partial
src/Calamity/Types/Model/Channel/Message.hs view
@@ -1,7 +1,6 @@ -- | A message from a channel module Calamity.Types.Model.Channel.Message ( Message(..)- , UpdatedMessage(..) , MessageType(..) ) where import Calamity.Internal.AesonThings@@ -54,28 +53,6 @@ deriving ( HasID Message ) via HasIDField "id" Message deriving ( HasID Channel ) via HasIDField "channelID" Message deriving ( HasID User ) via HasIDField "author" Message--data UpdatedMessage = UpdatedMessage- { id :: Snowflake Message- , channelID :: Snowflake Channel- , content :: Maybe Text- , editedTimestamp :: Maybe UTCTime- , tts :: Maybe Bool- , mentionEveryone :: Maybe Bool- , mentions :: Maybe (UV.Vector (Snowflake User))- , mentionRoles :: Maybe (UV.Vector (Snowflake Role))- , attachments :: Maybe [Attachment]- , embeds :: Maybe [Embed]- , reactions :: Maybe [Reaction]- , pinned :: Maybe Bool- }- deriving ( Eq, Show, Generic )- deriving ( TextShow ) via TSG.FromGeneric UpdatedMessage- deriving ( FromJSON ) via WithSpecialCases- '["author" `ExtractField` "id", "mentions" `ExtractFields` "id"]- UpdatedMessage- deriving ( HasID Message ) via HasIDField "id" UpdatedMessage- deriving ( HasID Channel ) via HasIDField "channelID" UpdatedMessage -- Thanks sbrg (https://github.com/saevarb/haskord/blob/d1bb07bcc4f3dbc29f2dfd3351ff9f16fc100c07/haskord-lib/src/Haskord/Types/Common.hs#L264) data MessageType
src/Calamity/Types/Model/Channel/Message.hs-boot view
@@ -1,18 +1,12 @@ -- | A message from a channel module Calamity.Types.Model.Channel.Message ( Message- , UpdatedMessage , MessageType ) where data Message instance Show Message instance Eq Message--data UpdatedMessage--instance Show UpdatedMessage-instance Eq UpdatedMessage data MessageType
+ src/Calamity/Types/Model/Channel/UpdatedMessage.hs view
@@ -0,0 +1,43 @@+-- | Updated messages+module Calamity.Types.Model.Channel.UpdatedMessage+ ( UpdatedMessage(..)+ ) where++import Calamity.Internal.AesonThings+import Calamity.Internal.Utils ()+import Calamity.Types.Model.Channel+import Calamity.Types.Model.Guild.Role+import Calamity.Types.Model.User+import Calamity.Types.Snowflake++import Data.Aeson+import Data.Text.Lazy ( Text )+import Data.Time+import qualified Data.Vector.Unboxed as UV++import GHC.Generics++import TextShow+import qualified TextShow.Generic as TSG++data UpdatedMessage = UpdatedMessage+ { id :: Snowflake Message+ , channelID :: Snowflake Channel+ , content :: Maybe Text+ , editedTimestamp :: Maybe UTCTime+ , tts :: Maybe Bool+ , mentionEveryone :: Maybe Bool+ , mentions :: Maybe (UV.Vector (Snowflake User))+ , mentionRoles :: Maybe (UV.Vector (Snowflake Role))+ , attachments :: Maybe [Attachment]+ , embeds :: Maybe [Embed]+ , reactions :: Maybe [Reaction]+ , pinned :: Maybe Bool+ }+ deriving ( Eq, Show, Generic )+ deriving ( TextShow ) via TSG.FromGeneric UpdatedMessage+ deriving ( FromJSON ) via WithSpecialCases+ '["author" `ExtractField` "id", "mentions" `ExtractFields` "id"]+ UpdatedMessage+ deriving ( HasID Message ) via HasIDField "id" UpdatedMessage+ deriving ( HasID Channel ) via HasIDField "channelID" UpdatedMessage