Merge branch 'sleiws-master'

lib/src/main/java/org/asamk/signal/manager/Manager.java

@@ -197,6 +197,10 @@ public interface Manager extends Closeable {
             boolean notifySelf
     ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException;
 
+    SendMessageResults sendStoryMessage(
+            Message message, Set<RecipientIdentifier> recipients, boolean notifySelf
+    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException;
+    
     SendMessageResults sendEditMessage(
             Message message,
             Set<RecipientIdentifier> recipients,

lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java

@@ -95,6 +95,7 @@ import org.slf4j.LoggerFactory;
 import org.whispersystems.signalservice.api.SignalSessionLock;
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
+import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage.StoryContext;
 import org.whispersystems.signalservice.api.messages.SignalServicePreview;
 import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
@@ -750,6 +751,21 @@ public class ManagerImpl implements Manager {
         return sendMessage(messageBuilder, recipients, notifySelf);
     }
 
+    @Override
+    public SendMessageResults sendStoryMessage(
+            Message message, Set<RecipientIdentifier> recipients, boolean notifySelf
+    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException, UnregisteredRecipientException, InvalidStickerException {
+        final var selfProfile = context.getProfileHelper().getSelfProfile();
+        if (selfProfile == null || selfProfile.getDisplayName().isEmpty()) {
+            logger.warn(
+                    "No profile name set. When sending a message it's recommended to set a profile name with the updateProfile command. This may become mandatory in the future.");
+        }
+        final var messageBuilder = SignalServiceDataMessage.newBuilder();
+        applyMessage(messageBuilder, message);
+        messageBuilder.withStoryContext(new StoryContext(account.getSelfAddress().getServiceId(), System.currentTimeMillis()));
+        return sendMessage(messageBuilder, recipients, notifySelf);
+    }
+
     @Override
     public SendMessageResults sendEditMessage(
             Message message,

src/main/java/org/asamk/signal/dbus/DbusManagerImpl.java

@@ -427,6 +427,16 @@ public class DbusManagerImpl implements Manager {
                 groupId -> signal.sendGroupMessage(message.messageText(), message.attachments(), groupId));
     }
 
+    @Override
+    public SendMessageResults sendStoryMessage(
+            final Message message, final Set<RecipientIdentifier> recipients, final boolean notifySelf
+    ) throws IOException, AttachmentInvalidException, NotAGroupMemberException, GroupNotFoundException, GroupSendingNotAllowedException {
+        return handleMessage(recipients,
+                numbers -> signal.sendMessage(message.messageText(), message.attachments(), numbers),
+                () -> signal.sendNoteToSelfMessage(message.messageText(), message.attachments()),
+                groupId -> signal.sendStoryMessage(message.messageText(), message.attachments(), groupId));
+    }
+
     @Override
     public SendMessageResults sendEditMessage(
             final Message message,

src/main/java/org/asamk/signal/dbus/DbusSignalImpl.java

@@ -464,6 +464,31 @@ public class DbusSignalImpl implements Signal, AutoCloseable {
         }
     }
 
+    @Override
+    public long sendStoryMessage(final String messageText, final List<String> attachments, final byte[] groupId) {
+        try {
+            final var message = new Message(messageText,
+                    attachments,
+                    List.of(),
+                    Optional.empty(),
+                    Optional.empty(),
+                    List.of(),
+                    Optional.empty(),
+                    List.of());
+            var results = m.sendStoryMessage(message, Set.of(getGroupRecipientIdentifier(groupId)), false);
+            checkSendMessageResults(results);
+            return results.timestamp();
+        } catch (IOException | InvalidStickerException e) {
+            throw new Error.Failure(e.getMessage());
+        } catch (GroupNotFoundException | NotAGroupMemberException | GroupSendingNotAllowedException e) {
+            throw new Error.GroupNotFound(e.getMessage());
+        } catch (AttachmentInvalidException e) {
+            throw new Error.AttachmentInvalid(e.getMessage());
+        } catch (UnregisteredRecipientException e) {
+            throw new Error.UntrustedIdentity(e.getSender().getIdentifier() + " is not registered.");
+        }
+    }
+
     @Override
     public void sendGroupTyping(
             final byte[] groupId,