Mirrors/Barinsta
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pluralize dm recipient options, part 2

Browse Source
This commit is contained in:
Austin Huang 2021-06-14 21:41:02 -04:00
parent a45844b50e
commit 64f421ad4f
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/awais/instagrabber/webservices/DirectMessagesService.kt
View File

@ -174,21 +174,22 @@ object DirectMessagesService {
broadcastOptions: BroadcastOptions, broadcastOptions: BroadcastOptions,
): DirectThreadBroadcastResponse { ): DirectThreadBroadcastResponse {
require(broadcastOptions.clientContext.isNotBlank()) { "Broadcast requires a valid client context value" } require(broadcastOptions.clientContext.isNotBlank()) { "Broadcast requires a valid client context value" }
val form = mutableMapOf<String, Any>( val form = mutableMapOf<String, String>(
"_csrftoken" to csrfToken, "_csrftoken" to csrfToken,
"_uid" to userId, "_uid" to userId.toString(10),
"__uuid" to deviceUuid, "__uuid" to deviceUuid,
"client_context" to broadcastOptions.clientContext, "client_context" to broadcastOptions.clientContext,
"mutation_token" to broadcastOptions.clientContext, "mutation_token" to broadcastOptions.clientContext,
) )
val threadIds = broadcastOptions.threadIds val threadIds = broadcastOptions.threadIds
val userIds = broadcastOptions.userIds
require(!userIds.isNullOrEmpty() || !threadIds.isNullOrEmpty()) {
"Either pass a list of thread ids or a list of lists of user ids"
}
if (!threadIds.isNullOrEmpty()) { if (!threadIds.isNullOrEmpty()) {
form["thread_ids"] = JSONArray(threadIds).toString() form["thread_ids"] = JSONArray(threadIds).toString()
} else { }
val userIds = broadcastOptions.userIds if (!userIds.isNullOrEmpty()) {
require(!userIds.isNullOrEmpty()) {
"Either provide a thread id or pass a list of user ids"
}
form["recipient_users"] = JSONArray(userIds).toString() form["recipient_users"] = JSONArray(userIds).toString()
} }
val repliedToItemId = broadcastOptions.repliedToItemId val repliedToItemId = broadcastOptions.repliedToItemId
@ -199,8 +200,8 @@ object DirectMessagesService {
} }
form.putAll(broadcastOptions.formMap) form.putAll(broadcastOptions.formMap)
form["action"] = "send_item" form["action"] = "send_item"
val signedForm = Utils.sign(form) // val signedForm = Utils.sign(form)
return repository.broadcast(broadcastOptions.itemType.value, signedForm) return repository.broadcast(broadcastOptions.itemType.value, form)
} }
suspend fun addUsers( suspend fun addUsers(