.

Author: 23rd

TMessagesProj/src/main/java/org/telegram/messenger/forkgram/AsCopyUtils.kt

@@ -63,7 +63,8 @@ fun PerformForwardFromMyName(
         sendingMessageObjects: ArrayList<MessageObject>,
         currentAccount: Int,
         parentFragment: BaseFragment?,
-        notify: Boolean) {
+        notify: Boolean,
+        monoForumPeerId: Long = 0L) {
 
     val queue = ArrayList<() -> Unit>();
     val saveOriginalCaptions = (text == null)
@@ -101,6 +102,7 @@ fun PerformForwardFromMyName(
                 parentFragment,
                 copyText,
                 notify,
+                monoForumPeerId,
                 deque)
         }
     }
@@ -122,7 +124,7 @@ fun PerformForwardFromMyName(
         val copyText = currentReplaceText();
         queue.add {
             val instance = SendMessagesHelper.getInstance(currentAccount);
-            instance.processForwardFromMyName(copyMsg, key, 0, topicId, null, copyText, notify, topicId)
+            instance.processForwardFromMyName(copyMsg, key, 0, 0, null, copyText, notify, topicId, monoForumPeerId)
             deque();
         }
     }
@@ -140,7 +142,8 @@ fun GroupItemsIntoAlbum(
         sendingMessageObjects: ArrayList<MessageObject>,
         currentAccount: Int,
         parentFragment: BaseFragment?,
-        notify: Boolean) {
+        notify: Boolean,
+        monoForumPeerId: Long = 0L) {
     if (sendingMessageObjects.isEmpty()) {
         return;
     }
@@ -153,7 +156,7 @@ fun GroupItemsIntoAlbum(
     val objectsToDelay = sub(objectsToSend.size, sendingMessageObjects.size);
 
     val finish = {
-        GroupItemsIntoAlbum(key, reply, text, objectsToDelay, currentAccount, parentFragment, notify)
+        GroupItemsIntoAlbum(key, reply, text, objectsToDelay, currentAccount, parentFragment, notify, monoForumPeerId)
     };
 
     SendItemsAsAlbum(
@@ -164,6 +167,7 @@ fun GroupItemsIntoAlbum(
             parentFragment,
             text,
             notify,
+            monoForumPeerId,
             finish)
 }
 
@@ -211,12 +215,13 @@ fun SendItemsAsAlbum(
         fragment: BaseFragment?,
         replaceText: String?,
         notify: Boolean,
+        monoForumPeerId: Long = 0L,
         finish: () -> Unit) {
     if (peer == 0L || messages.size > 10 || messages.isEmpty()) {
         return
     }
     val accountInstance = AccountInstance.getInstance(currentAccount)
-    val lower_id = peer
+    val lower_id = if (monoForumPeerId != 0L) monoForumPeerId else peer
     val sendToPeer: InputPeer = 
         (if (lower_id != 0L) accountInstance.messagesController.getInputPeer(lower_id)
             else null)
@@ -306,7 +311,7 @@ fun SendItemsAsAlbum(
                 showToast("Sorry, something went wrong.");
                 return@handleMessages
             }
-            SendItemsAsAlbum(currentAccount, messages, peer, reply, fragment, replaceText, notify, finish)
+            SendItemsAsAlbum(currentAccount, messages, peer, reply, fragment, replaceText, notify, monoForumPeerId, finish)
         }
 
         ForkApi.TLRPCMessages(currentAccount, messages, handleMessages);

TMessagesProj/src/main/java/org/telegram/ui/Components/ShareAlert.java

@@ -1809,11 +1809,17 @@ public int getFillColor() {
                             : "")
                         : null;
                     if (hasComment && !nonText) {
-                        SendMessagesHelper.getInstance(account).sendMessage(SendMessagesHelper.SendMessageParams.of(
+                        boolean isMonoForum = MessagesController.getInstance(account).isMonoForum(key);
+                        long monoForumPeerId = keyTopic != null && isMonoForum ? DialogObject.getPeerDialogId(keyTopic.from_id) : 0;
+                        MessageObject replyTopMsg = keyTopic != null && !isMonoForum ? new MessageObject(account, keyTopic.topicStartMessage, false, false) : null;
+                        if (replyTopMsg != null) {
+                            replyTopMsg.isTopicMainMessage = true;
+                        }
+                        SendMessagesHelper.SendMessageParams params = SendMessagesHelper.SendMessageParams.of(
                             commentTextView.getText().toString(),
                             key,
-                            null,
-                            null,
+                            replyTopMsg,
+                            replyTopMsg,
                             null,
                             true,
                             null,
@@ -1822,29 +1828,41 @@ public int getFillColor() {
                             notify,
                             0,
                             null,
-                            false));
+                            false);
+                        params.monoForumPeer = monoForumPeerId;
+                        SendMessagesHelper.getInstance(account).sendMessage(params);
                     }
                     if (groupAnyItems) {
+                        boolean isMonoForum = MessagesController.getInstance(account).isMonoForum(key);
+                        long monoForumPeerId = keyTopic != null && isMonoForum ? DialogObject.getPeerDialogId(keyTopic.from_id) : 0;
+                        int replyId = AsCopy.TakeReplyToDraft(key, keyTopic, account, true);
+                        if (replyId == 0 && keyTopic != null && !isMonoForum) {
+                            replyId = keyTopic.id;
+                        }
                         AsCopy.GroupItemsIntoAlbum(
                             key,
-                            AsCopy.TakeReplyToDraft(key, keyTopic, account, true),
+                            replyId,
                             maybeReplaceText,
                             sendingMessageObjects,
                             account,
                             parentFragment,
-                            notify);
+                            notify,
+                            monoForumPeerId);
                         onSend(selectedDialogs, selectedDialogs.size(), keyTopic, info);
                         dismiss();
                         return;
                     }
+                    boolean isMonoForum = MessagesController.getInstance(account).isMonoForum(key);
+                    long monoForumPeerId = keyTopic != null && isMonoForum ? DialogObject.getPeerDialogId(keyTopic.from_id) : 0;
                     AsCopy.PerformForwardFromMyName(
                         key,
                         keyTopic,
                         maybeReplaceText,
                         sendingMessageObjects,
                         account,
                         parentFragment,
-                        notify);
+                        notify,
+                        monoForumPeerId);
                 }
                 onSend(selectedDialogs, selectedDialogs.size(), selectedDialogTopics.get(selectedDialogs.valueAt(0)), info);
             } else {