core: send SMP notification msg flag based on chat message (#733)

* core: send SMP notification msg flag based on chat message

* update simplexmq

* remove unnecessary condition

Co-authored-by: JRoberts <8711996+jr-simplex@users.noreply.github.com>

Co-authored-by: JRoberts <8711996+jr-simplex@users.noreply.github.com>

src/Simplex/Chat/Archive.hs

@@ -6,9 +6,9 @@ module Simplex.Chat.Archive where
 import qualified Codec.Archive.Zip as Z
 import Control.Monad.Reader
 import Simplex.Chat.Controller
-import Simplex.Chat.Util (whenM)
 import Simplex.Messaging.Agent.Client (agentDbPath)
 import Simplex.Messaging.Agent.Store.SQLite (SQLiteStore (..))
+import Simplex.Messaging.Util (whenM)
 import System.FilePath
 import UnliftIO.Directory
 import UnliftIO.STM

src/Simplex/Chat/Messages.hs

@@ -32,12 +32,12 @@ import GHC.Generics (Generic)
 import Simplex.Chat.Markdown
 import Simplex.Chat.Protocol
 import Simplex.Chat.Types
-import Simplex.Chat.Util (eitherToMaybe, safeDecodeUtf8)
+import Simplex.Chat.Util (safeDecodeUtf8)
 import Simplex.Messaging.Agent.Protocol (AgentErrorType, AgentMsgId, MsgErrorType (..), MsgMeta (..))
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (dropPrefix, enumJSON, fromTextField_, singleFieldJSON, sumTypeJSON)
 import Simplex.Messaging.Protocol (MsgBody)
-import Simplex.Messaging.Util ((<$?>))
+import Simplex.Messaging.Util (eitherToMaybe, (<$?>))
 
 data ChatType = CTDirect | CTGroup | CTContactRequest | CTContactConnection
   deriving (Show, Generic)

src/Simplex/Chat/Protocol.hs

@@ -31,10 +31,10 @@ import Database.SQLite.Simple.ToField (ToField (..))
 import GHC.Generics (Generic)
 import Simplex.Chat.Call
 import Simplex.Chat.Types
-import Simplex.Chat.Util (eitherToMaybe, safeDecodeUtf8)
+import Simplex.Chat.Util (safeDecodeUtf8)
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (fromTextField_)
-import Simplex.Messaging.Util ((<$?>))
+import Simplex.Messaging.Util (eitherToMaybe, (<$?>))
 
 data ConnectionEntity
   = RcvDirectMsgConnection {entityConnection :: Connection, contact :: Maybe Contact}
@@ -437,6 +437,16 @@ instance FromField CMEventTag where fromField = fromTextField_ cmEventTagT
 
 instance ToField CMEventTag where toField = toField . serializeCMEventTag
 
+hasNotification :: CMEventTag -> Bool
+hasNotification = \case
+  XMsgNew_ -> True
+  XFile_ -> True
+  XContact_ -> True
+  XGrpInv_ -> True
+  XGrpDel_ -> True
+  XCallInv_ -> True
+  _ -> False
+
 appToChatMessage :: AppMessage -> Either String ChatMessage
 appToChatMessage AppMessage {msgId, event, params} = do
   eventTag <- strDecode $ encodeUtf8 event

src/Simplex/Chat/Store.hs

@@ -206,7 +206,6 @@ import Simplex.Chat.Migrations.M20220404_files_status_fields
 import Simplex.Chat.Migrations.M20220514_profiles_user_id
 import Simplex.Chat.Protocol
 import Simplex.Chat.Types
-import Simplex.Chat.Util (eitherToMaybe)
 import Simplex.Messaging.Agent.Protocol (AgentMsgId, ConnId, InvitationId, MsgMeta (..))
 import Simplex.Messaging.Agent.Store.SQLite (SQLiteStore (..), createSQLiteStore, firstRow, withTransaction)
 import Simplex.Messaging.Agent.Store.SQLite.Migrations (Migration (..))
@@ -214,7 +213,7 @@ import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Encoding.String (StrEncoding (strEncode))
 import Simplex.Messaging.Parsers (dropPrefix, sumTypeJSON)
 import Simplex.Messaging.Protocol (ProtocolServer (..), SMPServer, pattern SMPServer)
-import Simplex.Messaging.Util (liftIOEither, (<$$>))
+import Simplex.Messaging.Util (eitherToMaybe, liftIOEither, (<$$>))
 import UnliftIO.STM
 
 schemaMigrations :: [(String, Query)]

src/Simplex/Chat/Util.hs

@@ -1,6 +1,5 @@
 module Simplex.Chat.Util where
 
-import Control.Monad (when)
 import Data.ByteString.Char8 (ByteString)
 import Data.Text (Text)
 import Data.Text.Encoding (decodeUtf8With)
@@ -9,15 +8,3 @@ safeDecodeUtf8 :: ByteString -> Text
 safeDecodeUtf8 = decodeUtf8With onError
   where
     onError _ _ = Just '?'
-
-ifM :: Monad m => m Bool -> m a -> m a -> m a
-ifM ba t f = ba >>= \b -> if b then t else f
-
-whenM :: Monad m => m Bool -> m () -> m ()
-whenM ba a = ba >>= (`when` a)
-
-unlessM :: Monad m => m Bool -> m () -> m ()
-unlessM b = ifM b $ pure ()
-
-eitherToMaybe :: Either a b -> Maybe b
-eitherToMaybe = either (const Nothing) Just