Skip to content

Commit 199219a

Browse files
committed
fix: auto insert GIF caption and entities
1 parent d7805f6 commit 199219a

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

TMessagesProj/src/main/java/org/telegram/messenger/SendMessagesHelper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1952,6 +1952,7 @@ public void sendSticker(TLRPC.Document document, String query, long peer, CharSe
19521952
sendMessageParams.monoForumPeer = monoForumPeerId;
19531953
sendMessageParams.suggestionParams = suggestionParams;
19541954
sendMessageParams.caption = caption != null ? caption.toString() : null;
1955+
sendMessageParams.entities = caption != null ? getMediaDataController().getEntities(new CharSequence[]{caption}, true) : null;
19551956
sendMessageParams.invert_media = invertMedia;
19561957
sendMessage(sendMessageParams);
19571958
});

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12512,7 +12512,17 @@ public void onGifSelected(View view, Object gif, String query, Object parent, bo
1251212512

1251312513
SendMessagesHelper.prepareSendingMedia(AccountInstance.getInstance(currentAccount), photos, dialog_id, replyingMessageObject, getThreadMessage(), null, replyingQuote, false, false, editingMessageObject, notify, scheduleDate, scheduleRepeatPeriod, 0, false, null, parentFragment != null ? parentFragment.quickReplyShortcut : null, parentFragment != null ? parentFragment.getQuickReplyId() : 0, effectId, invertMedia, stars, getSendMonoForumPeerId(), getSendMessageSuggestionParams());
1251412514
} else {
12515-
SendMessagesHelper.getInstance(currentAccount).sendSticker(document, query, dialog_id, entry != null ? entry.caption : null, videoEditedInfo, replyingMessageObject, getThreadMessage(), storyItem, replyingQuote, null, notify, scheduleDate, scheduleRepeatPeriod, false, parent, parentFragment != null ? parentFragment.quickReplyShortcut : null, parentFragment != null ? parentFragment.getQuickReplyId() : 0, stars, getSendMonoForumPeerId(), getSendMessageSuggestionParams(), invertMedia);
12515+
if (NaConfig.INSTANCE.getAutoInsertGIFCaption().Bool() && entry == null && messageEditText != null) {
12516+
var messages = new CharSequence[]{AndroidUtilities.getTrimmedString(messageEditText.getTextToUse())};
12517+
CharSequence caption = messages[0];
12518+
if (caption.toString().startsWith("@gif")) {
12519+
caption = "";
12520+
}
12521+
SendMessagesHelper.getInstance(currentAccount).sendSticker(document, query, dialog_id, caption, videoEditedInfo, replyingMessageObject, getThreadMessage(), storyItem, replyingQuote, null, notify, scheduleDate, scheduleRepeatPeriod, false, parent, parentFragment != null ? parentFragment.quickReplyShortcut : null, parentFragment != null ? parentFragment.getQuickReplyId() : 0, stars, getSendMonoForumPeerId(), getSendMessageSuggestionParams(), invertMedia);
12522+
messageEditText.setText("");
12523+
} else {
12524+
SendMessagesHelper.getInstance(currentAccount).sendSticker(document, query, dialog_id, entry != null ? entry.caption : null, videoEditedInfo, replyingMessageObject, getThreadMessage(), storyItem, replyingQuote, null, notify, scheduleDate, scheduleRepeatPeriod, false, parent, parentFragment != null ? parentFragment.quickReplyShortcut : null, parentFragment != null ? parentFragment.getQuickReplyId() : 0, stars, getSendMonoForumPeerId(), getSendMessageSuggestionParams(), invertMedia);
12525+
}
1251612526
MediaDataController.getInstance(currentAccount).addRecentGif(document, (int) (System.currentTimeMillis() / 1000), true);
1251712527
if (DialogObject.isEncryptedDialog(dialog_id)) {
1251812528
accountInstance.getMessagesController().saveGif(parent, document);

0 commit comments

Comments
 (0)