Handle stickers, properly handle exceptions in threads

2 files changed, 5 insertions, 11 deletions

diff --git a/deps/discord-haskell/examples/interaction-commands.hs b/deps/discord-haskell/examples/interaction-commands.hs
index 7d22825..50e0b1d 100644
--- a/deps/discord-haskell/examples/interaction-commands.hs
+++ b/deps/discord-haskell/examples/interaction-commands.hs
@@ -54,15 +54,11 @@ interactionCommandExample = do
 --     Use place to execute commands you know you want to complete
 startHandler :: GuildId -> DiscordHandler ()
 startHandler testserverid = do
-  let activity =
-        def
-          { activityName = "ping-pong",
-            activityType = ActivityTypeGame
-          }
+  let activity = mkActivity "interaction-commands" ActivityTypeGame
   let opts =
         UpdateStatusOpts
           { updateStatusOptsSince = Nothing,
-            updateStatusOptsGame = Just activity,
+            updateStatusOptsActivities = [activity],
             updateStatusOptsNewStatus = UpdateStatusOnline,
             updateStatusOptsAFK = False
           }
@@ -394,7 +390,7 @@ eventHandler testserverid event = case event of
     void
       ( do
           exampleImage <- liftIO getImage
-          aid <- readCache <&> cacheApplication <&> partialApplicationID
+          aid <- readCache <&> cacheApplication <&> fullApplicationID
           _ <- restCall (R.CreateInteractionResponse interactionId interactionToken InteractionResponseDeferChannelMessage)
           restCall
             ( R.CreateFollowupInteractionMessage
diff --git a/deps/discord-haskell/examples/ping-pong.hs b/deps/discord-haskell/examples/ping-pong.hs
index 87ec08b..3dff866 100644
--- a/deps/discord-haskell/examples/ping-pong.hs
+++ b/deps/discord-haskell/examples/ping-pong.hs
@@ -42,11 +42,9 @@ startHandler :: GuildId -> DiscordHandler ()
 startHandler testserverid = do
   liftIO $ putStrLn "Started ping-pong bot"
 
-  let activity = def { activityName = "ping-pong"
-                     , activityType = ActivityTypeGame
-                     }
+  let activity = (mkActivity "ping-pong" ActivityTypeStreaming) { activityUrl = Just "https://www.youtube.com/watch?v=dQw4w9WgXcQ", activityState = Just "rolling down a hill" }
   let opts = UpdateStatusOpts { updateStatusOptsSince = Nothing
-                              , updateStatusOptsGame = Just activity
+                              , updateStatusOptsActivities = [activity]
                               , updateStatusOptsNewStatus = UpdateStatusOnline
                               , updateStatusOptsAFK = False
                               }