diff options
| -rw-r--r-- | main/Main.hs | 2 | ||||
| -rw-r--r-- | src/Erebos/Conversation.hs | 2 | ||||
| -rw-r--r-- | src/Erebos/Message.hs | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/main/Main.hs b/main/Main.hs index b148aa6..8a1a851 100644 --- a/main/Main.hs +++ b/main/Main.hs @@ -45,7 +45,7 @@ import Erebos.Discovery import Erebos.ICE #endif import Erebos.Identity -import Erebos.Message hiding (formatMessage) +import Erebos.Message import Erebos.Network import Erebos.Object import Erebos.PubKey diff --git a/src/Erebos/Conversation.hs b/src/Erebos/Conversation.hs index 68d15ce..415bdc0 100644 --- a/src/Erebos/Conversation.hs +++ b/src/Erebos/Conversation.hs @@ -31,7 +31,7 @@ import Data.Time.LocalTime import Erebos.Chatroom import Erebos.Identity -import Erebos.Message hiding (formatMessage) +import Erebos.Message import Erebos.State import Erebos.Storable diff --git a/src/Erebos/Message.hs b/src/Erebos/Message.hs index a81e795..5ac0ca4 100644 --- a/src/Erebos/Message.hs +++ b/src/Erebos/Message.hs @@ -13,7 +13,6 @@ module Erebos.Message ( messageThreadView, watchReceivedMessages, - formatMessage, formatDirectMessage, ) where @@ -260,10 +259,6 @@ watchReceivedMessages h f = do forM_ (map fromStored sms) $ \ms -> do mapM_ f $ filter (not . sameIdentity self . msgFrom . fromStored) $ msReceived ms -{-# DEPRECATED formatMessage "use formatDirectMessage instead" #-} -formatMessage :: TimeZone -> DirectMessage -> String -formatMessage = formatDirectMessage - formatDirectMessage :: TimeZone -> DirectMessage -> String formatDirectMessage tzone msg = concat [ formatTime defaultTimeLocale "[%H:%M] " $ utcToLocalTime tzone $ zonedTimeToUTC $ msgTime msg |