core: allow to set disappearance interval when sending message; don't check content change on live item updates (#2423)
* core: allow to set disappearance interval when sending message
* remove commented code
* enable tests
* don't check content change on live item updates
* update logic
* rename variable
* refactor, restore that received message can disabled disappearing
* refactor
* Revert "refactor"
This reverts commit 60dee29d76.
* separate event
---------
Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
This commit is contained in:
1 parent
635d797b2e
commit
88059a2cc5
6 files changed
+105
-51
No files matched your search
@@ -34,6 +34,7 @@ chatDirectTests = do
|
||||
it "direct message edit history" testDirectMessageEditHistory
|
||||
it "direct message delete" testDirectMessageDelete
|
||||
it "direct live message" testDirectLiveMessage
|
||||
it "direct timed message" testDirectTimedMessage
|
||||
it "repeat AUTH errors disable contact" testRepeatAuthErrorsDisableContact
|
||||
it "should send multiline message" testMultilineMessage
|
||||
describe "SMP servers" $ do
|
||||
@@ -228,6 +229,9 @@ testDirectMessageUpdate =
|
||||
alice #$> ("/_get chat @2 count=100", chat', chatFeatures' <> [((1, "hello 🙂"), Nothing), ((0, "hi alice"), Just (1, "hello 🙂"))])
|
||||
bob #$> ("/_get chat @2 count=100", chat', chatFeatures' <> [((0, "hello 🙂"), Nothing), ((1, "hi alice"), Just (0, "hello 🙂"))])
|
||||
|
||||
alice ##> ("/_update item @2 " <> itemId 1 <> " text hello 🙂")
|
||||
alice <## "message didn't change"
|
||||
|
||||
alice ##> ("/_update item @2 " <> itemId 1 <> " text hey 👋")
|
||||
alice <# "@bob [edited] hey 👋"
|
||||
bob <# "alice> [edited] hey 👋"
|
||||
@@ -440,6 +444,32 @@ testDirectLiveMessage =
|
||||
bob .<## ": hello 2"
|
||||
bob .<## ":"
|
||||
|
||||
testDirectTimedMessage :: HasCallStack => FilePath -> IO ()
|
||||
testDirectTimedMessage =
|
||||
testChat2 aliceProfile bobProfile $
|
||||
\alice bob -> do
|
||||
connectUsers alice bob
|
||||
|
||||
alice ##> "/_send @2 ttl=1 text hello!"
|
||||
alice <# "@bob hello!"
|
||||
bob <# "alice> hello!"
|
||||
alice <## "timed message deleted: hello!"
|
||||
bob <## "timed message deleted: hello!"
|
||||
|
||||
alice ##> "/_send @2 live=off ttl=1 text hey"
|
||||
alice <# "@bob hey"
|
||||
bob <# "alice> hey"
|
||||
alice <## "timed message deleted: hey"
|
||||
bob <## "timed message deleted: hey"
|
||||
|
||||
alice ##> "/_send @2 ttl=default text hello"
|
||||
alice <# "@bob hello"
|
||||
bob <# "alice> hello"
|
||||
|
||||
alice ##> "/_send @2 live=off text hi"
|
||||
alice <# "@bob hi"
|
||||
bob <# "alice> hi"
|
||||
|
||||
testRepeatAuthErrorsDisableContact :: HasCallStack => FilePath -> IO ()
|
||||
testRepeatAuthErrorsDisableContact =
|
||||
testChat2 aliceProfile bobProfile $ \alice bob -> do
|
||||
|
||||
@@ -820,6 +820,9 @@ testGroupMessageUpdate =
|
||||
(cath <# "#team alice> hello!")
|
||||
|
||||
msgItemId1 <- lastItemId alice
|
||||
alice ##> ("/_update item #1 " <> msgItemId1 <> " text hello!")
|
||||
alice <## "message didn't change"
|
||||
|
||||
alice ##> ("/_update item #1 " <> msgItemId1 <> " text hey 👋")
|
||||
alice <# "#team [edited] hey 👋"
|
||||
concurrently_
|
||||
|
||||
Reference in new issue
Block a user